diff --git a/AsbCloudApp/Comparators/ComparerIId.cs b/AsbCloudApp/Comparators/ComparerIId.cs
index b3fb0e15..76fd40de 100644
--- a/AsbCloudApp/Comparators/ComparerIId.cs
+++ b/AsbCloudApp/Comparators/ComparerIId.cs
@@ -2,53 +2,52 @@ using AsbCloudApp.Data;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
-namespace AsbCloudApp.Comparators
+namespace AsbCloudApp.Comparators;
+
+/// <summary>
+/// Компаратор для сравнения сущностей по ID
+/// </summary>
+public class ComparerIId : IComparer<IId>, IEqualityComparer<IId>
 {
+    private static readonly ComparerIId instance = new();
+    private ComparerIId() { }
+
     /// <summary>
-    /// Компаратор для сравнения сущностей по ID
+    /// Singleton ссылка
     /// </summary>
-    public class ComparerIId : IComparer<IId>, IEqualityComparer<IId>
-    {
-        private static readonly ComparerIId instance = new();
-        private ComparerIId() { }
+    /// <returns></returns>
+    public static ComparerIId GetInstance() => instance;
 
-        /// <summary>
-        /// Singleton ссылка
-        /// </summary>
-        /// <returns></returns>
-        public static ComparerIId GetInstance() => instance;
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="x"></param>
+    /// <param name="y"></param>
+    /// <returns></returns>
+    public int Compare(IId? x, IId? y)
+        => (x?.Id??0).CompareTo(y?.Id??0);
+    
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <returns></returns>
-        public int Compare(IId? x, IId? y)
-            => (x?.Id??0).CompareTo(y?.Id??0);
-        
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <returns></returns>
-        public bool Equals(IId? x, IId? y)
-        {            
-            if (x is not null && y is not null)
-                return x.Id == y.Id;
-
-            return x == y;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public int GetHashCode([DisallowNull] IId obj) =>
-            obj.GetHashCode();
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="x"></param>
+    /// <param name="y"></param>
+    /// <returns></returns>
+    public bool Equals(IId? x, IId? y)
+    {            
+        if (x is not null && y is not null)
+            return x.Id == y.Id;
 
+        return x == y;
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <returns></returns>
+    public int GetHashCode([DisallowNull] IId obj) =>
+        obj.GetHashCode();
+
 }
diff --git a/AsbCloudApp/Comparators/TelemetryUserDtoComparer.cs b/AsbCloudApp/Comparators/TelemetryUserDtoComparer.cs
index d993cc3d..2ad87efb 100644
--- a/AsbCloudApp/Comparators/TelemetryUserDtoComparer.cs
+++ b/AsbCloudApp/Comparators/TelemetryUserDtoComparer.cs
@@ -1,21 +1,20 @@
 using AsbCloudApp.Data.SAUB;
 using System.Collections.Generic;
 
-namespace AsbCloudApp.Comparators
+namespace AsbCloudApp.Comparators;
+
+/// <inheritdoc/>
+public class TelemetryUserDtoComparer : IEqualityComparer<TelemetryUserDto>
 {
     /// <inheritdoc/>
-    public class TelemetryUserDtoComparer : IEqualityComparer<TelemetryUserDto>
+    public bool Equals(TelemetryUserDto? prevUser, TelemetryUserDto? nextUser)
     {
-        /// <inheritdoc/>
-        public bool Equals(TelemetryUserDto? prevUser, TelemetryUserDto? nextUser)
-        {
-            if (prevUser is not null && nextUser is not null)
-                return prevUser.Id == nextUser.Id;
+        if (prevUser is not null && nextUser is not null)
+            return prevUser.Id == nextUser.Id;
 
-            return prevUser == nextUser;
-        }
-
-        /// <inheritdoc/>
-        public int GetHashCode(TelemetryUserDto user) => user.Id.GetHashCode();
+        return prevUser == nextUser;
     }
+
+    /// <inheritdoc/>
+    public int GetHashCode(TelemetryUserDto user) => user.Id.GetHashCode();
 }
diff --git a/AsbCloudApp/CyclicArray.cs b/AsbCloudApp/CyclicArray.cs
index b9a87956..3735e519 100644
--- a/AsbCloudApp/CyclicArray.cs
+++ b/AsbCloudApp/CyclicArray.cs
@@ -1,196 +1,195 @@
 using System.Linq;
 
-namespace System.Collections.Generic
+namespace System.Collections.Generic;
+
+/// <summary>
+/// Цикличный массив
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public class CyclicArray<T> : IEnumerable<T>
 {
+    readonly T[] array;
+    int used, current = -1;
+
     /// <summary>
-    /// Цикличный массив
+    /// constructor
     /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public class CyclicArray<T> : IEnumerable<T>
+    /// <param name="capacity"></param>
+    public CyclicArray(int capacity)
     {
-        readonly T[] array;
-        int used, current = -1;
+        array = new T[capacity];
+    }
 
-        /// <summary>
-        /// constructor
-        /// </summary>
-        /// <param name="capacity"></param>
-        public CyclicArray(int capacity)
+    /// <summary>
+    /// Количество элементов в массиве
+    /// </summary>
+    public int Count => used;
+
+    /// <summary>
+    /// Добавить новый элемент<br/>
+    /// Если capacity достигнуто, то вытеснит самый первый элемент
+    /// </summary>
+    /// <param name="item"></param>
+    public void Add(T item)
+    {
+        current = (++current) % array.Length;
+        array[current] = item;
+        if (used < array.Length)
+            used++;
+        UpdatedInvoke(current, item);
+    }
+
+    /// <summary>
+    /// Добавить новые элементы.<br/>
+    /// Если capacity достигнуто, то вытеснит самые первые элементы.<br/>
+    /// Не вызывает Updated!
+    /// </summary>
+    /// <param name="items"></param>
+    public void AddRange(IEnumerable<T> items)
+    {
+        var capacity = array.Length;
+        var newItems = items.TakeLast(capacity).ToArray();
+        if (newItems.Length == capacity)
         {
-            array = new T[capacity];
+            Array.Copy(newItems, array, capacity);
+            current = capacity - 1;
         }
-
-        /// <summary>
-        /// Количество элементов в массиве
-        /// </summary>
-        public int Count => used;
-
-        /// <summary>
-        /// Добавить новый элемент<br/>
-        /// Если capacity достигнуто, то вытеснит самый первый элемент
-        /// </summary>
-        /// <param name="item"></param>
-        public void Add(T item)
+        else
         {
-            current = (++current) % array.Length;
-            array[current] = item;
-            if (used < array.Length)
-                used++;
-            UpdatedInvoke(current, item);
-        }
-
-        /// <summary>
-        /// Добавить новые элементы.<br/>
-        /// Если capacity достигнуто, то вытеснит самые первые элементы.<br/>
-        /// Не вызывает Updated!
-        /// </summary>
-        /// <param name="items"></param>
-        public void AddRange(IEnumerable<T> items)
-        {
-            var capacity = array.Length;
-            var newItems = items.TakeLast(capacity).ToArray();
-            if (newItems.Length == capacity)
+            current = (++current) % capacity;
+            var countToEndOfArray = capacity - current;
+            if (newItems.Length <= countToEndOfArray)
             {
-                Array.Copy(newItems, array, capacity);
-                current = capacity - 1;
+                Array.Copy(newItems, 0, array, current, newItems.Length);
+                current += newItems.Length - 1;
             }
             else
             {
-                current = (++current) % capacity;
-                var countToEndOfArray = capacity - current;
-                if (newItems.Length <= countToEndOfArray)
-                {
-                    Array.Copy(newItems, 0, array, current, newItems.Length);
-                    current += newItems.Length - 1;
-                }
-                else
-                {
-                    var firstStepLength = countToEndOfArray;
-                    Array.Copy(newItems, 0, array, current, firstStepLength);
-                    var secondStepCount = newItems.Length - firstStepLength;
-                    Array.Copy(newItems, firstStepLength, array, 0, secondStepCount);
-                    current = secondStepCount - 1;
-                }
-            }
-
-            if (used < capacity)
-            {
-                used += newItems.Length;
-                used = used > capacity ? capacity : used;
+                var firstStepLength = countToEndOfArray;
+                Array.Copy(newItems, 0, array, current, firstStepLength);
+                var secondStepCount = newItems.Length - firstStepLength;
+                Array.Copy(newItems, firstStepLength, array, 0, secondStepCount);
+                current = secondStepCount - 1;
             }
         }
 
-        /// <summary>
-        /// Индекс
-        /// </summary>
-        /// <param name="index"></param>
-        /// <returns></returns>
-        public T this[int index]
+        if (used < capacity)
+        {
+            used += newItems.Length;
+            used = used > capacity ? capacity : used;
+        }
+    }
+
+    /// <summary>
+    /// Индекс
+    /// </summary>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    public T this[int index]
+    {
+        get
+        {
+            if (used == 0)
+                throw new IndexOutOfRangeException();
+
+            var i = (current + 1 + index) % used;
+            return array[i];
+        }
+        set
+        {
+            var devider = used > 0 ? used : array.Length;
+            var i = (current + 1 + index) % devider;
+            array[i] = value;
+            UpdatedInvoke(current, value);
+        }
+    }
+
+    /// <summary>
+    /// событие на изменение элемента в массиве
+    /// </summary>
+    public event EventHandler<(int index, T value)>? Updated;
+    private void UpdatedInvoke(int index, T value)
+    {
+        Updated?.Invoke(this, (index, value));
+    }
+
+    /// <summary>
+    /// Агрегирование значения по всему массиву
+    /// </summary>
+    /// <typeparam name="Tout"></typeparam>
+    /// <param name="func"></param>
+    /// <param name="startValue"></param>
+    /// <returns></returns>
+    public Tout Aggregate<Tout>(Func<T, Tout, Tout> func, Tout startValue)
+    {
+        Tout result = startValue;
+        for (int i = 0; i < used; i++)
+            result = func(this[i], result);
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public IEnumerator<T> GetEnumerator()
+        => new CyclycListEnumerator<T>(array, current, used);
+
+    /// <inheritdoc/>
+    IEnumerator IEnumerable.GetEnumerator()
+    => GetEnumerator();
+
+    class CyclycListEnumerator<Te> : IEnumerator<Te>
+    {
+        private readonly Te[] array;
+        private readonly int used;
+        private readonly int first;
+        private int current = -1;
+
+        public CyclycListEnumerator(Te[] array, int first, int used)
+        {
+            this.array = new Te[array.Length];
+            array.CopyTo(this.array, 0);
+            this.used = used;
+            this.first = first;
+        }
+
+        public Te Current
         {
             get
             {
-                if (used == 0)
-                    throw new IndexOutOfRangeException();
-
-                var i = (current + 1 + index) % used;
-                return array[i];
-            }
-            set
-            {
-                var devider = used > 0 ? used : array.Length;
-                var i = (current + 1 + index) % devider;
-                array[i] = value;
-                UpdatedInvoke(current, value);
-            }
-        }
-
-        /// <summary>
-        /// событие на изменение элемента в массиве
-        /// </summary>
-        public event EventHandler<(int index, T value)>? Updated;
-        private void UpdatedInvoke(int index, T value)
-        {
-            Updated?.Invoke(this, (index, value));
-        }
-
-        /// <summary>
-        /// Агрегирование значения по всему массиву
-        /// </summary>
-        /// <typeparam name="Tout"></typeparam>
-        /// <param name="func"></param>
-        /// <param name="startValue"></param>
-        /// <returns></returns>
-        public Tout Aggregate<Tout>(Func<T, Tout, Tout> func, Tout startValue)
-        {
-            Tout result = startValue;
-            for (int i = 0; i < used; i++)
-                result = func(this[i], result);
-            return result;
-        }
-
-        /// <inheritdoc/>
-        public IEnumerator<T> GetEnumerator()
-            => new CyclycListEnumerator<T>(array, current, used);
-
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator()
-        => GetEnumerator();
-
-        class CyclycListEnumerator<Te> : IEnumerator<Te>
-        {
-            private readonly Te[] array;
-            private readonly int used;
-            private readonly int first;
-            private int current = -1;
-
-            public CyclycListEnumerator(Te[] array, int first, int used)
-            {
-                this.array = new Te[array.Length];
-                array.CopyTo(this.array, 0);
-                this.used = used;
-                this.first = first;
-            }
-
-            public Te Current
-            {
-                get
+                if (IsCurrentOk())
                 {
-                    if (IsCurrentOk())
-                    {
-                        var i = (current + first + 1) % used;
-                        return array[i];
-                    }
-                    else
-                        return default!;
+                    var i = (current + first + 1) % used;
+                    return array[i];
                 }
-            }
-
-            object? IEnumerator.Current => Current;
-
-            public void Dispose() {; }
-
-            private bool IsCurrentOk() => current >= 0 && current < used;
-
-            public bool MoveNext()
-            {
-                if (current < used)
-                    current++;
-                return IsCurrentOk();
-            }
-
-            public void Reset()
-            {
-                current = -1;
+                else
+                    return default!;
             }
         }
 
-        /// <summary>
-        /// Очистить весь массив
-        /// </summary>
-        public void Clear()
+        object? IEnumerator.Current => Current;
+
+        public void Dispose() {; }
+
+        private bool IsCurrentOk() => current >= 0 && current < used;
+
+        public bool MoveNext()
+        {
+            if (current < used)
+                current++;
+            return IsCurrentOk();
+        }
+
+        public void Reset()
         {
-            used = 0;
             current = -1;
         }
     }
+
+    /// <summary>
+    /// Очистить весь массив
+    /// </summary>
+    public void Clear()
+    {
+        used = 0;
+        current = -1;
+    }
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/AuthDto.cs b/AsbCloudApp/Data/AuthDto.cs
index f2e2c20d..164f22c4 100644
--- a/AsbCloudApp/Data/AuthDto.cs
+++ b/AsbCloudApp/Data/AuthDto.cs
@@ -1,24 +1,23 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO для авторизации
+/// </summary>
+public class AuthDto
 {
     /// <summary>
-    /// DTO для авторизации
+    /// Имя пользователя для входа
     /// </summary>
-    public class AuthDto
-    {
-        /// <summary>
-        /// Имя пользователя для входа
-        /// </summary>
-        [Required(ErrorMessage = "Логин не должен быть пустым")]
-        [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимая длина логина от 1 до 50 символов")]
-        public string Login { get; set; } = null!;
+    [Required(ErrorMessage = "Логин не должен быть пустым")]
+    [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимая длина логина от 1 до 50 символов")]
+    public string Login { get; set; } = null!;
 
-        /// <summary>
-        /// Пароль пользователя для входа
-        /// </summary>
-        [Required(ErrorMessage = "Пароль не должен быть пустым")]
-        [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимая длина пароля от 1 до 50 символов")]
-        public string Password { get; set; } = null!;
-    }
+    /// <summary>
+    /// Пароль пользователя для входа
+    /// </summary>
+    [Required(ErrorMessage = "Пароль не должен быть пустым")]
+    [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимая длина пароля от 1 до 50 символов")]
+    public string Password { get; set; } = null!;
 }
diff --git a/AsbCloudApp/Data/BackgroundWorkDto.cs b/AsbCloudApp/Data/BackgroundWorkDto.cs
index d0e15b50..eccf6f1c 100644
--- a/AsbCloudApp/Data/BackgroundWorkDto.cs
+++ b/AsbCloudApp/Data/BackgroundWorkDto.cs
@@ -1,206 +1,205 @@
 using System;
 using System.Diagnostics;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Информация о фоновой работе
+/// </summary>
+public class BackgroundWorkDto
 {
     /// <summary>
-    /// Информация о фоновой работе
+    /// Идентификатор работы. Должен быть уникальным. Используется в логах и передается в колбэки.
     /// </summary>
-    public class BackgroundWorkDto
+    public string Id { get; init; } = null!;
+
+    /// <summary>
+    /// Класс описания состояния
+    /// </summary>
+    public class CurrentStateInfo
+    {
+        private string state = "start";
+
+        /// <summary>
+        /// Время последнего запуска
+        /// </summary>
+        public DateTime Start { get; } = DateTime.Now;
+
+        /// <summary>
+        /// Текущее время выполнения
+        /// </summary>
+        public TimeSpan ExecutionTime => DateTime.Now - Start;
+
+        /// <summary>
+        /// Текстовое описание того, что происходит в задаче.
+        /// </summary>
+        public string State
+        {
+            get => state;
+            internal set
+            {
+                state = value;
+                StateUpdate = DateTime.Now;
+            }
+        }
+
+        /// <summary>
+        /// Прогресс
+        /// </summary>
+        public double Progress { get; internal set; } = 0;
+
+        /// <summary>
+        /// Время последнего запуска
+        /// </summary>
+        public DateTime StateUpdate { get; private set; } = DateTime.Now;
+    }
+
+    /// <summary>
+    /// Инфо о последней ошибке
+    /// </summary>
+    public class LastErrorInfo : LastCompleteInfo
     {
         /// <summary>
-        /// Идентификатор работы. Должен быть уникальным. Используется в логах и передается в колбэки.
+        /// 
         /// </summary>
-        public string Id { get; init; } = null!;
-
-        /// <summary>
-        /// Класс описания состояния
-        /// </summary>
-        public class CurrentStateInfo
+        /// <param name="state"></param>
+        /// <param name="errorText"></param>
+        public LastErrorInfo(CurrentStateInfo state, string errorText)
+            : base(state)
         {
-            private string state = "start";
-
-            /// <summary>
-            /// Время последнего запуска
-            /// </summary>
-            public DateTime Start { get; } = DateTime.Now;
-
-            /// <summary>
-            /// Текущее время выполнения
-            /// </summary>
-            public TimeSpan ExecutionTime => DateTime.Now - Start;
-
-            /// <summary>
-            /// Текстовое описание того, что происходит в задаче.
-            /// </summary>
-            public string State
-            {
-                get => state;
-                internal set
-                {
-                    state = value;
-                    StateUpdate = DateTime.Now;
-                }
-            }
-
-            /// <summary>
-            /// Прогресс
-            /// </summary>
-            public double Progress { get; internal set; } = 0;
-
-            /// <summary>
-            /// Время последнего запуска
-            /// </summary>
-            public DateTime StateUpdate { get; private set; } = DateTime.Now;
+            ErrorText = errorText;
         }
 
-        /// <summary>
-        /// Инфо о последней ошибке
-        /// </summary>
-        public class LastErrorInfo : LastCompleteInfo
-        {
-            /// <summary>
-            /// 
-            /// </summary>
-            /// <param name="state"></param>
-            /// <param name="errorText"></param>
-            public LastErrorInfo(CurrentStateInfo state, string errorText)
-                : base(state)
-            {
-                ErrorText = errorText;
-            }
-
-            /// <summary>
-            /// Последняя ошибка
-            /// </summary>
-            public string ErrorText { get; init; } = null!;
-        }
-
-        /// <summary>
-        /// Инфо о последнем завершении
-        /// </summary>
-        public class LastCompleteInfo
-        {
-            /// <summary>
-            /// Дата запуска
-            /// </summary>
-            public DateTime Start { get; init; }
-
-            /// <summary>
-            /// Дата завершения
-            /// </summary>
-            public DateTime End { get; init; }
-
-            /// <summary>
-            /// Продолжительность последнего выполнения
-            /// </summary>
-            public TimeSpan ExecutionTime => End - Start;
-
-            /// <summary>
-            /// Состояние на момент завершения
-            /// </summary>
-            public string State { get; init; }
-
-            /// <summary>
-            /// ctor
-            /// </summary>
-            /// <param name="state"></param>
-            public LastCompleteInfo(CurrentStateInfo state)
-            {
-                Start = state.Start;
-                End = DateTime.Now;
-                State = state.State;
-            }
-        }
-
-        /// <summary>
-        /// Текущее состояние
-        /// </summary>
-        public CurrentStateInfo? CurrentState { get; private set; }
-
         /// <summary>
         /// Последняя ошибка
         /// </summary>
-        public LastErrorInfo? LastError { get; private set; }
+        public string ErrorText { get; init; } = null!;
+    }
+
+    /// <summary>
+    /// Инфо о последнем завершении
+    /// </summary>
+    public class LastCompleteInfo
+    {
+        /// <summary>
+        /// Дата запуска
+        /// </summary>
+        public DateTime Start { get; init; }
 
         /// <summary>
-        /// Последняя завершенная
+        /// Дата завершения
         /// </summary>
-        public LastCompleteInfo? LastComplete { get; private set; }
+        public DateTime End { get; init; }
 
         /// <summary>
-        /// Кол-во запусков
+        /// Продолжительность последнего выполнения
         /// </summary>
-        public int CountStart { get; private set; }
+        public TimeSpan ExecutionTime => End - Start;
 
         /// <summary>
-        /// Кол-во завершений
+        /// Состояние на момент завершения
         /// </summary>
-        public int CountComplete { get; private set; }
+        public string State { get; init; }
 
         /// <summary>
-        /// Кол-во ошибок
+        /// ctor
         /// </summary>
-        public int CountErrors { get; private set; }
-
-        /// <summary>
-        /// Максимально допустимое время выполнения работы
-        /// </summary>
-        public TimeSpan Timeout { get; set; } = TimeSpan.FromMinutes(1);
-
-        private string WorkNameForTrace => $"Backgroud work:\"{Id}\"";
-
-        /// <summary>
-        /// Обновления состояния при запуске работы
-        /// </summary>
-        protected void SetStatusStart()
+        /// <param name="state"></param>
+        public LastCompleteInfo(CurrentStateInfo state)
         {
-            CurrentState = new();
-            CountStart++;
-            Trace.TraceInformation($"{WorkNameForTrace} state: starting");
-        }
-
-        /// <summary>
-        /// Обновления состояния в процессе работы
-        /// </summary>
-        protected void UpdateStatus(string newState, double? progress)
-        {
-            if (CurrentState is null)
-                return;
-
-            CurrentState.State = newState;
-            if (progress.HasValue)
-                CurrentState.Progress = progress.Value;
-
-            Trace.TraceInformation($"{WorkNameForTrace} state[{100*progress:#}%]: {newState}");
-        }
-
-        /// <summary>
-        /// Обновления состояния при успешном завершении работы
-        /// </summary>
-        protected void SetStatusComplete()
-        {
-            CountComplete++;
-            if (CurrentState is null)
-                return;
-
-            LastComplete = new(CurrentState);
-            CurrentState = null;
-            Trace.TraceInformation($"{WorkNameForTrace} state: completed");
-        }
-
-        /// <summary>
-        /// Обновления состояния при ошибке в работе
-        /// </summary>
-        protected void SetLastError(string errorMessage)
-        {
-            CountErrors++;
-            if (CurrentState is null)
-                return;
-
-            LastError = new LastErrorInfo(CurrentState, errorMessage);
-            CurrentState = null;
-            Trace.TraceError($"{WorkNameForTrace} throw exception[{CountErrors}]: {errorMessage}");
+            Start = state.Start;
+            End = DateTime.Now;
+            State = state.State;
         }
     }
+
+    /// <summary>
+    /// Текущее состояние
+    /// </summary>
+    public CurrentStateInfo? CurrentState { get; private set; }
+
+    /// <summary>
+    /// Последняя ошибка
+    /// </summary>
+    public LastErrorInfo? LastError { get; private set; }
+
+    /// <summary>
+    /// Последняя завершенная
+    /// </summary>
+    public LastCompleteInfo? LastComplete { get; private set; }
+
+    /// <summary>
+    /// Кол-во запусков
+    /// </summary>
+    public int CountStart { get; private set; }
+
+    /// <summary>
+    /// Кол-во завершений
+    /// </summary>
+    public int CountComplete { get; private set; }
+
+    /// <summary>
+    /// Кол-во ошибок
+    /// </summary>
+    public int CountErrors { get; private set; }
+
+    /// <summary>
+    /// Максимально допустимое время выполнения работы
+    /// </summary>
+    public TimeSpan Timeout { get; set; } = TimeSpan.FromMinutes(1);
+
+    private string WorkNameForTrace => $"Backgroud work:\"{Id}\"";
+
+    /// <summary>
+    /// Обновления состояния при запуске работы
+    /// </summary>
+    protected void SetStatusStart()
+    {
+        CurrentState = new();
+        CountStart++;
+        Trace.TraceInformation($"{WorkNameForTrace} state: starting");
+    }
+
+    /// <summary>
+    /// Обновления состояния в процессе работы
+    /// </summary>
+    protected void UpdateStatus(string newState, double? progress)
+    {
+        if (CurrentState is null)
+            return;
+
+        CurrentState.State = newState;
+        if (progress.HasValue)
+            CurrentState.Progress = progress.Value;
+
+        Trace.TraceInformation($"{WorkNameForTrace} state[{100*progress:#}%]: {newState}");
+    }
+
+    /// <summary>
+    /// Обновления состояния при успешном завершении работы
+    /// </summary>
+    protected void SetStatusComplete()
+    {
+        CountComplete++;
+        if (CurrentState is null)
+            return;
+
+        LastComplete = new(CurrentState);
+        CurrentState = null;
+        Trace.TraceInformation($"{WorkNameForTrace} state: completed");
+    }
+
+    /// <summary>
+    /// Обновления состояния при ошибке в работе
+    /// </summary>
+    protected void SetLastError(string errorMessage)
+    {
+        CountErrors++;
+        if (CurrentState is null)
+            return;
+
+        LastError = new LastErrorInfo(CurrentState, errorMessage);
+        CurrentState = null;
+        Trace.TraceError($"{WorkNameForTrace} throw exception[{CountErrors}]: {errorMessage}");
+    }
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/ClusterDto.cs b/AsbCloudApp/Data/ClusterDto.cs
index 80eedfe4..36e5db20 100644
--- a/AsbCloudApp/Data/ClusterDto.cs
+++ b/AsbCloudApp/Data/ClusterDto.cs
@@ -2,39 +2,38 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO кустов
+/// </summary>
+public class ClusterDto : MapPointBaseDto
 {
     /// <summary>
-    /// DTO кустов
+    /// ИД месторождения, необязательный
     /// </summary>
-    public class ClusterDto : MapPointBaseDto
-    {
-        /// <summary>
-        /// ИД месторождения, необязательный
-        /// </summary>
-        [Required]
-        [Range(1, int.MaxValue, ErrorMessage = "Id месторождения не может быть меньше 1")]
-        public int IdDeposit { get; set; }
-
-        /// <summary>
-        /// DTO месторождения
-        /// </summary>
-        public DepositBaseDto? Deposit { get; set; }
-
-        /// <summary>
-        /// Список скважин куста
-        /// </summary>
-        public IEnumerable<WellDto> Wells { get; set; } = Enumerable.Empty<WellDto>();
-    }
+    [Required]
+    [Range(1, int.MaxValue, ErrorMessage = "Id месторождения не может быть меньше 1")]
+    public int IdDeposit { get; set; }
 
     /// <summary>
-    /// DTO кустов
+    /// DTO месторождения
     /// </summary>
-    public class ClusterBranchDto : MapPointBaseDto
-    {
-        /// <summary>
-        /// Список скважин куста
-        /// </summary>
-        public IEnumerable<WellMapInfoWithTelemetryStat> Wells { get; set; } = Enumerable.Empty<WellMapInfoWithTelemetryStat>();
-    }
+    public DepositBaseDto? Deposit { get; set; }
+
+    /// <summary>
+    /// Список скважин куста
+    /// </summary>
+    public IEnumerable<WellDto> Wells { get; set; } = Enumerable.Empty<WellDto>();
+}
+
+/// <summary>
+/// DTO кустов
+/// </summary>
+public class ClusterBranchDto : MapPointBaseDto
+{
+    /// <summary>
+    /// Список скважин куста
+    /// </summary>
+    public IEnumerable<WellMapInfoWithTelemetryStat> Wells { get; set; } = Enumerable.Empty<WellMapInfoWithTelemetryStat>();
 }
diff --git a/AsbCloudApp/Data/ClusterRopStatDto.cs b/AsbCloudApp/Data/ClusterRopStatDto.cs
index 386614dc..ecfee99e 100644
--- a/AsbCloudApp/Data/ClusterRopStatDto.cs
+++ b/AsbCloudApp/Data/ClusterRopStatDto.cs
@@ -1,22 +1,21 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Статистика механической скорости проходки (МСП) по кусту
+/// </summary>
+public class ClusterRopStatDto
 {
     /// <summary>
-    /// Статистика механической скорости проходки (МСП) по кусту
+    /// Макс. механическая скорость проходки по кусту
     /// </summary>
-    public class ClusterRopStatDto
-    {
-        /// <summary>
-        /// Макс. механическая скорость проходки по кусту
-        /// </summary>
-        [Required]
-        public double RopMax { get; set; }
+    [Required]
+    public double RopMax { get; set; }
 
-        /// <summary>
-        /// Средняя механическая скорость проходки по кусту
-        /// </summary>
-        [Required]
-        public double RopAverage { get; set; }
-    }
+    /// <summary>
+    /// Средняя механическая скорость проходки по кусту
+    /// </summary>
+    [Required]
+    public double RopAverage { get; set; }
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/CompanyDto.cs b/AsbCloudApp/Data/CompanyDto.cs
index 84ac8cb6..4e54faae 100644
--- a/AsbCloudApp/Data/CompanyDto.cs
+++ b/AsbCloudApp/Data/CompanyDto.cs
@@ -1,33 +1,32 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO компании
+/// </summary>
+public class CompanyDto : IId
 {
+    /// <inheritdoc/>
+    public int Id { get; set; }
+
     /// <summary>
-    /// DTO компании
+    /// Название
     /// </summary>
-    public class CompanyDto : IId
-    {
-        /// <inheritdoc/>
-        public int Id { get; set; }
+    [Required]
+    [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимое имя компании от 1 до 50 символов")]
+    public string Caption { get; set; } = null!;
 
-        /// <summary>
-        /// Название
-        /// </summary>
-        [Required]
-        [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимое имя компании от 1 до 50 символов")]
-        public string Caption { get; set; } = null!;
+    /// <summary>
+    /// ИД типа компании
+    /// </summary>
+    [Required]
+    public int IdCompanyType { get; set; }
 
-        /// <summary>
-        /// ИД типа компании
-        /// </summary>
-        [Required]
-        public int IdCompanyType { get; set; }
+    /// <summary>
+    /// Название типа компании
+    /// </summary>
+    [StringLength(255, MinimumLength = 1, ErrorMessage = "Допустимое имя типа компании от 1 до 255 символов")]
+    public string? CompanyTypeCaption { get; set; } = null!;
 
-        /// <summary>
-        /// Название типа компании
-        /// </summary>
-        [StringLength(255, MinimumLength = 1, ErrorMessage = "Допустимое имя типа компании от 1 до 255 символов")]
-        public string? CompanyTypeCaption { get; set; } = null!;
-
-    }
 }
diff --git a/AsbCloudApp/Data/CompanyTypeDto.cs b/AsbCloudApp/Data/CompanyTypeDto.cs
index b543a1ae..6041d60d 100644
--- a/AsbCloudApp/Data/CompanyTypeDto.cs
+++ b/AsbCloudApp/Data/CompanyTypeDto.cs
@@ -1,33 +1,32 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO тип компании
+/// </summary>
+public class CompanyTypeDto : IId
 {
+    /// <inheritdoc/>
+    [Required]
+    public int Id { get; set; }
+
     /// <summary>
-    /// DTO тип компании
+    /// Название типа компании
     /// </summary>
-    public class CompanyTypeDto : IId
-    {
-        /// <inheritdoc/>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public string Caption { get; set; } = null!;
 
-        /// <summary>
-        /// Название типа компании
-        /// </summary>
-        [Required]
-        public string Caption { get; set; } = null!;
+    /// <summary>
+    /// Порядок
+    /// </summary>
+    [Required]
+    public int Order { get; set; }
 
-        /// <summary>
-        /// Порядок
-        /// </summary>
-        [Required]
-        public int Order { get; set; }
+    /// <summary>
+    /// Является ли контактом
+    /// </summary>
+    [Required]
+    public bool IsContact { get; set; }
 
-        /// <summary>
-        /// Является ли контактом
-        /// </summary>
-        [Required]
-        public bool IsContact { get; set; }
-
-    }
 }
diff --git a/AsbCloudApp/Data/DataSaubStatDto.cs b/AsbCloudApp/Data/DataSaubStatDto.cs
index b8e27b37..3bb46d6d 100644
--- a/AsbCloudApp/Data/DataSaubStatDto.cs
+++ b/AsbCloudApp/Data/DataSaubStatDto.cs
@@ -1,136 +1,135 @@
 using System;
 using AsbCloudApp.Data.WellOperation;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// dto для хранения данных статистики сауб
+/// </summary>
+public class DataSaubStatDto:IId
 {
     /// <summary>
-    /// dto для хранения данных статистики сауб
+    /// 
     /// </summary>
-    public class DataSaubStatDto:IId
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        public int Id { get; set; }
+    public int Id { get; set; }
 
-        /// <summary>
-        /// Дата и время начала
-        /// </summary>
-        public DateTimeOffset DateStart { get; set; }
+    /// <summary>
+    /// Дата и время начала
+    /// </summary>
+    public DateTimeOffset DateStart { get; set; }
 
-        /// <summary>
-        /// Дата и время окончания
-        /// </summary>
-        public DateTimeOffset DateEnd { get; set; }
+    /// <summary>
+    /// Дата и время окончания
+    /// </summary>
+    public DateTimeOffset DateEnd { get; set; }
 
-        /// <summary>
-        /// Глубина забоя по стволу начальная
-        /// </summary>
-        public double DepthStart { get; set; }
+    /// <summary>
+    /// Глубина забоя по стволу начальная
+    /// </summary>
+    public double DepthStart { get; set; }
 
-        /// <summary>
-        /// Глубина забоя по стволу конечная
-        /// </summary>
-        public double DepthEnd { get; set; }
+    /// <summary>
+    /// Глубина забоя по стволу конечная
+    /// </summary>
+    public double DepthEnd { get; set; }
 
-        /// <summary>
-        /// Скорость бурения
-        /// </summary>
-        public double Speed { get; set; }
+    /// <summary>
+    /// Скорость бурения
+    /// </summary>
+    public double Speed { get; set; }
 
-        /// <summary>
-        /// Ограничение скорости блока
-        /// </summary>
-        public double? BlockSpeedSp { get; set; }
+    /// <summary>
+    /// Ограничение скорости блока
+    /// </summary>
+    public double? BlockSpeedSp { get; set; }
 
-        /// <summary>
-        /// Давление
-        /// </summary>
-        public double Pressure { get; set; }
+    /// <summary>
+    /// Давление
+    /// </summary>
+    public double Pressure { get; set; }
 
-        /// <summary>
-        /// Давление холостого хода
-        /// </summary>
-        public double? PressureIdle { get; set; }
+    /// <summary>
+    /// Давление холостого хода
+    /// </summary>
+    public double? PressureIdle { get; set; }
 
-        /// <summary>
-        /// Ограничение фактического давления
-        /// </summary>
-        public double? PressureSp { get; set; }
+    /// <summary>
+    /// Ограничение фактического давления
+    /// </summary>
+    public double? PressureSp { get; set; }
 
-        /// <summary>
-        /// Фактическая нагрузка
-        /// </summary>
-        public double AxialLoad { get; set; }
+    /// <summary>
+    /// Фактическая нагрузка
+    /// </summary>
+    public double AxialLoad { get; set; }
 
-        /// <summary>
-        /// Ограничение факт. нагрузки
-        /// </summary>
-        public double? AxialLoadSp { get; set; }
+    /// <summary>
+    /// Ограничение факт. нагрузки
+    /// </summary>
+    public double? AxialLoadSp { get; set; }
 
-        /// <summary>
-        /// Максимально допустимая нагрузка
-        /// </summary>
-        public double? AxialLoadLimitMax { get; set; }
+    /// <summary>
+    /// Максимально допустимая нагрузка
+    /// </summary>
+    public double? AxialLoadLimitMax { get; set; }
 
-        /// <summary>
-        /// Фактический момент
-        /// </summary>
-        public double RotorTorque { get; set; }
+    /// <summary>
+    /// Фактический момент
+    /// </summary>
+    public double RotorTorque { get; set; }
 
-        /// <summary>
-        /// Ограничение факт. момента
-        /// </summary>
-        public double? RotorTorqueSp { get; set; }
+    /// <summary>
+    /// Ограничение факт. момента
+    /// </summary>
+    public double? RotorTorqueSp { get; set; }
 
-        /// <summary>
-        /// Максимально допустимый момент
-        /// </summary>
-        public double? RotorTorqueLimitMax { get; set; }
+    /// <summary>
+    /// Максимально допустимый момент
+    /// </summary>
+    public double? RotorTorqueLimitMax { get; set; }
 
-        /// <summary>
-        /// Работа при достижении ограничения
-        /// </summary>
-        public short? IdFeedRegulator { get; set; }
+    /// <summary>
+    /// Работа при достижении ограничения
+    /// </summary>
+    public short? IdFeedRegulator { get; set; }
 
-        /// <summary>
-        /// Фактическая скорость оборотов ВСП
-        /// </summary>
-        public double RotorSpeed { get; set; }
+    /// <summary>
+    /// Фактическая скорость оборотов ВСП
+    /// </summary>
+    public double RotorSpeed { get; set; }
 
-        /// <summary>
-        /// Название автоопределённой операции
-        /// </summary>
-        public int IdCategory { get; set; }
+    /// <summary>
+    /// Название автоопределённой операции
+    /// </summary>
+    public int IdCategory { get; set; }
 
-        /// <summary>
-        /// Флаги подсистем
-        /// </summary>
-        public int EnabledSubsystems { get; set; }
+    /// <summary>
+    /// Флаги подсистем
+    /// </summary>
+    public int EnabledSubsystems { get; set; }
 
-        /// <summary>
-        /// Наличие или отсутствие осцилляции
-        /// </summary>
-        public bool HasOscillation { get; set; }
+    /// <summary>
+    /// Наличие или отсутствие осцилляции
+    /// </summary>
+    public bool HasOscillation { get; set; }
 
-        /// <summary>
-        /// Фактический расход
-        /// </summary>
-        public double Flow { get; set; }
+    /// <summary>
+    /// Фактический расход
+    /// </summary>
+    public double Flow { get; set; }
 
-        /// <summary>
-        /// Ключ телеметрии
-        /// </summary>
-        public int IdTelemetry { get; set; }
+    /// <summary>
+    /// Ключ телеметрии
+    /// </summary>
+    public int IdTelemetry { get; set; }
 
-        /// <summary>
-        /// Телеметрия
-        /// </summary>
-        public TelemetryDto Telemetry { get; set; } = null!;
+    /// <summary>
+    /// Телеметрия
+    /// </summary>
+    public TelemetryDto Telemetry { get; set; } = null!;
 
-        /// <summary>
-        /// Категория автоопределенной операции
-        /// </summary>
-        public WellOperationCategoryDto OperationCategory { get; set; } = null!;
-    }
+    /// <summary>
+    /// Категория автоопределенной операции
+    /// </summary>
+    public WellOperationCategoryDto OperationCategory { get; set; } = null!;
 }
diff --git a/AsbCloudApp/Data/DatesRangeDto.cs b/AsbCloudApp/Data/DatesRangeDto.cs
index 0b0e5ef9..8be2a6f7 100644
--- a/AsbCloudApp/Data/DatesRangeDto.cs
+++ b/AsbCloudApp/Data/DatesRangeDto.cs
@@ -1,23 +1,22 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Диапазон дат
+/// </summary>
+public class DatesRangeDto
 {
     /// <summary>
-    /// Диапазон дат
+    /// Дата начала диапазона
     /// </summary>
-    public class DatesRangeDto
-    {
-        /// <summary>
-        /// Дата начала диапазона
-        /// </summary>
-        [Required]
-        public DateTimeOffset From { get; set; }
+    [Required]
+    public DateTimeOffset From { get; set; }
 
-        /// <summary>
-        /// Дата окончания диапазона
-        /// </summary>
-        [Required]
-        public DateTimeOffset To { get; set; }
-    }
+    /// <summary>
+    /// Дата окончания диапазона
+    /// </summary>
+    [Required]
+    public DateTimeOffset To { get; set; }
 }
diff --git a/AsbCloudApp/Data/DepositDto.cs b/AsbCloudApp/Data/DepositDto.cs
index a0011022..01121955 100644
--- a/AsbCloudApp/Data/DepositDto.cs
+++ b/AsbCloudApp/Data/DepositDto.cs
@@ -2,39 +2,38 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace AsbCloudApp.Data
-{
+namespace AsbCloudApp.Data;
+
 
 #nullable enable
 
-    /// <summary>
-    /// DTO Месторождения
-    /// </summary>
-    public class DepositBaseDto : MapPointBaseDto
-    {
-    }
-
-    /// <summary>
-    /// DTO Месторождения с кустами
-    /// </summary>
-    public class DepositDto : MapPointBaseDto
-    {
-        /// <summary>
-        /// Кусты месторождения
-        /// </summary>
-        [Required]
-        public IEnumerable<ClusterDto> Clusters { get; set; } = Enumerable.Empty<ClusterDto>();
-    }
-
-    /// <summary>
-    /// DTO Месторождения с кустами
-    /// </summary>
-    public class DepositBranchDto : MapPointBaseDto
-    {
-        /// <summary>
-        /// Кусты месторождения
-        /// </summary>
-        [Required]
-        public IEnumerable<ClusterBranchDto> Clusters { get; set; } = Enumerable.Empty<ClusterBranchDto>();
-    }
+/// <summary>
+/// DTO Месторождения
+/// </summary>
+public class DepositBaseDto : MapPointBaseDto
+{
+}
+
+/// <summary>
+/// DTO Месторождения с кустами
+/// </summary>
+public class DepositDto : MapPointBaseDto
+{
+    /// <summary>
+    /// Кусты месторождения
+    /// </summary>
+    [Required]
+    public IEnumerable<ClusterDto> Clusters { get; set; } = Enumerable.Empty<ClusterDto>();
+}
+
+/// <summary>
+/// DTO Месторождения с кустами
+/// </summary>
+public class DepositBranchDto : MapPointBaseDto
+{
+    /// <summary>
+    /// Кусты месторождения
+    /// </summary>
+    [Required]
+    public IEnumerable<ClusterBranchDto> Clusters { get; set; } = Enumerable.Empty<ClusterBranchDto>();
 }
diff --git a/AsbCloudApp/Data/DetectedOperation/DetectedOperationDrillersStatDto.cs b/AsbCloudApp/Data/DetectedOperation/DetectedOperationDrillersStatDto.cs
index 122ad081..7c93adf4 100644
--- a/AsbCloudApp/Data/DetectedOperation/DetectedOperationDrillersStatDto.cs
+++ b/AsbCloudApp/Data/DetectedOperation/DetectedOperationDrillersStatDto.cs
@@ -1,42 +1,41 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.DetectedOperation
+namespace AsbCloudApp.Data.DetectedOperation;
+
+/// <summary>
+/// Статистика по операциям бурильщика
+/// </summary>
+public class DetectedOperationDrillersStatDto
 {
     /// <summary>
-    /// Статистика по операциям бурильщика
+    /// Бурильщик
     /// </summary>
-    public class DetectedOperationDrillersStatDto
-    {
-        /// <summary>
-        /// Бурильщик
-        /// </summary>
-        public DrillerDto? Driller { get; set; }
+    public DrillerDto? Driller { get; set; }
 
-        /// <summary>
-        /// Количество операции
-        /// </summary>
-        [Required]
-        public int Count { get; set; }
+    /// <summary>
+    /// Количество операции
+    /// </summary>
+    [Required]
+    public int Count { get; set; }
 
-        /// <summary>
-        /// Среднее по ключевому показателю
-        /// </summary>
-        [Required]
-        public double AverageValue { get; set; }
+    /// <summary>
+    /// Среднее по ключевому показателю
+    /// </summary>
+    [Required]
+    public double AverageValue { get; set; }
 
-        /// <summary>
-        /// Среднее целевого показателя
-        /// </summary>
-        public double? AverageTargetValue { get; set; }
+    /// <summary>
+    /// Среднее целевого показателя
+    /// </summary>
+    public double? AverageTargetValue { get; set; }
 
-        /// <summary>
-        /// Коэффициент эффективности, %
-        /// </summary>
-        public double? Efficiency { get; set; }
+    /// <summary>
+    /// Коэффициент эффективности, %
+    /// </summary>
+    public double? Efficiency { get; set; }
 
-        /// <summary>
-        /// Коэффициент потерь
-        /// </summary>
-        public double? Loss { get; set; }
-    }
+    /// <summary>
+    /// Коэффициент потерь
+    /// </summary>
+    public double? Loss { get; set; }
 }
diff --git a/AsbCloudApp/Data/DetectedOperation/DetectedOperationListDto.cs b/AsbCloudApp/Data/DetectedOperation/DetectedOperationListDto.cs
index 08c6b108..c9b29a62 100644
--- a/AsbCloudApp/Data/DetectedOperation/DetectedOperationListDto.cs
+++ b/AsbCloudApp/Data/DetectedOperation/DetectedOperationListDto.cs
@@ -2,23 +2,22 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace AsbCloudApp.Data.DetectedOperation
+namespace AsbCloudApp.Data.DetectedOperation;
+
+/// <summary>
+/// Автоматически определяемая операция
+/// </summary>
+public class DetectedOperationListDto
 {
     /// <summary>
-    /// Автоматически определяемая операция
+    /// Список всех операций
     /// </summary>
-    public class DetectedOperationListDto
-    {
-        /// <summary>
-        /// Список всех операций
-        /// </summary>
-        [Required]
-        public IEnumerable<DetectedOperationWithDrillerDto> Operations { get; set; } = Enumerable.Empty<DetectedOperationWithDrillerDto>();
+    [Required]
+    public IEnumerable<DetectedOperationWithDrillerDto> Operations { get; set; } = Enumerable.Empty<DetectedOperationWithDrillerDto>();
 
-        /// <summary>
-        /// Статистика по бурильщикам
-        /// </summary>
-        [Required]
-        public IEnumerable<DetectedOperationDrillersStatDto> Stats { get; set; } = Enumerable.Empty<DetectedOperationDrillersStatDto>();
-    }
+    /// <summary>
+    /// Статистика по бурильщикам
+    /// </summary>
+    [Required]
+    public IEnumerable<DetectedOperationDrillersStatDto> Stats { get; set; } = Enumerable.Empty<DetectedOperationDrillersStatDto>();
 }
diff --git a/AsbCloudApp/Data/DetectedOperation/DetectedOperationStatDto.cs b/AsbCloudApp/Data/DetectedOperation/DetectedOperationStatDto.cs
index b8007c85..2624c307 100644
--- a/AsbCloudApp/Data/DetectedOperation/DetectedOperationStatDto.cs
+++ b/AsbCloudApp/Data/DetectedOperation/DetectedOperationStatDto.cs
@@ -1,69 +1,68 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.DetectedOperation
+namespace AsbCloudApp.Data.DetectedOperation;
+
+/// <summary>
+/// Статистика по операциям например за период.
+/// </summary>
+public class DetectedOperationStatDto
 {
     /// <summary>
-    /// Статистика по операциям например за период.
+    /// Id названия/описания операции
     /// </summary>
-    public class DetectedOperationStatDto
-    {
-        /// <summary>
-        /// Id названия/описания операции
-        /// </summary>
-        [Required]
-        public int IdCategory { get; set; }
+    [Required]
+    public int IdCategory { get; set; }
 
-        /// <summary>
-        /// Название операции
-        /// </summary>
-        public string Category { get; set; } = string.Empty;
+    /// <summary>
+    /// Название операции
+    /// </summary>
+    public string Category { get; set; } = string.Empty;
 
-        /// <summary>
-        /// Количество операций
-        /// </summary>
-        [Required]
-        public int Count { get; set; }
+    /// <summary>
+    /// Количество операций
+    /// </summary>
+    [Required]
+    public int Count { get; set; }
 
-        /// <summary>
-        /// Среднее по ключевому показателю
-        /// </summary>
-        [Required]
-        public double ValueAverage { get; set; }
+    /// <summary>
+    /// Среднее по ключевому показателю
+    /// </summary>
+    [Required]
+    public double ValueAverage { get; set; }
 
-        /// <summary>
-        /// Мин по ключевому показателю
-        /// </summary>
-        [Required]
-        public double ValueMin { get; set; }
+    /// <summary>
+    /// Мин по ключевому показателю
+    /// </summary>
+    [Required]
+    public double ValueMin { get; set; }
 
-        /// <summary>
-        /// Макс по ключевому показателю
-        /// </summary>
-        [Required]
-        public double ValueMax { get; set; }
+    /// <summary>
+    /// Макс по ключевому показателю
+    /// </summary>
+    [Required]
+    public double ValueMax { get; set; }
 
-        /// <summary>
-        /// Суммарное время операций, мин
-        /// </summary>
-        [Required]
-        public double MinutesTotal { get; set; }
+    /// <summary>
+    /// Суммарное время операций, мин
+    /// </summary>
+    [Required]
+    public double MinutesTotal { get; set; }
 
-        /// <summary>
-        /// Мин продолжительность операции, мин
-        /// </summary>
-        [Required]
-        public double MinutesMin { get; set; }
+    /// <summary>
+    /// Мин продолжительность операции, мин
+    /// </summary>
+    [Required]
+    public double MinutesMin { get; set; }
 
-        /// <summary>
-        /// Макс продолжительность операции, мин
-        /// </summary>
-        [Required]
-        public double MinutesMax { get; set; }
+    /// <summary>
+    /// Макс продолжительность операции, мин
+    /// </summary>
+    [Required]
+    public double MinutesMax { get; set; }
 
-        /// <summary>
-        /// Средняя продолжительность операции, мин
-        /// </summary>
-        [Required]
-        public double MinutesAverage { get; set; }
-    }
+    /// <summary>
+    /// Средняя продолжительность операции, мин
+    /// </summary>
+    [Required]
+    public double MinutesAverage { get; set; }
 }
diff --git a/AsbCloudApp/Data/DetectedOperation/DetectedOperationWithDrillerDto.cs b/AsbCloudApp/Data/DetectedOperation/DetectedOperationWithDrillerDto.cs
index af5ff539..87990a6d 100644
--- a/AsbCloudApp/Data/DetectedOperation/DetectedOperationWithDrillerDto.cs
+++ b/AsbCloudApp/Data/DetectedOperation/DetectedOperationWithDrillerDto.cs
@@ -1,18 +1,17 @@
-namespace AsbCloudApp.Data.DetectedOperation
+namespace AsbCloudApp.Data.DetectedOperation;
+
+/// <summary>
+/// Автоматически определяемая операция
+/// </summary>
+public class DetectedOperationWithDrillerDto : DetectedOperationDto
 {
     /// <summary>
-    /// Автоматически определяемая операция
+    /// Бурильщик
     /// </summary>
-    public class DetectedOperationWithDrillerDto : DetectedOperationDto
-    {
-        /// <summary>
-        /// Бурильщик
-        /// </summary>
-        public DrillerDto? Driller { get; set; }
+    public DrillerDto? Driller { get; set; }
 
-        /// <summary>
-        /// Целевые/нормативные показатели
-        /// </summary>
-        public OperationValueDto? OperationValue { get; set; }
-    }
+    /// <summary>
+    /// Целевые/нормативные показатели
+    /// </summary>
+    public OperationValueDto? OperationValue { get; set; }
 }
diff --git a/AsbCloudApp/Data/DrillParamsDto.cs b/AsbCloudApp/Data/DrillParamsDto.cs
index 788d5207..d367b53a 100644
--- a/AsbCloudApp/Data/DrillParamsDto.cs
+++ b/AsbCloudApp/Data/DrillParamsDto.cs
@@ -1,52 +1,51 @@
 using System.Linq;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+
+/// <summary>
+/// DTO параметров бурения
+/// </summary>
+public class DrillParamsDto : IId, IWellRelated
 {
+    /// <inheritdoc/>
+    public int Id { get; set; }
+
+    /// <inheritdoc/>
+    public int IdWell { get; set; }
 
     /// <summary>
-    /// DTO параметров бурения
+    /// Глубина интервала
     /// </summary>
-    public class DrillParamsDto : IId, IWellRelated
-    {
-        /// <inheritdoc/>
-        public int Id { get; set; }
+    public MinMaxDto<double> Depth { get; set; } = null!;
 
-        /// <inheritdoc/>
-        public int IdWell { get; set; }
+    /// <summary>
+    /// id well section type.
+    /// </summary>
+    public int IdWellSectionType { get; set; }
 
-        /// <summary>
-        /// Глубина интервала
-        /// </summary>
-        public MinMaxDto<double> Depth { get; set; } = null!;
+    /// <summary>
+    /// axial load
+    /// </summary>
+    public MinMaxExtendedViewDto AxialLoad { get; set; } = null!;
 
-        /// <summary>
-        /// id well section type.
-        /// </summary>
-        public int IdWellSectionType { get; set; }
+    /// <summary>
+    /// pressure
+    /// </summary>
+    public MinMaxExtendedViewDto Pressure { get; set; } = null!;
 
-        /// <summary>
-        /// axial load
-        /// </summary>
-        public MinMaxExtendedViewDto AxialLoad { get; set; } = null!;
+    /// <summary>
+    /// rotor torque
+    /// </summary>
+    public MinMaxExtendedViewDto RotorTorque { get; set; } = null!;
 
-        /// <summary>
-        /// pressure
-        /// </summary>
-        public MinMaxExtendedViewDto Pressure { get; set; } = null!;
+    /// <summary>
+    /// rotor speed
+    /// </summary>
+    public MinMaxExtendedViewDto RotorSpeed { get; set; } = null!;
 
-        /// <summary>
-        /// rotor torque
-        /// </summary>
-        public MinMaxExtendedViewDto RotorTorque { get; set; } = null!;
-
-        /// <summary>
-        /// rotor speed
-        /// </summary>
-        public MinMaxExtendedViewDto RotorSpeed { get; set; } = null!;
-
-        /// <summary>
-        /// flow
-        /// </summary>
-        public MinMaxExtendedViewDto Flow { get; set; } = null!;
-    }
+    /// <summary>
+    /// flow
+    /// </summary>
+    public MinMaxExtendedViewDto Flow { get; set; } = null!;
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/DrillTestReport/DrillTestReportDataDto.cs b/AsbCloudApp/Data/DrillTestReport/DrillTestReportDataDto.cs
index 1e7a529e..17d54f85 100644
--- a/AsbCloudApp/Data/DrillTestReport/DrillTestReportDataDto.cs
+++ b/AsbCloudApp/Data/DrillTestReport/DrillTestReportDataDto.cs
@@ -1,26 +1,25 @@
 using AsbCloudApp.Data.SAUB;
 using System;
 
-namespace AsbCloudApp.Data.DrillTestReport
+namespace AsbCloudApp.Data.DrillTestReport;
+
+/// <summary>
+/// Информация о drill test, выгружаемая в отчете
+/// </summary>
+public class DrillTestReportDataDto
 {
     /// <summary>
-    /// Информация о drill test, выгружаемая в отчете
+    /// Данные для отчета 
     /// </summary>
-    public class DrillTestReportDataDto
-    {
-        /// <summary>
-        /// Данные для отчета 
-        /// </summary>
-        public DrillTestDto Data { get; set; } = null!;
+    public DrillTestDto Data { get; set; } = null!;
 
-        /// <summary>
-        /// Заголовок отчета
-        /// </summary>
-        public string Caption { get; set; } = null!;
+    /// <summary>
+    /// Заголовок отчета
+    /// </summary>
+    public string Caption { get; set; } = null!;
 
-        /// <summary>
-        /// Дата отчета
-        /// </summary>
-        public DateTimeOffset Date { get; set; } = DateTimeOffset.Now;
-    }
+    /// <summary>
+    /// Дата отчета
+    /// </summary>
+    public DateTimeOffset Date { get; set; } = DateTimeOffset.Now;
 }
diff --git a/AsbCloudApp/Data/DrillTestReport/DrillTestReportInfoDto.cs b/AsbCloudApp/Data/DrillTestReport/DrillTestReportInfoDto.cs
index 38730eef..18234a6a 100644
--- a/AsbCloudApp/Data/DrillTestReport/DrillTestReportInfoDto.cs
+++ b/AsbCloudApp/Data/DrillTestReport/DrillTestReportInfoDto.cs
@@ -1,29 +1,28 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.DrillTestReport
+namespace AsbCloudApp.Data.DrillTestReport;
+
+/// <summary>
+/// Базовая информация о drill_test отчёте
+/// </summary>
+public class DrillTestReportInfoDto : ReportInfoDto
 {
     /// <summary>
-    /// Базовая информация о drill_test отчёте
+    /// Идентификатор отчета
     /// </summary>
-    public class DrillTestReportInfoDto : ReportInfoDto
-    {
-        /// <summary>
-        /// Идентификатор отчета
-        /// </summary>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public int Id { get; set; }
 
-        /// <summary>
-        /// Проходка
-        /// </summary>
-        [Required]
-        public float DrillDepth { get; set; }
+    /// <summary>
+    /// Проходка
+    /// </summary>
+    [Required]
+    public float DrillDepth { get; set; }
 
-        /// <summary>
-        /// Дата и время
-        /// </summary>
-        [Required]
-        public DateTimeOffset DateTime { get; set; }
-    }
+    /// <summary>
+    /// Дата и время
+    /// </summary>
+    [Required]
+    public DateTimeOffset DateTime { get; set; }
 }
diff --git a/AsbCloudApp/Data/DrillerDto.cs b/AsbCloudApp/Data/DrillerDto.cs
index e920f111..1a11bd2a 100644
--- a/AsbCloudApp/Data/DrillerDto.cs
+++ b/AsbCloudApp/Data/DrillerDto.cs
@@ -1,33 +1,32 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Описание данных для бурильщика
+/// </summary>
+public class DrillerDto : IId
 {
     /// <summary>
-    /// Описание данных для бурильщика
+    /// Идентификатор в БД
     /// </summary>
-    public class DrillerDto : IId
-    {
-        /// <summary>
-        /// Идентификатор в БД
-        /// </summary>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public int Id { get; set; }
 
-        /// <summary>
-        /// Имя
-        /// </summary>
-        [Required]
-        public string Name { get; set; } = null!;
+    /// <summary>
+    /// Имя
+    /// </summary>
+    [Required]
+    public string Name { get; set; } = null!;
 
-        /// <summary>
-        /// Фамилия
-        /// </summary>
-        [Required]
-        public string Surname { get; set; } = null!;
+    /// <summary>
+    /// Фамилия
+    /// </summary>
+    [Required]
+    public string Surname { get; set; } = null!;
 
-        /// <summary>
-        /// Отчество
-        /// </summary>
-        public string? Patronymic { get; set; }
-    }
+    /// <summary>
+    /// Отчество
+    /// </summary>
+    public string? Patronymic { get; set; }
 }
diff --git a/AsbCloudApp/Data/DrillingProgramPartDto.cs b/AsbCloudApp/Data/DrillingProgramPartDto.cs
index 0e9917ba..bd771fe6 100644
--- a/AsbCloudApp/Data/DrillingProgramPartDto.cs
+++ b/AsbCloudApp/Data/DrillingProgramPartDto.cs
@@ -3,60 +3,59 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using AsbCloudApp.Data.User;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Часть программы бурения
+/// </summary>
+public class DrillingProgramPartDto
 {
     /// <summary>
-    /// Часть программы бурения
+    /// Название
     /// </summary>
-    public class DrillingProgramPartDto
-    {
-        /// <summary>
-        /// Название
-        /// </summary>
-        [Required]
-        public string Name { get; set; } = string.Empty;
+    [Required]
+    public string Name { get; set; } = string.Empty;
 
-        /// <summary>
-        /// ИД категории файла
-        /// </summary>
-        [Required]
-        public int IdFileCategory { get; set; }
+    /// <summary>
+    /// ИД категории файла
+    /// </summary>
+    [Required]
+    public int IdFileCategory { get; set; }
 
-        /// <summary>
-        /// 0 - NoFile
-        /// 1 - approving
-        /// 2 - completely approved
-        /// </summary>
-        [Required]
-        public int IdState { get; set; }
+    /// <summary>
+    /// 0 - NoFile
+    /// 1 - approving
+    /// 2 - completely approved
+    /// </summary>
+    [Required]
+    public int IdState { get; set; }
 
-        /// <summary>
-        /// Публикаторы. Могут загружать файл этой категории
-        /// </summary>
-        [Required]
-        public IEnumerable<UserDto> Publishers { get; set; } = Enumerable.Empty<UserDto>();
+    /// <summary>
+    /// Публикаторы. Могут загружать файл этой категории
+    /// </summary>
+    [Required]
+    public IEnumerable<UserDto> Publishers { get; set; } = Enumerable.Empty<UserDto>();
 
-        /// <summary>
-        /// Согласованты. Могут согласовывать загруженные файлы этой категории
-        /// </summary>
-        [Required]
-        public IEnumerable<UserDto> Approvers { get; set; } = Enumerable.Empty<UserDto>();
+    /// <summary>
+    /// Согласованты. Могут согласовывать загруженные файлы этой категории
+    /// </summary>
+    [Required]
+    public IEnumerable<UserDto> Approvers { get; set; } = Enumerable.Empty<UserDto>();
 
-        /// <summary>
-        /// Разрешение для текущего пользователя согласовывать документ
-        /// </summary>
-        [Required]
-        public bool PermissionToApprove { get; set; }
+    /// <summary>
+    /// Разрешение для текущего пользователя согласовывать документ
+    /// </summary>
+    [Required]
+    public bool PermissionToApprove { get; set; }
 
-        /// <summary>
-        /// Разрешение для текущего пользователя загружать документ
-        /// </summary>
-        [Required]
-        public bool PermissionToUpload { get; set; }
+    /// <summary>
+    /// Разрешение для текущего пользователя загружать документ
+    /// </summary>
+    [Required]
+    public bool PermissionToUpload { get; set; }
 
-        /// <summary>
-        /// Ссылка на документ.
-        /// </summary>
-        public FileInfoDto? File { get; set; }
-    }
+    /// <summary>
+    /// Ссылка на документ.
+    /// </summary>
+    public FileInfoDto? File { get; set; }
 }
diff --git a/AsbCloudApp/Data/DrillingProgramStateDto.cs b/AsbCloudApp/Data/DrillingProgramStateDto.cs
index 4368f4a3..247877a6 100644
--- a/AsbCloudApp/Data/DrillingProgramStateDto.cs
+++ b/AsbCloudApp/Data/DrillingProgramStateDto.cs
@@ -2,60 +2,59 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO состояния формирования программы бурения
+/// </summary>
+public class DrillingProgramStateDto
 {
     /// <summary>
-    /// DTO состояния формирования программы бурения
+    /// 0 - не инициировано
+    /// 1 - загрузка и согласование
+    /// 2 - формируется (несколько минут)
+    /// 3 - готова
     /// </summary>
-    public class DrillingProgramStateDto
-    {
-        /// <summary>
-        /// 0 - не инициировано
-        /// 1 - загрузка и согласование
-        /// 2 - формируется (несколько минут)
-        /// 3 - готова
-        /// </summary>
-        [Required]
-        public int IdState { get; set; }
-
-        /// <summary>
-        /// Ошибка при формировании
-        /// </summary>
-        public DrillingProgramCreateError? Error { get; set; }
-
-        /// <summary>
-        /// Файл сформированной программы бурения
-        /// </summary>
-        public FileInfoDto? Program { get; set; }
-
-        /// <summary>
-        /// Разрешение редактировать части программы бурения
-        /// </summary>
-        [Required]
-        public bool PermissionToEdit { get; set; }
-
-        /// <summary>
-        /// Список частей программы бурения
-        /// </summary>
-        [Required]
-        public IEnumerable<DrillingProgramPartDto> Parts { get; set; } = Enumerable.Empty<DrillingProgramPartDto>();
-    }
+    [Required]
+    public int IdState { get; set; }
 
     /// <summary>
-    /// DTO ошибки при создании программы бурения
+    /// Ошибка при формировании
     /// </summary>
-    public class DrillingProgramCreateError
-    {
-        /// <summary>
-        /// Текст ошибки для отображения пользователю
-        /// </summary>
-        [Required]
-        public string Message { get; set; } = string.Empty;
+    public DrillingProgramCreateError? Error { get; set; }
 
-        /// <summary>
-        /// Текст ошибки для разработчика
-        /// </summary>
-        [Required]
-        public string Exception { get; set; } = string.Empty;
-    }
+    /// <summary>
+    /// Файл сформированной программы бурения
+    /// </summary>
+    public FileInfoDto? Program { get; set; }
+
+    /// <summary>
+    /// Разрешение редактировать части программы бурения
+    /// </summary>
+    [Required]
+    public bool PermissionToEdit { get; set; }
+
+    /// <summary>
+    /// Список частей программы бурения
+    /// </summary>
+    [Required]
+    public IEnumerable<DrillingProgramPartDto> Parts { get; set; } = Enumerable.Empty<DrillingProgramPartDto>();
+}
+
+/// <summary>
+/// DTO ошибки при создании программы бурения
+/// </summary>
+public class DrillingProgramCreateError
+{
+    /// <summary>
+    /// Текст ошибки для отображения пользователю
+    /// </summary>
+    [Required]
+    public string Message { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Текст ошибки для разработчика
+    /// </summary>
+    [Required]
+    public string Exception { get; set; } = string.Empty;
 }
diff --git a/AsbCloudApp/Data/FaqDto.cs b/AsbCloudApp/Data/FaqDto.cs
index 28cc829b..ace7c58b 100644
--- a/AsbCloudApp/Data/FaqDto.cs
+++ b/AsbCloudApp/Data/FaqDto.cs
@@ -1,73 +1,72 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO для faq-вопроса
+/// </summary>
+public class FaqDto : IId
 {
     /// <summary>
-    /// DTO для faq-вопроса
+    /// ключ вопроса
     /// </summary>
-    public class FaqDto : IId
-    {
-        /// <summary>
-        /// ключ вопроса
-        /// </summary>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public int Id { get; set; }
 
-        /// <summary>
-        /// ключ автора вопроса
-        /// </summary>
-        public int? IdAuthorQuestion { get; set; }
+    /// <summary>
+    /// ключ автора вопроса
+    /// </summary>
+    public int? IdAuthorQuestion { get; set; }
 
-        /// <summary>
-        /// автор ответа
-        /// </summary>
-        public int? IdAuthorAnswer { get; set; }
+    /// <summary>
+    /// автор ответа
+    /// </summary>
+    public int? IdAuthorAnswer { get; set; }
 
 
-        /// <summary>
-        /// дата создания вопроса
-        /// </summary>
-        public DateTimeOffset? DateCreatedQuestion { get; set; }
+    /// <summary>
+    /// дата создания вопроса
+    /// </summary>
+    public DateTimeOffset? DateCreatedQuestion { get; set; }
 
-        /// <summary>
-        /// текст вопроса
-        /// </summary>
-        [Required]
-        public string Question { get; set; } = null!;
+    /// <summary>
+    /// текст вопроса
+    /// </summary>
+    [Required]
+    public string Question { get; set; } = null!;
 
-        /// <summary>
-        /// текст ответа
-        /// </summary>
-        public string? Answer { get; set; }
+    /// <summary>
+    /// текст ответа
+    /// </summary>
+    public string? Answer { get; set; }
 
-        /// <summary>
-        /// статус вопроса
-        /// </summary>
-        [Required]
-        public int State { get; set; } = 0;
+    /// <summary>
+    /// статус вопроса
+    /// </summary>
+    [Required]
+    public int State { get; set; } = 0;
 
-        /// <summary>
-        /// Счетчик повторений вопроса
-        /// </summary>
-        [Required]
-        public int CounterQuestion { get; set; } = 1;
+    /// <summary>
+    /// Счетчик повторений вопроса
+    /// </summary>
+    [Required]
+    public int CounterQuestion { get; set; } = 1;
 
-        /// <summary>
-        /// Частый вопрос
-        /// </summary>      
-        [Required]
-        public bool IsFrequently { get; set; } = false;
+    /// <summary>
+    /// Частый вопрос
+    /// </summary>      
+    [Required]
+    public bool IsFrequently { get; set; } = false;
 
-        /// <summary>
-        /// Автор вопроса
-        /// </summary>
-        [Required]
-        public string AurhorQuestionName { get; set; } = string.Empty;
+    /// <summary>
+    /// Автор вопроса
+    /// </summary>
+    [Required]
+    public string AurhorQuestionName { get; set; } = string.Empty;
 
-        /// <summary>
-        /// Автор ответа
-        /// </summary>
-        public string? AurhorAnswerName { get; set; }
-    }
+    /// <summary>
+    /// Автор ответа
+    /// </summary>
+    public string? AurhorAnswerName { get; set; }
 }
diff --git a/AsbCloudApp/Data/FileCategoryDto.cs b/AsbCloudApp/Data/FileCategoryDto.cs
index f55fdb30..372d6143 100644
--- a/AsbCloudApp/Data/FileCategoryDto.cs
+++ b/AsbCloudApp/Data/FileCategoryDto.cs
@@ -1,25 +1,24 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO категории файла
+/// </summary>
+public class FileCategoryDto : IId
 {
+    /// <inheritdoc/>    
+    [Required]
+    public int Id { get; set; }
+
     /// <summary>
-    /// DTO категории файла
+    /// полное название
     /// </summary>
-    public class FileCategoryDto : IId
-    {
-        /// <inheritdoc/>    
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public string Name { get; set; } = null!;
 
-        /// <summary>
-        /// полное название
-        /// </summary>
-        [Required]
-        public string Name { get; set; } = null!;
-
-        /// <summary>
-        /// сокращенное название
-        /// </summary>
-        public string ShortName { get; set; } = string.Empty;
-    }
+    /// <summary>
+    /// сокращенное название
+    /// </summary>
+    public string ShortName { get; set; } = string.Empty;
 }
diff --git a/AsbCloudApp/Data/FileInfoDto.cs b/AsbCloudApp/Data/FileInfoDto.cs
index 2e673ed0..e14a9cf1 100644
--- a/AsbCloudApp/Data/FileInfoDto.cs
+++ b/AsbCloudApp/Data/FileInfoDto.cs
@@ -4,68 +4,67 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using AsbCloudApp.Data.User;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO информации о файле. Используется для загрузки файла.
+/// </summary>
+public class FileInfoDto : IId, IWellRelated
 {
+    /// <inheritdoc/>
+    [Required]
+    public int Id { get; set; }
+
+    /// <inheritdoc/>
+    [Required]
+    [Range(1, int.MaxValue, ErrorMessage = "Id скважины не может быть меньше 1")]
+    public int IdWell { get; set; }
+
     /// <summary>
-    /// DTO информации о файле. Используется для загрузки файла.
+    /// id категории файла
     /// </summary>
-    public class FileInfoDto : IId, IWellRelated
-    {
-        /// <inheritdoc/>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    [Range(1, int.MaxValue, ErrorMessage = "Id категории файла не может быть меньше 1")]
+    public int IdCategory { get; set; }
 
-        /// <inheritdoc/>
-        [Required]
-        [Range(1, int.MaxValue, ErrorMessage = "Id скважины не может быть меньше 1")]
-        public int IdWell { get; set; }
+    /// <summary>
+    /// Id автора
+    /// </summary>
+    public int? IdAuthor { get; set; }
 
-        /// <summary>
-        /// id категории файла
-        /// </summary>
-        [Required]
-        [Range(1, int.MaxValue, ErrorMessage = "Id категории файла не может быть меньше 1")]
-        public int IdCategory { get; set; }
+    /// <summary>
+    /// имя файла
+    /// </summary>
+    [Required]
+    [StringLength(260, MinimumLength = 1, ErrorMessage = "Допустимое имя компании от 1 до 260 символов")]
+    public string Name { get; set; } = null!;
 
-        /// <summary>
-        /// Id автора
-        /// </summary>
-        public int? IdAuthor { get; set; }
+    /// <summary>
+    /// дата загрузки
+    /// </summary>
+    [Required]
+    public DateTimeOffset UploadDate { get; set; }
 
-        /// <summary>
-        /// имя файла
-        /// </summary>
-        [Required]
-        [StringLength(260, MinimumLength = 1, ErrorMessage = "Допустимое имя компании от 1 до 260 символов")]
-        public string Name { get; set; } = null!;
+    /// <summary>
+    /// размер в байтах
+    /// </summary>
+    [Required]
+    public long Size { get; set; }
 
-        /// <summary>
-        /// дата загрузки
-        /// </summary>
-        [Required]
-        public DateTimeOffset UploadDate { get; set; }
+    /// <summary>
+    /// Помечен как удаленный
+    /// </summary>
+    [Required]
+    public bool IsDeleted { get; set; }
 
-        /// <summary>
-        /// размер в байтах
-        /// </summary>
-        [Required]
-        public long Size { get; set; }
+    /// <summary>
+    /// DTO автора
+    /// </summary>
+    public UserDto? Author { get; set; }
 
-        /// <summary>
-        /// Помечен как удаленный
-        /// </summary>
-        [Required]
-        public bool IsDeleted { get; set; }
-
-        /// <summary>
-        /// DTO автора
-        /// </summary>
-        public UserDto? Author { get; set; }
-
-        /// <summary>
-        /// список отметок файла
-        /// </summary>
-        [Required]
-        public IEnumerable<FileMarkDto> FileMarks { get; set; } = Enumerable.Empty<FileMarkDto>();
-    }
+    /// <summary>
+    /// список отметок файла
+    /// </summary>
+    [Required]
+    public IEnumerable<FileMarkDto> FileMarks { get; set; } = Enumerable.Empty<FileMarkDto>();
 }
diff --git a/AsbCloudApp/Data/FileMarkDto.cs b/AsbCloudApp/Data/FileMarkDto.cs
index ad48f018..9c87bf4a 100644
--- a/AsbCloudApp/Data/FileMarkDto.cs
+++ b/AsbCloudApp/Data/FileMarkDto.cs
@@ -2,55 +2,54 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using AsbCloudApp.Data.User;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Отметка для файла
+/// </summary>
+public class FileMarkDto: IId
 {
+    /// <inheritdoc/>
+    [Required]
+    public int Id { get; set; }
+
     /// <summary>
-    /// Отметка для файла
+    /// id файла
     /// </summary>
-    public class FileMarkDto: IId
-    {
-        /// <inheritdoc/>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    [Range(1, int.MaxValue, ErrorMessage = "Id файла не может быть меньше 1")]
+    public int IdFile { get; set; }
 
-        /// <summary>
-        /// id файла
-        /// </summary>
-        [Required]
-        [Range(1, int.MaxValue, ErrorMessage = "Id файла не может быть меньше 1")]
-        public int IdFile { get; set; }
+    /// <summary>
+    /// 0 - отклонен
+    /// 1 - согласован
+    /// </summary>
+    [Required]
+    [Range(0, int.MaxValue, ErrorMessage = "Id категории действия с файлом не может быть меньше 1")]
+    public int IdMarkType { get; set; }
 
-        /// <summary>
-        /// 0 - отклонен
-        /// 1 - согласован
-        /// </summary>
-        [Required]
-        [Range(0, int.MaxValue, ErrorMessage = "Id категории действия с файлом не может быть меньше 1")]
-        public int IdMarkType { get; set; }
+    /// <summary>
+    /// дата/время добавления.
+    /// Необязательно указывать в запросе на создание.
+    /// </summary>
+    [Required]
+    public DateTimeOffset DateCreated { get; set; }
 
-        /// <summary>
-        /// дата/время добавления.
-        /// Необязательно указывать в запросе на создание.
-        /// </summary>
-        [Required]
-        public DateTimeOffset DateCreated { get; set; }
+    /// <summary>
+    /// Полезный комментарий 
+    /// </summary>
+    [StringLength(4096, MinimumLength = 1, ErrorMessage = "Допустимое имя компании от 1 до 4096 символов")]
+    public string? Comment { get; set; }
 
-        /// <summary>
-        /// Полезный комментарий 
-        /// </summary>
-        [StringLength(4096, MinimumLength = 1, ErrorMessage = "Допустимое имя компании от 1 до 4096 символов")]
-        public string? Comment { get; set; }
+    /// <summary>
+    /// признак удаления отметки
+    /// </summary>
+    [Required]
+    public bool IsDeleted { get; set; }
 
-        /// <summary>
-        /// признак удаления отметки
-        /// </summary>
-        [Required]
-        public bool IsDeleted { get; set; }
-
-        /// <summary>
-        /// Пользователь создающий отметку.
-        /// Необязательно указывать в запросе на создание.
-        /// </summary>
-        public UserDto? User { get; set; }
-    }
+    /// <summary>
+    /// Пользователь создающий отметку.
+    /// Необязательно указывать в запросе на создание.
+    /// </summary>
+    public UserDto? User { get; set; }
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/GTR/JsonValue.cs b/AsbCloudApp/Data/GTR/JsonValue.cs
index 15df0604..0da94b98 100644
--- a/AsbCloudApp/Data/GTR/JsonValue.cs
+++ b/AsbCloudApp/Data/GTR/JsonValue.cs
@@ -1,14 +1,13 @@
-namespace AsbCloudApp.Data.GTR
+namespace AsbCloudApp.Data.GTR;
+
+/// <summary>
+/// Класс позволяющий хранить значение неопределенного типа.
+/// Все возможные типы должны быть описаны в JsonValueJsonConverter.
+/// </summary>
+/// <param name="Value"></param>
+public record JsonValue(object Value)
 {
-    /// <summary>
-    /// Класс позволяющий хранить значение неопределенного типа.
-    /// Все возможные типы должны быть описаны в JsonValueJsonConverter.
-    /// </summary>
-    /// <param name="Value"></param>
-    public record JsonValue(object Value)
-    {
-        /// <inheritdoc/>
-        public override string ToString()
-            => Value.ToString() ?? string.Empty;
-    }
+    /// <inheritdoc/>
+    public override string ToString()
+        => Value.ToString() ?? string.Empty;
 }
diff --git a/AsbCloudApp/Data/GTR/WitsItemRecordDto.cs b/AsbCloudApp/Data/GTR/WitsItemRecordDto.cs
index f6dfde81..e0011c01 100644
--- a/AsbCloudApp/Data/GTR/WitsItemRecordDto.cs
+++ b/AsbCloudApp/Data/GTR/WitsItemRecordDto.cs
@@ -1,35 +1,34 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.GTR
+namespace AsbCloudApp.Data.GTR;
+
+/// <summary>
+/// Запись WITS
+/// </summary>
+public class WitsItemRecordDto
 {
     /// <summary>
-    /// Запись WITS
+    /// Record Id
     /// </summary>
-    public class WitsItemRecordDto
-    {
-        /// <summary>
-        /// Record Id
-        /// </summary>
-        [Required]
-        public int IdRecord { get; set; }
+    [Required]
+    public int IdRecord { get; set; }
 
-        /// <summary>
-        /// Item Id
-        /// </summary>
-        [Required]
-        public int IdItem { get; set; }
+    /// <summary>
+    /// Item Id
+    /// </summary>
+    [Required]
+    public int IdItem { get; set; }
 
-        /// <summary>
-        /// Дата создания записи
-        /// </summary>
-        [Required]
-        public DateTime Date { get; set; }
+    /// <summary>
+    /// Дата создания записи
+    /// </summary>
+    [Required]
+    public DateTime Date { get; set; }
 
-        /// <summary>
-        /// Значение
-        /// </summary>
-        [Required]
-        public JsonValue Value { get; set; } = default!;
-    }
+    /// <summary>
+    /// Значение
+    /// </summary>
+    [Required]
+    public JsonValue Value { get; set; } = default!;
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/GTR/WitsRecordDto.cs b/AsbCloudApp/Data/GTR/WitsRecordDto.cs
index e5469b9a..f41330d6 100644
--- a/AsbCloudApp/Data/GTR/WitsRecordDto.cs
+++ b/AsbCloudApp/Data/GTR/WitsRecordDto.cs
@@ -2,29 +2,28 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.GTR
+namespace AsbCloudApp.Data.GTR;
+
+/// <summary>
+/// Запись WITS
+/// </summary>
+public class WitsRecordDto
 {
     /// <summary>
-    /// Запись WITS
+    /// Id записи
     /// </summary>
-    public class WitsRecordDto
-    {
-        /// <summary>
-        /// Id записи
-        /// </summary>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public int Id { get; set; }
 
-        /// <summary>
-        /// Дата создания записи
-        /// </summary>
-        [Required]
-        public DateTime Date { get; set; }
+    /// <summary>
+    /// Дата создания записи
+    /// </summary>
+    [Required]
+    public DateTime Date { get; set; }
 
-        /// <summary>
-        /// Параметры. Ключ - id_item. ValueContainer содержит значение.
-        /// </summary>
-        [Required]
-        public Dictionary<int, JsonValue> Items { get; set; } = new();
-    }
+    /// <summary>
+    /// Параметры. Ключ - id_item. ValueContainer содержит значение.
+    /// </summary>
+    [Required]
+    public Dictionary<int, JsonValue> Items { get; set; } = new();
 }
diff --git a/AsbCloudApp/Data/IId.cs b/AsbCloudApp/Data/IId.cs
index 4449fa23..0788218a 100644
--- a/AsbCloudApp/Data/IId.cs
+++ b/AsbCloudApp/Data/IId.cs
@@ -1,13 +1,12 @@
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Интерфейс данных с Id
+/// </summary>
+public interface IId
 {
     /// <summary>
-    /// Интерфейс данных с Id
+    /// Идентификатор БД
     /// </summary>
-    public interface IId
-    {
-        /// <summary>
-        /// Идентификатор БД
-        /// </summary>
-        public int Id { get; set; }
-    }
+    public int Id { get; set; }
 }
diff --git a/AsbCloudApp/Data/IMapPoint.cs b/AsbCloudApp/Data/IMapPoint.cs
index 1c373685..2f23d37b 100644
--- a/AsbCloudApp/Data/IMapPoint.cs
+++ b/AsbCloudApp/Data/IMapPoint.cs
@@ -1,23 +1,22 @@
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// точка на карте
+/// </summary>
+public interface IMapPoint
 {
     /// <summary>
-    /// точка на карте
+    /// Широта
     /// </summary>
-    public interface IMapPoint
-    {
-        /// <summary>
-        /// Широта
-        /// </summary>
-        double? Latitude { get; set; }
+    double? Latitude { get; set; }
 
-        /// <summary>
-        /// Широта
-        /// </summary>
-        double? Longitude { get; set; }
+    /// <summary>
+    /// Широта
+    /// </summary>
+    double? Longitude { get; set; }
 
-        /// <summary>
-        /// Часовой пояс
-        /// </summary>
-        SimpleTimezoneDto Timezone { get; set; }
-    }
+    /// <summary>
+    /// Часовой пояс
+    /// </summary>
+    SimpleTimezoneDto Timezone { get; set; }
 }
diff --git a/AsbCloudApp/Data/ITelemetryData.cs b/AsbCloudApp/Data/ITelemetryData.cs
index a2dc4924..d3061294 100644
--- a/AsbCloudApp/Data/ITelemetryData.cs
+++ b/AsbCloudApp/Data/ITelemetryData.cs
@@ -1,26 +1,25 @@
 using System;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Telemetry related dto
+/// </summary>
+public interface ITelemetryRelated
 {
     /// <summary>
-    /// Telemetry related dto
+    /// ИД телеметрии
     /// </summary>
-    public interface ITelemetryRelated
-    {
-        /// <summary>
-        /// ИД телеметрии
-        /// </summary>
-        int IdTelemetry { get; set; }
-    }
-
-    /// <summary>
-    /// Интерфейс записи данных телеметрии
-    /// </summary>
-    public interface ITelemetryData : ITelemetryRelated
-    {
-        /// <summary>
-        /// Отметка времени для этой записи
-        /// </summary>
-        DateTime DateTime { get; set; }
-    }
+    int IdTelemetry { get; set; }
+}
+
+/// <summary>
+/// Интерфейс записи данных телеметрии
+/// </summary>
+public interface ITelemetryData : ITelemetryRelated
+{
+    /// <summary>
+    /// Отметка времени для этой записи
+    /// </summary>
+    DateTime DateTime { get; set; }
 }
diff --git a/AsbCloudApp/Data/IWellRelated.cs b/AsbCloudApp/Data/IWellRelated.cs
index 55877a9e..fc85e7dd 100644
--- a/AsbCloudApp/Data/IWellRelated.cs
+++ b/AsbCloudApp/Data/IWellRelated.cs
@@ -1,13 +1,12 @@
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Well related DTO
+/// </summary>
+public interface IWellRelated
 {
     /// <summary>
-    /// Well related DTO
+    /// Well id in db
     /// </summary>
-    public interface IWellRelated
-    {
-        /// <summary>
-        /// Well id in db
-        /// </summary>
-        int IdWell { get; set; }
-    }
+    int IdWell { get; set; }
 }
diff --git a/AsbCloudApp/Data/ItemInfoDto.cs b/AsbCloudApp/Data/ItemInfoDto.cs
index 0022b1c1..fff4154e 100644
--- a/AsbCloudApp/Data/ItemInfoDto.cs
+++ b/AsbCloudApp/Data/ItemInfoDto.cs
@@ -1,26 +1,25 @@
 using System;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// хранение дополнительной информации о записи 
+/// запись формируется на сервере автоматически
+/// </summary>
+public class ItemInfoDto
 {
     /// <summary>
-    /// хранение дополнительной информации о записи 
-    /// запись формируется на сервере автоматически
+    /// пользователь, внесший изменения (запись формируется на сервере автоматически)
     /// </summary>
-    public class ItemInfoDto
-    {
-        /// <summary>
-        /// пользователь, внесший изменения (запись формируется на сервере автоматически)
-        /// </summary>
-        public int? IdUser { get; set; }
+    public int? IdUser { get; set; }
 
-        /// <summary>
-        /// имя пользователя, внесшего изменения (запись формируется на сервере автоматически)
-        /// </summary>
-        public string? UserName { get; set; }
+    /// <summary>
+    /// имя пользователя, внесшего изменения (запись формируется на сервере автоматически)
+    /// </summary>
+    public string? UserName { get; set; }
 
-        /// <summary>
-        /// дата последнего обновления (запись формируется на сервере автоматически)
-        /// </summary>
-        public DateTimeOffset? LastUpdateDate { get; set; }
-    }
+    /// <summary>
+    /// дата последнего обновления (запись формируется на сервере автоматически)
+    /// </summary>
+    public DateTimeOffset? LastUpdateDate { get; set; }
 }
diff --git a/AsbCloudApp/Data/JobDto.cs b/AsbCloudApp/Data/JobDto.cs
index 0dfb82e3..1f5a7967 100644
--- a/AsbCloudApp/Data/JobDto.cs
+++ b/AsbCloudApp/Data/JobDto.cs
@@ -1,56 +1,55 @@
 using System.Collections;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Состояние фоновой задачи
+/// </summary>
+public enum JobState
 {
     /// <summary>
-    /// Состояние фоновой задачи
+    /// Ожидает в очереди на выполнение
     /// </summary>
-    public enum JobState
-    {
-        /// <summary>
-        /// Ожидает в очереди на выполнение
-        /// </summary>
-        Waiting,
-        /// <summary>
-        /// выполняется
-        /// </summary>
-        Working,
-        /// <summary>
-        /// успешно выполнена
-        /// </summary>
-        Done,
-        /// <summary>
-        /// завершена с ошибкой
-        /// </summary>
-        Fail
-    };
+    Waiting,
+    /// <summary>
+    /// выполняется
+    /// </summary>
+    Working,
+    /// <summary>
+    /// успешно выполнена
+    /// </summary>
+    Done,
+    /// <summary>
+    /// завершена с ошибкой
+    /// </summary>
+    Fail
+};
+
+/// <summary>
+/// работа фоновой задачи
+/// </summary>
+public class JobDto
+{
+    /// <summary>
+    /// идентификатор
+    /// </summary>
+    [Required]
+    public int Id { get; set; }
 
     /// <summary>
-    /// работа фоновой задачи
+    /// Состояние
     /// </summary>
-    public class JobDto
-    {
-        /// <summary>
-        /// идентификатор
-        /// </summary>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public JobState State { get; set; }
 
-        /// <summary>
-        /// Состояние
-        /// </summary>
-        [Required]
-        public JobState State { get; set; }
+    /// <summary>
+    /// результат выполнения
+    /// </summary>
+    public Hashtable? Results { get; set; }
 
-        /// <summary>
-        /// результат выполнения
-        /// </summary>
-        public Hashtable? Results { get; set; }
-
-        /// <summary>
-        /// Исключение, если возникла ошибка
-        /// </summary>
-        public string? Error { get; set; }
-    }
+    /// <summary>
+    /// Исключение, если возникла ошибка
+    /// </summary>
+    public string? Error { get; set; }
 }
diff --git a/AsbCloudApp/Data/LimitingParameterDataDto.cs b/AsbCloudApp/Data/LimitingParameterDataDto.cs
index 11ecde24..cc1a9dec 100644
--- a/AsbCloudApp/Data/LimitingParameterDataDto.cs
+++ b/AsbCloudApp/Data/LimitingParameterDataDto.cs
@@ -1,45 +1,44 @@
 using System;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Статистика по ограничивающим параметрам
+/// </summary>
+public class LimitingParameterDataDto
 {
     /// <summary>
-    /// Статистика по ограничивающим параметрам
+    /// Идентификатор скважины
     /// </summary>
-    public class LimitingParameterDataDto
-    {
-        /// <summary>
-        /// Идентификатор скважины
-        /// </summary>
-        public int IdWell { get; set; }
+    public int IdWell { get; set; }
 
-        /// <summary>
-        /// Идентификатор телеметрии
-        /// </summary>
-        public int IdTelemetry { get; set; }
+    /// <summary>
+    /// Идентификатор телеметрии
+    /// </summary>
+    public int IdTelemetry { get; set; }
 
-        /// <summary>
-        /// Дата начала ограничения
-        /// </summary>
-        public DateTimeOffset DateStart { get; set; }
+    /// <summary>
+    /// Дата начала ограничения
+    /// </summary>
+    public DateTimeOffset DateStart { get; set; }
 
-        /// <summary>
-        /// Дата окончания ограничения
-        /// </summary>
-        public DateTimeOffset DateEnd { get; set; }
+    /// <summary>
+    /// Дата окончания ограничения
+    /// </summary>
+    public DateTimeOffset DateEnd { get; set; }
 
-        /// <summary>
-        /// Глубина начала ограничения 
-        /// </summary>
-        public float DepthStart { get; set; }
+    /// <summary>
+    /// Глубина начала ограничения 
+    /// </summary>
+    public float DepthStart { get; set; }
 
-        /// <summary>
-        /// Глубина окончания ограничения
-        /// </summary>
-        public float DepthEnd { get; set; }
+    /// <summary>
+    /// Глубина окончания ограничения
+    /// </summary>
+    public float DepthEnd { get; set; }
 
-        /// <summary>
-        /// Идентификатор ограничения
-        /// </summary>
-        public short IdFeedRegulator { get; set; }
-    }
+    /// <summary>
+    /// Идентификатор ограничения
+    /// </summary>
+    public short IdFeedRegulator { get; set; }
 }
diff --git a/AsbCloudApp/Data/LimitingParameterDto.cs b/AsbCloudApp/Data/LimitingParameterDto.cs
index 13a23b80..a4883f41 100644
--- a/AsbCloudApp/Data/LimitingParameterDto.cs
+++ b/AsbCloudApp/Data/LimitingParameterDto.cs
@@ -1,71 +1,70 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Статистика по ограничивающим параметрам
+/// </summary>
+public class LimitingParameterDto
 {
     /// <summary>
-    /// Статистика по ограничивающим параметрам
+    /// Нет ограничения
     /// </summary>
-    public class LimitingParameterDto
-    {
-        /// <summary>
-        /// Нет ограничения
-        /// </summary>
-        public const int NoLimit = 0;
+    public const int NoLimit = 0;
 
-        /// <summary>
-        /// МСП
-        /// </summary>
-        public const int RopPlan = 1;
+    /// <summary>
+    /// МСП
+    /// </summary>
+    public const int RopPlan = 1;
 
-        /// <summary>
-        /// Давление
-        /// </summary>
-        public const int Pressure = 2;
+    /// <summary>
+    /// Давление
+    /// </summary>
+    public const int Pressure = 2;
 
-        /// <summary>
-        /// Осевая нагрузка
-        /// </summary>
-        public const int AxialLoad = 3;
+    /// <summary>
+    /// Осевая нагрузка
+    /// </summary>
+    public const int AxialLoad = 3;
 
-        /// <summary>
-        /// Момент
-        /// </summary>
-        public const int RotorTorque = 4;
-        /// <summary>
-        /// Идентификатор скважины
-        /// </summary>
-        [Required]
-        public int IdWell { get; set; }
+    /// <summary>
+    /// Момент
+    /// </summary>
+    public const int RotorTorque = 4;
+    /// <summary>
+    /// Идентификатор скважины
+    /// </summary>
+    [Required]
+    public int IdWell { get; set; }
 
-        /// <summary>
-        /// Время бурения
-        /// </summary>
-        [Required]
-        public float TotalMinutes { get; set; }
+    /// <summary>
+    /// Время бурения
+    /// </summary>
+    [Required]
+    public float TotalMinutes { get; set; }
 
-        /// <summary>
-        /// Глубина бурения
-        /// </summary>
-        [Required]
-        public float Depth { get; set; }
+    /// <summary>
+    /// Глубина бурения
+    /// </summary>
+    [Required]
+    public float Depth { get; set; }
 
-        /// <summary>
-        /// Идентификатор критерия бурения
-        /// </summary>
-        [Required]
-        public short IdFeedRegulator { get; set; }
+    /// <summary>
+    /// Идентификатор критерия бурения
+    /// </summary>
+    [Required]
+    public short IdFeedRegulator { get; set; }
 
-        /// <summary>
-        /// Наименование критерия бурения
-        /// </summary>
-        [Required]
-        public string NameFeedRegulator { get; set; } = string.Empty;
+    /// <summary>
+    /// Наименование критерия бурения
+    /// </summary>
+    [Required]
+    public string NameFeedRegulator { get; set; } = string.Empty;
 
-        /// <summary>
-        /// Количество включений
-        /// </summary>
-        [Required]
-        public int NumberInclusions { get; set; }
-    }
+    /// <summary>
+    /// Количество включений
+    /// </summary>
+    [Required]
+    public int NumberInclusions { get; set; }
 }
diff --git a/AsbCloudApp/Data/MapPointBaseDto.cs b/AsbCloudApp/Data/MapPointBaseDto.cs
index 61713a8f..1a1ae0bf 100644
--- a/AsbCloudApp/Data/MapPointBaseDto.cs
+++ b/AsbCloudApp/Data/MapPointBaseDto.cs
@@ -1,30 +1,29 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Точка на карте с названием
+/// </summary>
+public class MapPointBaseDto : IMapPoint, IId
 {
+    /// <inheritdoc/>
+    public int Id { get; set; }
+
     /// <summary>
-    /// Точка на карте с названием
+    /// Название
     /// </summary>
-    public class MapPointBaseDto : IMapPoint, IId
-    {
-        /// <inheritdoc/>
-        public int Id { get; set; }
+    [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимая длина названия от 1 до 50 символов")]
+    public string Caption { get; set; } = null!;
 
-        /// <summary>
-        /// Название
-        /// </summary>
-        [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимая длина названия от 1 до 50 символов")]
-        public string Caption { get; set; } = null!;
+    /// <inheritdoc/>
+    [Range(-90, 90, ErrorMessage = "Допустимые значения широты от -90 до 90")]
+    public double? Latitude { get; set; }
 
-        /// <inheritdoc/>
-        [Range(-90, 90, ErrorMessage = "Допустимые значения широты от -90 до 90")]
-        public double? Latitude { get; set; }
+    /// <inheritdoc/>
+    [Range(-180, 180, ErrorMessage = "Допустимые значения долготы от -180 до 180")]
+    public double? Longitude { get; set; }
 
-        /// <inheritdoc/>
-        [Range(-180, 180, ErrorMessage = "Допустимые значения долготы от -180 до 180")]
-        public double? Longitude { get; set; }
-
-        /// <inheritdoc/>
-        public SimpleTimezoneDto Timezone { get; set; } = null!;
-    }
+    /// <inheritdoc/>
+    public SimpleTimezoneDto Timezone { get; set; } = null!;
 }
diff --git a/AsbCloudApp/Data/MeasureDto.cs b/AsbCloudApp/Data/MeasureDto.cs
index 17ba3968..ee154d69 100644
--- a/AsbCloudApp/Data/MeasureDto.cs
+++ b/AsbCloudApp/Data/MeasureDto.cs
@@ -2,46 +2,45 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// инфо о результатах замера
+/// </summary>
+public class MeasureDto : IId, IWellRelated
 {
+    /// <inheritdoc/>
+    [Required]
+    public int Id { get; set; }
+
+    /// <inheritdoc/>
+    [Required]
+    [Range(1, int.MaxValue, ErrorMessage = "Id скважины не может быть меньше 1")]
+    public int IdWell { get; set; }
+
     /// <summary>
-    /// инфо о результатах замера
+    /// Id категории замера
     /// </summary>
-    public class MeasureDto : IId, IWellRelated
-    {
-        /// <inheritdoc/>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    [Range(1, int.MaxValue, ErrorMessage = "Id категории не может быть меньше 1")]
+    public int IdCategory { get; set; }
 
-        /// <inheritdoc/>
-        [Required]
-        [Range(1, int.MaxValue, ErrorMessage = "Id скважины не может быть меньше 1")]
-        public int IdWell { get; set; }
+    /// <summary>
+    /// название категории замера
+    /// </summary>
+    [Required]
+    [StringLength(120, MinimumLength = 1, ErrorMessage = "Название категории не может быть больше 120 символов")]
+    public string CategoryName { get; set; } = string.Empty;
 
-        /// <summary>
-        /// Id категории замера
-        /// </summary>
-        [Required]
-        [Range(1, int.MaxValue, ErrorMessage = "Id категории не может быть меньше 1")]
-        public int IdCategory { get; set; }
+    /// <summary>
+    /// отметка времени замера
+    /// </summary>
+    [Required]
+    public DateTimeOffset Timestamp { get; set; }
 
-        /// <summary>
-        /// название категории замера
-        /// </summary>
-        [Required]
-        [StringLength(120, MinimumLength = 1, ErrorMessage = "Название категории не может быть больше 120 символов")]
-        public string CategoryName { get; set; } = string.Empty;
-
-        /// <summary>
-        /// отметка времени замера
-        /// </summary>
-        [Required]
-        public DateTimeOffset Timestamp { get; set; }
-
-        /// <summary>
-        /// данные замера
-        /// </summary>
-        [Required]
-        public Dictionary<string, object> Data { get; set; } = new();
-    }
+    /// <summary>
+    /// данные замера
+    /// </summary>
+    [Required]
+    public Dictionary<string, object> Data { get; set; } = new();
 }
diff --git a/AsbCloudApp/Data/MessageDto.cs b/AsbCloudApp/Data/MessageDto.cs
index 5272e237..097f8161 100644
--- a/AsbCloudApp/Data/MessageDto.cs
+++ b/AsbCloudApp/Data/MessageDto.cs
@@ -1,47 +1,46 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Сообщение для frontend
+/// </summary>
+public class MessageDto : IId
 {
+    /// <inheritdoc/>
+    [Required]
+    public int Id { get; set; }
+
     /// <summary>
-    /// Сообщение для frontend
+    /// дата появления события
     /// </summary>
-    public class MessageDto : IId
-    {
-        /// <inheritdoc/>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public DateTimeOffset DateTime { get; set; }
 
-        /// <summary>
-        /// дата появления события
-        /// </summary>
-        [Required]
-        public DateTimeOffset DateTime { get; set; }
+    /// <summary>
+    /// категория события
+    /// </summary>
+    [Required]
+    [Range(1, int.MaxValue, ErrorMessage = "Id категории не может быть ниже 1")]
+    public int CategoryId { get; set; }
 
-        /// <summary>
-        /// категория события
-        /// </summary>
-        [Required]
-        [Range(1, int.MaxValue, ErrorMessage = "Id категории не может быть ниже 1")]
-        public int CategoryId { get; set; }
+    /// <summary>
+    /// глубина забоя, при котором событие возникло
+    /// </summary>
+    [Required]
+    [Range(-1, int.MaxValue, ErrorMessage = "Id скважины не может быть ниже 1")]
+    public double WellDepth { get; set; }
 
-        /// <summary>
-        /// глубина забоя, при котором событие возникло
-        /// </summary>
-        [Required]
-        [Range(-1, int.MaxValue, ErrorMessage = "Id скважины не может быть ниже 1")]
-        public double WellDepth { get; set; }
+    /// <summary>
+    /// пользователь панели оператора
+    /// </summary>
+    public string? User { get; set; }
 
-        /// <summary>
-        /// пользователь панели оператора
-        /// </summary>
-        public string? User { get; set; }
-
-        /// <summary>
-        /// текст сообщения
-        /// </summary>
-        [Required]
-        [StringLength(400, MinimumLength = 1, ErrorMessage = "Допустимая длина текста сообщения от 1 до 400 символов")]
-        public string Message { get; set; } = string.Empty;
-    }
+    /// <summary>
+    /// текст сообщения
+    /// </summary>
+    [Required]
+    [StringLength(400, MinimumLength = 1, ErrorMessage = "Допустимая длина текста сообщения от 1 до 400 символов")]
+    public string Message { get; set; } = string.Empty;
 }
diff --git a/AsbCloudApp/Data/MinMaxDto.cs b/AsbCloudApp/Data/MinMaxDto.cs
index d7d8703a..d8501b49 100644
--- a/AsbCloudApp/Data/MinMaxDto.cs
+++ b/AsbCloudApp/Data/MinMaxDto.cs
@@ -1,18 +1,17 @@
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Минимальное и максимальное значение
+/// </summary>
+public class MinMaxDto<T>
 {
     /// <summary>
-    /// Минимальное и максимальное значение
+    /// Минимальное значение
     /// </summary>
-    public class MinMaxDto<T>
-    {
-        /// <summary>
-        /// Минимальное значение
-        /// </summary>
-        public T? Min { get; set; }
+    public T? Min { get; set; }
 
-        /// <summary>
-        /// Максимальное значение
-        /// </summary>
-        public T? Max { get; set; }
-    }
+    /// <summary>
+    /// Максимальное значение
+    /// </summary>
+    public T? Max { get; set; }
 }
diff --git a/AsbCloudApp/Data/MinMaxExtendedViewDto.cs b/AsbCloudApp/Data/MinMaxExtendedViewDto.cs
index 6e1aab48..5e7f27ce 100644
--- a/AsbCloudApp/Data/MinMaxExtendedViewDto.cs
+++ b/AsbCloudApp/Data/MinMaxExtendedViewDto.cs
@@ -1,23 +1,22 @@
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Расширение для класса MinMaxDto
+/// </summary>
+public class MinMaxExtendedViewDto : MinMaxDto<double>
 {
     /// <summary>
-    /// Расширение для класса MinMaxDto
+    /// Среднее значение
     /// </summary>
-    public class MinMaxExtendedViewDto : MinMaxDto<double>
-    {
-        /// <summary>
-        /// Среднее значение
-        /// </summary>
-        public double Avg { get; set; }
+    public double Avg { get; set; }
 
-        /// <summary>
-        /// Является максимальным 
-        /// </summary>
-        public bool IsMax { get; set; }
+    /// <summary>
+    /// Является максимальным 
+    /// </summary>
+    public bool IsMax { get; set; }
 
-        /// <summary>
-        /// Является минимальным
-        /// </summary>
-        public bool IsMin { get; set; }
-    }
+    /// <summary>
+    /// Является минимальным
+    /// </summary>
+    public bool IsMin { get; set; }
 }
diff --git a/AsbCloudApp/Data/OperationValueDto.cs b/AsbCloudApp/Data/OperationValueDto.cs
index 587b8e1c..9b94b0c8 100644
--- a/AsbCloudApp/Data/OperationValueDto.cs
+++ b/AsbCloudApp/Data/OperationValueDto.cs
@@ -1,53 +1,52 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Описание целевых/нормативных показателей операций
+/// </summary>
+public class OperationValueDto : IId, IWellRelated
 {
     /// <summary>
-    /// Описание целевых/нормативных показателей операций
+    /// Идентификатор в БД
     /// </summary>
-    public class OperationValueDto : IId, IWellRelated
-    {
-        /// <summary>
-        /// Идентификатор в БД
-        /// </summary>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public int Id { get; set; }
 
-        /// <summary>
-        /// Идентификатор скважины
-        /// </summary>
-        [Required]
-        public int IdWell { get; set; }
+    /// <summary>
+    /// Идентификатор скважины
+    /// </summary>
+    [Required]
+    public int IdWell { get; set; }
 
-        /// <summary>
-        /// Идентификатор категории операции
-        /// </summary>
-        [Required]
-        public int IdOperationCategory { get; set; }
+    /// <summary>
+    /// Идентификатор категории операции
+    /// </summary>
+    [Required]
+    public int IdOperationCategory { get; set; }
 
-        /// <summary>
-        /// Целевой показатель
-        /// </summary>
-        [Required]
-        public double TargetValue { get; set; }
+    /// <summary>
+    /// Целевой показатель
+    /// </summary>
+    [Required]
+    public double TargetValue { get; set; }
 
-        /// <summary>
-        /// Нормативный показатель
-        /// </summary>
-        [Required]
-        public double StandardValue { get; set; }
+    /// <summary>
+    /// Нормативный показатель
+    /// </summary>
+    [Required]
+    public double StandardValue { get; set; }
 
-        /// <summary>
-        /// Стартовая глубина
-        /// </summary>
-        [Required]
-        public double DepthStart { get; set; }
+    /// <summary>
+    /// Стартовая глубина
+    /// </summary>
+    [Required]
+    public double DepthStart { get; set; }
 
-        /// <summary>
-        /// Конечная глубина
-        /// </summary>
-        [Required]
-        public double DepthEnd { get; set; }
+    /// <summary>
+    /// Конечная глубина
+    /// </summary>
+    [Required]
+    public double DepthEnd { get; set; }
 
-    }
 }
diff --git a/AsbCloudApp/Data/PaginationContainer.cs b/AsbCloudApp/Data/PaginationContainer.cs
index 30d3bdec..d5a03b22 100644
--- a/AsbCloudApp/Data/PaginationContainer.cs
+++ b/AsbCloudApp/Data/PaginationContainer.cs
@@ -1,40 +1,39 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Контейнер для поддержки постраничного просмотра таблиц
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public class PaginationContainer<T>
 {
     /// <summary>
-    /// Контейнер для поддержки постраничного просмотра таблиц
+    /// конструктор
     /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public class PaginationContainer<T>
+    public PaginationContainer()
     {
-        /// <summary>
-        /// конструктор
-        /// </summary>
-        public PaginationContainer()
-        {
-            Items = Enumerable.Empty<T>();
-        }
-
-        /// <summary>
-        /// Кол-во записей пропущенных с начала таблицы в запросе от api
-        /// </summary>
-        public int Skip { get; set; }
-
-        /// <summary>
-        /// Кол-во записей в запросе от api
-        /// </summary>
-        public int Take { get; set; }
-
-        /// <summary>
-        /// Кол-во записей всего в таблице
-        /// </summary>
-        public int Count { get; set; }
-
-        /// <summary>
-        /// Данные
-        /// </summary>
-        public IEnumerable<T> Items { get; set; }
+        Items = Enumerable.Empty<T>();
     }
+
+    /// <summary>
+    /// Кол-во записей пропущенных с начала таблицы в запросе от api
+    /// </summary>
+    public int Skip { get; set; }
+
+    /// <summary>
+    /// Кол-во записей в запросе от api
+    /// </summary>
+    public int Take { get; set; }
+
+    /// <summary>
+    /// Кол-во записей всего в таблице
+    /// </summary>
+    public int Count { get; set; }
+
+    /// <summary>
+    /// Данные
+    /// </summary>
+    public IEnumerable<T> Items { get; set; }
 }
diff --git a/AsbCloudApp/Data/PermissionDto.cs b/AsbCloudApp/Data/PermissionDto.cs
index 8436ae73..db3ecc6b 100644
--- a/AsbCloudApp/Data/PermissionDto.cs
+++ b/AsbCloudApp/Data/PermissionDto.cs
@@ -1,28 +1,27 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Разрешение для группы пользователей сделать что-либо через web-api. <br/>
+/// применяется как возможность доступа к Endpoint. <br/>
+/// </summary>
+public class PermissionDto : IId
 {
+    /// <inheritdoc/>
+    [Required]
+    public int Id { get; set; }
+
     /// <summary>
-    /// Разрешение для группы пользователей сделать что-либо через web-api. <br/>
-    /// применяется как возможность доступа к Endpoint. <br/>
+    /// Название
     /// </summary>
-    public class PermissionDto : IId
-    {
-        /// <inheritdoc/>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимая длина названия разрешения от 1 до 50 символов")]
+    public string Name { get; set; } = string.Empty;
 
-        /// <summary>
-        /// Название
-        /// </summary>
-        [Required]
-        [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимая длина названия разрешения от 1 до 50 символов")]
-        public string Name { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Описание
-        /// </summary>
-        [StringLength(1024, MinimumLength = 1, ErrorMessage = "Допустимая длина описания от 1 до 1024 символов")]
-        public string? Description { get; set; }
-    }
+    /// <summary>
+    /// Описание
+    /// </summary>
+    [StringLength(1024, MinimumLength = 1, ErrorMessage = "Допустимая длина описания от 1 до 1024 символов")]
+    public string? Description { get; set; }
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/PlanFactDto.cs b/AsbCloudApp/Data/PlanFactDto.cs
index 8d20c382..d676e429 100644
--- a/AsbCloudApp/Data/PlanFactDto.cs
+++ b/AsbCloudApp/Data/PlanFactDto.cs
@@ -1,29 +1,28 @@
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO объединяющее плановые и фактические значения
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public class PlanFactDto<T> : PlanFactBase<T, T>
+{
+
+}
+
+/// <summary>
+/// DTO объединяющее плановые и фактические значения
+/// </summary>
+/// <typeparam name="T"></typeparam>
+/// <typeparam name="V"></typeparam>
+public class PlanFactBase<T, V>
 {
     /// <summary>
-    /// DTO объединяющее плановые и фактические значения
+    /// Плановое значение
     /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public class PlanFactDto<T> : PlanFactBase<T, T>
-    {
-
-    }
+    public T? Plan { get; set; }
 
     /// <summary>
-    /// DTO объединяющее плановые и фактические значения
+    /// Фактическое значение
     /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <typeparam name="V"></typeparam>
-    public class PlanFactBase<T, V>
-    {
-        /// <summary>
-        /// Плановое значение
-        /// </summary>
-        public T? Plan { get; set; }
-
-        /// <summary>
-        /// Фактическое значение
-        /// </summary>
-        public V? Fact { get; set; }
-    }
+    public V? Fact { get; set; }
 }
diff --git a/AsbCloudApp/Data/PlanFactPredictBase.cs b/AsbCloudApp/Data/PlanFactPredictBase.cs
index ffbd5e61..6f4e1598 100644
--- a/AsbCloudApp/Data/PlanFactPredictBase.cs
+++ b/AsbCloudApp/Data/PlanFactPredictBase.cs
@@ -1,23 +1,22 @@
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Lines container for Time Vs Depth chart
+/// </summary>
+public class PlanFactPredictBase<T>
 {
     /// <summary>
-    /// Lines container for Time Vs Depth chart
+    /// плановое значение
     /// </summary>
-    public class PlanFactPredictBase<T>
-    {
-        /// <summary>
-        /// плановое значение
-        /// </summary>
-        public T? Plan { get; set; }
+    public T? Plan { get; set; }
 
-        /// <summary>
-        /// фактическое значение
-        /// </summary>
-        public T? Fact { get; set; }
+    /// <summary>
+    /// фактическое значение
+    /// </summary>
+    public T? Fact { get; set; }
 
-        /// <summary>
-        /// предсказанное значение
-        /// </summary>
-        public T? Predict { get; set; }
-    }
+    /// <summary>
+    /// предсказанное значение
+    /// </summary>
+    public T? Predict { get; set; }
 }
diff --git a/AsbCloudApp/Data/PlanLimitDto.cs b/AsbCloudApp/Data/PlanLimitDto.cs
index 76e9173b..7566ab9c 100644
--- a/AsbCloudApp/Data/PlanLimitDto.cs
+++ b/AsbCloudApp/Data/PlanLimitDto.cs
@@ -2,85 +2,84 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Плановое значение и максимально допустимое ограничение
+/// </summary>
+public class PlanLimitDto
 {
     /// <summary>
-    /// Плановое значение и максимально допустимое ограничение
+    /// План
     /// </summary>
-    public class PlanLimitDto
+    [Required]
+    public double Plan { get; set; }
+
+    /// <summary>
+    /// Максимальное ограничение
+    /// </summary>
+    [Required]
+    public double LimitMax { get; set; }
+
+    /// <summary>
+    /// Валидация
+    /// </summary>
+    /// <param name="commonRange">Общий диапазон для плана и ограничения</param>
+    /// <param name="paramName"></param>
+    /// <returns></returns>
+    public virtual IEnumerable<ValidationResult> Validate((double GE, double LE) commonRange, string paramName)
+        => Validate(commonRange, commonRange, paramName);
+
+    /// <summary>
+    /// Валидация
+    /// </summary>
+    /// <param name="planRange"></param>
+    /// <param name="limitMaxRange"></param>
+    /// <param name="paramName">Название параметра для которого задается план и ограничение</param>
+    /// <returns></returns>
+    public virtual IEnumerable<ValidationResult> Validate((double GE, double LE) planRange, (double GE, double LE) limitMaxRange, string paramName)
     {
-        /// <summary>
-        /// План
-        /// </summary>
-        [Required]
-        public double Plan { get; set; }
+        if (Plan < planRange.GE || Plan > planRange.LE)
+            yield return new ValidationResult($"{paramName} плановое значение должно быть в диапазоне [{planRange.GE}; {planRange.LE}].");
 
-        /// <summary>
-        /// Максимальное ограничение
-        /// </summary>
-        [Required]
-        public double LimitMax { get; set; }
-
-        /// <summary>
-        /// Валидация
-        /// </summary>
-        /// <param name="commonRange">Общий диапазон для плана и ограничения</param>
-        /// <param name="paramName"></param>
-        /// <returns></returns>
-        public virtual IEnumerable<ValidationResult> Validate((double GE, double LE) commonRange, string paramName)
-            => Validate(commonRange, commonRange, paramName);
-
-        /// <summary>
-        /// Валидация
-        /// </summary>
-        /// <param name="planRange"></param>
-        /// <param name="limitMaxRange"></param>
-        /// <param name="paramName">Название параметра для которого задается план и ограничение</param>
-        /// <returns></returns>
-        public virtual IEnumerable<ValidationResult> Validate((double GE, double LE) planRange, (double GE, double LE) limitMaxRange, string paramName)
-        {
-            if (Plan < planRange.GE || Plan > planRange.LE)
-                yield return new ValidationResult($"{paramName} плановое значение должно быть в диапазоне [{planRange.GE}; {planRange.LE}].");
-
-            if (Plan < planRange.GE || Plan > planRange.LE)
-                yield return new ValidationResult($"{paramName} ограничивающее значение должно быть в диапазоне [{limitMaxRange.GE}; {limitMaxRange.LE}].");
-        }
+        if (Plan < planRange.GE || Plan > planRange.LE)
+            yield return new ValidationResult($"{paramName} ограничивающее значение должно быть в диапазоне [{limitMaxRange.GE}; {limitMaxRange.LE}].");
     }
+}
+
+/// <summary>
+/// Реализация RangeAttribute для PlanLimitDto
+/// </summary>
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter,
+AllowMultiple = false)]
+public class RangePlanLimitAttribute : ValidationAttribute
+{
+    private readonly double minimum;
+    private readonly double maximum;
 
     /// <summary>
     /// Реализация RangeAttribute для PlanLimitDto
     /// </summary>
-    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter,
-    AllowMultiple = false)]
-    public class RangePlanLimitAttribute : ValidationAttribute
+    /// <param name="minimum"></param>
+    /// <param name="maximum"></param>
+    public RangePlanLimitAttribute(double minimum, double maximum)
     {
-        private readonly double minimum;
-        private readonly double maximum;
+        this.minimum = minimum;
+        this.maximum = maximum;
+    }
 
-        /// <summary>
-        /// Реализация RangeAttribute для PlanLimitDto
-        /// </summary>
-        /// <param name="minimum"></param>
-        /// <param name="maximum"></param>
-        public RangePlanLimitAttribute(double minimum, double maximum)
+    /// <inheritdoc/>
+    public override bool IsValid(object? value)
+    {
+        try
         {
-            this.minimum = minimum;
-            this.maximum = maximum;
-        }
-
-        /// <inheritdoc/>
-        public override bool IsValid(object? value)
-        {
-            try
+            if(value is PlanLimitDto dto)
             {
-                if(value is PlanLimitDto dto)
-                {
-                    var isPlanValid = dto.Plan <= maximum && dto.Plan >= minimum;
-                    var isLimitMaxValid = dto.LimitMax <= maximum && dto.LimitMax >= minimum;
-                    return isPlanValid && isLimitMaxValid;
-                }
-            }catch{}
-            return false;
-        }
+                var isPlanValid = dto.Plan <= maximum && dto.Plan >= minimum;
+                var isLimitMaxValid = dto.LimitMax <= maximum && dto.LimitMax >= minimum;
+                return isPlanValid && isLimitMaxValid;
+            }
+        }catch{}
+        return false;
     }
 }
diff --git a/AsbCloudApp/Data/ReportInfoDto.cs b/AsbCloudApp/Data/ReportInfoDto.cs
index 277d0eaa..c044deb8 100644
--- a/AsbCloudApp/Data/ReportInfoDto.cs
+++ b/AsbCloudApp/Data/ReportInfoDto.cs
@@ -1,18 +1,17 @@
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Справочная информация об отчете
+/// </summary>
+public class ReportInfoDto
 {
     /// <summary>
-    /// Справочная информация об отчете
+    /// Название файла
     /// </summary>
-    public class ReportInfoDto
-    {
-        /// <summary>
-        /// Название файла
-        /// </summary>
-        public string FileName { get; set; } = null!;
+    public string FileName { get; set; } = null!;
 
-        /// <summary>
-        /// Размер файла
-        /// </summary>
-        public int FileSize { get; set; } = 0;
-    }
+    /// <summary>
+    /// Размер файла
+    /// </summary>
+    public int FileSize { get; set; } = 0;
 }
diff --git a/AsbCloudApp/Data/ReportPropertiesDto.cs b/AsbCloudApp/Data/ReportPropertiesDto.cs
index dc024620..e4a73953 100644
--- a/AsbCloudApp/Data/ReportPropertiesDto.cs
+++ b/AsbCloudApp/Data/ReportPropertiesDto.cs
@@ -1,54 +1,53 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO формирования рапорта
+/// </summary>
+public class ReportPropertiesDto : IId, IWellRelated
 {
+    /// <inheritdoc/>
+    public int Id { get; set; }
+
+    /// <inheritdoc/>
+    [Range(1, int.MaxValue, ErrorMessage = "Id скважины не может быть ниже 1")]
+    public int IdWell { get; set; }
+
     /// <summary>
-    /// DTO формирования рапорта
+    /// название 
     /// </summary>
-    public class ReportPropertiesDto : IId, IWellRelated
-    {
-        /// <inheritdoc/>
-        public int Id { get; set; }
+    [StringLength(260, MinimumLength = 1, ErrorMessage = "Допустимая длина имени файла от 1 до 260 символов")]
+    public string Name { get; set; } = null!;
 
-        /// <inheritdoc/>
-        [Range(1, int.MaxValue, ErrorMessage = "Id скважины не может быть ниже 1")]
-        public int IdWell { get; set; }
+    /// <summary>
+    /// <see cref="FileInfoDto"/>
+    /// </summary>
+    public FileInfoDto File { get; set; } = null!;
 
-        /// <summary>
-        /// название 
-        /// </summary>
-        [StringLength(260, MinimumLength = 1, ErrorMessage = "Допустимая длина имени файла от 1 до 260 символов")]
-        public string Name { get; set; } = null!;
+    /// <summary>
+    /// Дата формирования
+    /// </summary>
+    public DateTimeOffset Date { get; set; }
 
-        /// <summary>
-        /// <see cref="FileInfoDto"/>
-        /// </summary>
-        public FileInfoDto File { get; set; } = null!;
+    /// <summary>
+    /// Дата начала рапорта
+    /// </summary>
+    public DateTimeOffset Begin { get; set; }
 
-        /// <summary>
-        /// Дата формирования
-        /// </summary>
-        public DateTimeOffset Date { get; set; }
+    /// <summary>
+    /// Дата окончания рапорта
+    /// </summary>
+    public DateTimeOffset End { get; set; }
 
-        /// <summary>
-        /// Дата начала рапорта
-        /// </summary>
-        public DateTimeOffset Begin { get; set; }
+    /// <summary>
+    /// шаг между точками диаграммы
+    /// </summary>
+    public int Step { get; set; }
 
-        /// <summary>
-        /// Дата окончания рапорта
-        /// </summary>
-        public DateTimeOffset End { get; set; }
-
-        /// <summary>
-        /// шаг между точками диаграммы
-        /// </summary>
-        public int Step { get; set; }
-
-        /// <summary>
-        /// формат файла
-        /// </summary>
-        public string Format { get; set; } = string.Empty;
-    }
+    /// <summary>
+    /// формат файла
+    /// </summary>
+    public string Format { get; set; } = string.Empty;
 }
diff --git a/AsbCloudApp/Data/RequestLogDto.cs b/AsbCloudApp/Data/RequestLogDto.cs
index e326043f..2a6d9aee 100644
--- a/AsbCloudApp/Data/RequestLogDto.cs
+++ b/AsbCloudApp/Data/RequestLogDto.cs
@@ -1,70 +1,69 @@
 using System;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO журнала запросов
+/// </summary>
+public class RequestLogDto
 {
     /// <summary>
-    /// DTO журнала запросов
+    /// логин пользователя
     /// </summary>
-    public class RequestLogDto
-    {
-        /// <summary>
-        /// логин пользователя
-        /// </summary>
-        public string UserLogin { get; set; } = string.Empty;
+    public string UserLogin { get; set; } = string.Empty;
 
-        /// <summary>
-        /// Id пользователя
-        /// </summary>
-        public int UserId { get; set; }
+    /// <summary>
+    /// Id пользователя
+    /// </summary>
+    public int UserId { get; set; }
 
-        /// <summary>
-        /// IP адрес пользователя
-        /// </summary>
-        public string? UserIp { get; set; }
+    /// <summary>
+    /// IP адрес пользователя
+    /// </summary>
+    public string? UserIp { get; set; }
 
-        /// <summary>
-        /// метод запроса (GET, POST,..)
-        /// </summary>
-        public string RequestMethod { get; set; } = null!;
+    /// <summary>
+    /// метод запроса (GET, POST,..)
+    /// </summary>
+    public string RequestMethod { get; set; } = null!;
 
-        /// <summary>
-        /// url
-        /// </summary>
-        public string? RequestPath { get; set; }
+    /// <summary>
+    /// url
+    /// </summary>
+    public string? RequestPath { get; set; }
 
-        /// <summary>
-        /// Referer
-        /// </summary>
-        public string Referer { get; set; } = string.Empty;
+    /// <summary>
+    /// Referer
+    /// </summary>
+    public string Referer { get; set; } = string.Empty;
 
-        /// <summary>
-        /// продолжительность выполнения
-        /// </summary>
-        public long ElapsedMilliseconds { get; set; }
+    /// <summary>
+    /// продолжительность выполнения
+    /// </summary>
+    public long ElapsedMilliseconds { get; set; }
 
-        /// <summary>
-        /// http status [200 - Ok, ...]
-        /// </summary>
-        public int Status { get; set; }
-        
-        /// <summary>
-        /// метка времени запроса
-        /// </summary>
-        public DateTime Date { get; set; }
+    /// <summary>
+    /// http status [200 - Ok, ...]
+    /// </summary>
+    public int Status { get; set; }
+    
+    /// <summary>
+    /// метка времени запроса
+    /// </summary>
+    public DateTime Date { get; set; }
 
-        /// <summary>
-        /// сообщение об ошибке, если она произошла
-        /// </summary>
-        public string? ExceptionMessage { get; set; } = null!;
+    /// <summary>
+    /// сообщение об ошибке, если она произошла
+    /// </summary>
+    public string? ExceptionMessage { get; set; } = null!;
 
-        /// <summary>
-        /// стек вызовов
-        /// </summary>
-        public string? ExceptionStack { get; set; } = null!;
+    /// <summary>
+    /// стек вызовов
+    /// </summary>
+    public string? ExceptionStack { get; set; } = null!;
 
-        /// <summary>
-        /// Размер body
-        /// </summary>
-        public long? RequestContentLength { get; set; }
-    }
+    /// <summary>
+    /// Размер body
+    /// </summary>
+    public long? RequestContentLength { get; set; }
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/RequestLogUserDto.cs b/AsbCloudApp/Data/RequestLogUserDto.cs
index 562acc36..796cb408 100644
--- a/AsbCloudApp/Data/RequestLogUserDto.cs
+++ b/AsbCloudApp/Data/RequestLogUserDto.cs
@@ -2,58 +2,57 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using AsbCloudApp.Data.User;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO статистики запросов по пользователю
+/// </summary>
+public class RequestLogUserDto
 {
     /// <summary>
-    /// DTO статистики запросов по пользователю
+    /// Id пользователя
     /// </summary>
-    public class RequestLogUserDto
-    {
-        /// <summary>
-        /// Id пользователя
-        /// </summary>
-        [Required]
-        public int UserId { get; set; }
+    [Required]
+    public int UserId { get; set; }
 
-        /// <summary>
-        /// логин
-        /// </summary>
-        [Required]
-        public string Login { get; set; } = string.Empty;
+    /// <summary>
+    /// логин
+    /// </summary>
+    [Required]
+    public string Login { get; set; } = string.Empty;
 
-        /// <summary>
-        /// IP адрес пользователя
-        /// </summary>
-        public string? Ip { get; set; }
+    /// <summary>
+    /// IP адрес пользователя
+    /// </summary>
+    public string? Ip { get; set; }
 
-        /// <summary>
-        /// время выполнения запроса
-        /// </summary>
-        [Required]
-        public long ElapsedMs { get; set; }
+    /// <summary>
+    /// время выполнения запроса
+    /// </summary>
+    [Required]
+    public long ElapsedMs { get; set; }
 
-        /// <summary>
-        /// метка времени последнего запроса
-        /// </summary>
-        [Required]
-        public DateTime LastDate { get; set; }
+    /// <summary>
+    /// метка времени последнего запроса
+    /// </summary>
+    [Required]
+    public DateTime LastDate { get; set; }
 
-        /// <summary>
-        /// кол-во запросов
-        /// </summary>
-        [Required]
-        public long Requests { get; set; }
+    /// <summary>
+    /// кол-во запросов
+    /// </summary>
+    [Required]
+    public long Requests { get; set; }
 
-        /// <summary>
-        /// кол-во ошибок
-        /// </summary>
-        [Required]
-        public long Errors { get; set; }
+    /// <summary>
+    /// кол-во ошибок
+    /// </summary>
+    [Required]
+    public long Errors { get; set; }
 
-        /// <summary>
-        /// DTO пользователя
-        /// </summary>
-        [Required]
-        public UserDto User { get; set; } = null!;
-    }
+    /// <summary>
+    /// DTO пользователя
+    /// </summary>
+    [Required]
+    public UserDto User { get; set; } = null!;
 }
diff --git a/AsbCloudApp/Data/SAUB/DrillTestBaseDto.cs b/AsbCloudApp/Data/SAUB/DrillTestBaseDto.cs
index 1a87d73a..1c58bc5d 100644
--- a/AsbCloudApp/Data/SAUB/DrillTestBaseDto.cs
+++ b/AsbCloudApp/Data/SAUB/DrillTestBaseDto.cs
@@ -3,35 +3,34 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB;
+
+/// <summary>
+/// DTO для получения записи drill_test из панели
+/// </summary>
+public class DrillTestBaseDto
 {
     /// <summary>
-    /// DTO для получения записи drill_test из панели
+    /// Идентификатор drill test
     /// </summary>
-    public class DrillTestBaseDto
-    {
-        /// <summary>
-        /// Идентификатор drill test
-        /// </summary>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public int Id { get; set; }
 
-        /// <summary>
-        /// Время начала drill test
-        /// </summary>
-        [Required]
-        public DateTimeOffset TimeStampStart { get; set; }
+    /// <summary>
+    /// Время начала drill test
+    /// </summary>
+    [Required]
+    public DateTimeOffset TimeStampStart { get; set; }
 
-        /// <summary>
-        /// Глубина начала drill test
-        /// </summary>
-        [Required]
-        public float DepthStart { get; set; }
+    /// <summary>
+    /// Глубина начала drill test
+    /// </summary>
+    [Required]
+    public float DepthStart { get; set; }
 
-        /// <summary>
-        /// Параметры теста
-        /// </summary>
-        [Required]
-        public IEnumerable<DrillTestParamsDto> Params { get; set; } = Enumerable.Empty<DrillTestParamsDto>();
-    }
+    /// <summary>
+    /// Параметры теста
+    /// </summary>
+    [Required]
+    public IEnumerable<DrillTestParamsDto> Params { get; set; } = Enumerable.Empty<DrillTestParamsDto>();
 }
diff --git a/AsbCloudApp/Data/SAUB/DrillTestDto.cs b/AsbCloudApp/Data/SAUB/DrillTestDto.cs
index 32814d35..a050943f 100644
--- a/AsbCloudApp/Data/SAUB/DrillTestDto.cs
+++ b/AsbCloudApp/Data/SAUB/DrillTestDto.cs
@@ -1,15 +1,14 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB;
+
+/// <summary>
+/// DTO для отображения записи drill_test
+/// </summary>
+public class DrillTestDto : DrillTestBaseDto
 {
     /// <summary>
-    /// DTO для отображения записи drill_test
+    /// Связанная с drill_test телеметрия
     /// </summary>
-    public class DrillTestDto : DrillTestBaseDto
-    {
-        /// <summary>
-        /// Связанная с drill_test телеметрия
-        /// </summary>
-        public TelemetryDto? Telemetry { get; set; }
-    }
+    public TelemetryDto? Telemetry { get; set; }
 }
diff --git a/AsbCloudApp/Data/SAUB/DrillTestParamsDto.cs b/AsbCloudApp/Data/SAUB/DrillTestParamsDto.cs
index adc3d1db..aa94178e 100644
--- a/AsbCloudApp/Data/SAUB/DrillTestParamsDto.cs
+++ b/AsbCloudApp/Data/SAUB/DrillTestParamsDto.cs
@@ -1,41 +1,40 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB;
+
+/// <summary>
+/// Параметры Drill Test
+/// </summary>
+public class DrillTestParamsDto
 {
     /// <summary>
-    /// Параметры Drill Test
+    /// Шаг
     /// </summary>
-    public class DrillTestParamsDto
-    {
-        /// <summary>
-        /// Шаг
-        /// </summary>
-        [Required]
-        public int Step { get; set; }
+    [Required]
+    public int Step { get; set; }
 
-        /// <summary>
-        /// Нагрузка
-        /// </summary>
-        public float? Workload { get; set; }
+    /// <summary>
+    /// Нагрузка
+    /// </summary>
+    public float? Workload { get; set; }
 
-        /// <summary>
-        /// Заданная скорость
-        /// </summary>
-        public float? Speed { get; set; }
+    /// <summary>
+    /// Заданная скорость
+    /// </summary>
+    public float? Speed { get; set; }
 
-        /// <summary>
-        /// Скорость проходки
-        /// </summary>
-        public float? DepthSpeed { get; set; }
+    /// <summary>
+    /// Скорость проходки
+    /// </summary>
+    public float? DepthSpeed { get; set; }
 
-        /// <summary>
-        /// Время бурения шага, сек
-        /// </summary>
-        public float? TimeDrillStep { get; set; }
+    /// <summary>
+    /// Время бурения шага, сек
+    /// </summary>
+    public float? TimeDrillStep { get; set; }
 
-        /// <summary>
-        /// Глубина бурения шага
-        /// </summary>
-        public float? DepthDrillStep { get; set; }
-    }
+    /// <summary>
+    /// Глубина бурения шага
+    /// </summary>
+    public float? DepthDrillStep { get; set; }
 }
diff --git a/AsbCloudApp/Data/SAUB/EventDto.cs b/AsbCloudApp/Data/SAUB/EventDto.cs
index 66b5fa7f..e91b0c82 100644
--- a/AsbCloudApp/Data/SAUB/EventDto.cs
+++ b/AsbCloudApp/Data/SAUB/EventDto.cs
@@ -1,48 +1,47 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB;
+
+/// <summary>
+/// Описание шаблона события панели оператора
+/// </summary>
+public class EventDto : IId
 {
     /// <summary>
-    /// Описание шаблона события панели оператора
+    /// id события
     /// </summary>
-    public class EventDto : IId
-    {
-        /// <summary>
-        /// id события
-        /// </summary>
-        [Required]
-        
-        public int Id { get; set; }
+    [Required]
+    
+    public int Id { get; set; }
 
-        /// <summary>
-        /// шаблон текста сообщения
-        /// </summary>
-        [Required]
-        public string Message { get; set; } = string.Empty;
+    /// <summary>
+    /// шаблон текста сообщения
+    /// </summary>
+    [Required]
+    public string Message { get; set; } = string.Empty;
 
-        /// <summary>
-        /// id категории события
-        /// </summary>
-        [Required]
-        [Range(0, int.MaxValue, ErrorMessage = "Id категории события не может быть отрицательным")]
-        public int IdCategory { get; set; }
+    /// <summary>
+    /// id категории события
+    /// </summary>
+    [Required]
+    [Range(0, int.MaxValue, ErrorMessage = "Id категории события не может быть отрицательным")]
+    public int IdCategory { get; set; }
 
-        /// <summary>
-        /// переменная сервера обмена информацией с полевым оборудованием
-        /// </summary>
-        public string Tag { get; set; } = string.Empty;
+    /// <summary>
+    /// переменная сервера обмена информацией с полевым оборудованием
+    /// </summary>
+    public string Tag { get; set; } = string.Empty;
 
-        /// <summary>
-        /// тип определения наступления события
-        /// </summary>
-        [Required]
-        [Range(0, int.MaxValue, ErrorMessage = "Id типа события не может быть отрицательным")]
-        public int EventType { get; set; }
+    /// <summary>
+    /// тип определения наступления события
+    /// </summary>
+    [Required]
+    [Range(0, int.MaxValue, ErrorMessage = "Id типа события не может быть отрицательным")]
+    public int EventType { get; set; }
 
-        /// <summary>
-        /// флаг, следует ли воспроизводить звук при наступлении события
-        /// </summary>
-        [Required]
-        public int IdSound { get; set; }
-    }
+    /// <summary>
+    /// флаг, следует ли воспроизводить звук при наступлении события
+    /// </summary>
+    [Required]
+    public int IdSound { get; set; }
 }
diff --git a/AsbCloudApp/Data/SAUB/SetpointInfoDto.cs b/AsbCloudApp/Data/SAUB/SetpointInfoDto.cs
index a5cc0277..2a075757 100644
--- a/AsbCloudApp/Data/SAUB/SetpointInfoDto.cs
+++ b/AsbCloudApp/Data/SAUB/SetpointInfoDto.cs
@@ -1,43 +1,42 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB;
+
+/// <summary>
+/// DTO рекомендации уставок передаваемых на панель оператора
+/// </summary>
+public class SetpointInfoDto
 {
     /// <summary>
-    /// DTO рекомендации уставок передаваемых на панель оператора
+    /// отображаемое название уставки
     /// </summary>
-    public class SetpointInfoDto
-    {
-        /// <summary>
-        /// отображаемое название уставки
-        /// </summary>
-        public string DisplayName { get; set; } = string.Empty;
+    public string DisplayName { get; set; } = string.Empty;
 
-        /// <summary>
-        /// настоящее название уставки (имя переменной в панели оператора)
-        /// </summary>
-        [Required]
-        public string Name { get; set; } = null!;
+    /// <summary>
+    /// настоящее название уставки (имя переменной в панели оператора)
+    /// </summary>
+    [Required]
+    public string Name { get; set; } = null!;
 
-        /// <summary>
-        /// единицы измерения
-        /// </summary>
-        public string? Units { get; set; }
+    /// <summary>
+    /// единицы измерения
+    /// </summary>
+    public string? Units { get; set; }
 
-        /// <summary>
-        /// комментарий
-        /// </summary>
-        public string? Comment { get; set; }
+    /// <summary>
+    /// комментарий
+    /// </summary>
+    public string? Comment { get; set; }
 
-        /// <summary>
-        /// макс. значение
-        /// </summary>
-        [Required]
-        public double Max { get; set; } = double.MaxValue;
+    /// <summary>
+    /// макс. значение
+    /// </summary>
+    [Required]
+    public double Max { get; set; } = double.MaxValue;
 
-        /// <summary>
-        /// мин значение
-        /// </summary>
-        [Required]
-        public double Min { get; set; } = double.MinValue;
-    }
+    /// <summary>
+    /// мин значение
+    /// </summary>
+    [Required]
+    public double Min { get; set; } = double.MinValue;
 }
diff --git a/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs b/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs
index 003f50c4..bf770c4c 100644
--- a/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs
+++ b/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs
@@ -3,64 +3,63 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using AsbCloudApp.Data.User;
 
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB;
+
+/// <summary>
+/// DTO запроса для предложения по изменению уставок на панели оператора
+/// </summary>
+public class SetpointsRequestDto : IId, IWellRelated
 {
+    /// <inheritdoc/>
+    [Required]
+    public int Id { get; set; }
+
+    /// <inheritdoc/>
+    [Required]
+    public int IdWell { get; set; }
+
     /// <summary>
-    /// DTO запроса для предложения по изменению уставок на панели оператора
+    /// Id автора запроса
     /// </summary>
-    public class SetpointsRequestDto : IId, IWellRelated
-    {
-        /// <inheritdoc/>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public int IdAuthor { get; set; }
 
-        /// <inheritdoc/>
-        [Required]
-        public int IdWell { get; set; }
+    /// <summary>
+    /// текущее состояние запроса 0: неизвестно, 1:ожидает отправки, 2: отправлено, 3: принято оператором, 4: отклонено оператором, 5: устарело
+    /// </summary>
+    [Required]
+    public int IdState { get; set; }
 
-        /// <summary>
-        /// Id автора запроса
-        /// </summary>
-        [Required]
-        public int IdAuthor { get; set; }
+    /// <summary>
+    /// отметка времени создания запроса
+    /// </summary>
+    public DateTimeOffset UploadDate { get; set; } = DateTimeOffset.Now;
 
-        /// <summary>
-        /// текущее состояние запроса 0: неизвестно, 1:ожидает отправки, 2: отправлено, 3: принято оператором, 4: отклонено оператором, 5: устарело
-        /// </summary>
-        [Required]
-        public int IdState { get; set; }
+    /// <summary>
+    /// время в секундах актуальности этого запроса
+    /// </summary>
+    [Required]
+    [Range(10 * 60, 4 * 60 * 60)]
+    public int ObsolescenceSec { get; set; } = 10 * 60;
 
-        /// <summary>
-        /// отметка времени создания запроса
-        /// </summary>
-        public DateTimeOffset UploadDate { get; set; } = DateTimeOffset.Now;
+    /// <summary>
+    /// набор уставок: {"название переменной панели"; "рекомендуемое значение"}
+    /// </summary>
+    [Required]
+    public Dictionary<string, double> Setpoints { get; set; } = new();
 
-        /// <summary>
-        /// время в секундах актуальности этого запроса
-        /// </summary>
-        [Required]
-        [Range(10 * 60, 4 * 60 * 60)]
-        public int ObsolescenceSec { get; set; } = 10 * 60;
+    /// <summary>
+    /// Комментарий для оператора панели
+    /// </summary>
+    public string? Comment { get; set; }
 
-        /// <summary>
-        /// набор уставок: {"название переменной панели"; "рекомендуемое значение"}
-        /// </summary>
-        [Required]
-        public Dictionary<string, double> Setpoints { get; set; } = new();
+    /// <summary>
+    /// DTO скважины
+    /// </summary>
+    public WellDto? Well { get; set; }
 
-        /// <summary>
-        /// Комментарий для оператора панели
-        /// </summary>
-        public string? Comment { get; set; }
-
-        /// <summary>
-        /// DTO скважины
-        /// </summary>
-        public WellDto? Well { get; set; }
-
-        /// <summary>
-        /// DTO автора
-        /// </summary>
-        public UserDto? Author { get; set; }
-    }
+    /// <summary>
+    /// DTO автора
+    /// </summary>
+    public UserDto? Author { get; set; }
 }
diff --git a/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs b/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs
index 71c95c20..68b63dab 100644
--- a/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs
+++ b/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs
@@ -1,236 +1,235 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB;
+
+/// <summary>
+/// Сообщение получаемое по телеметрии и отправляемое в frontend
+/// </summary>
+public class TelemetryDataSaubDto : ITelemetryData
 {
     /// <summary>
-    /// Сообщение получаемое по телеметрии и отправляемое в frontend
+    /// метка времени данных
     /// </summary>
-    public class TelemetryDataSaubDto : ITelemetryData
-    {
-        /// <summary>
-        /// метка времени данных
-        /// </summary>
-        [Required]
-        public DateTime DateTime { get; set; }
-        
-        /// <summary>
-        /// Пользователь САУБ
-        /// </summary>
-        public int? IdUser { get; set; }
+    [Required]
+    public DateTime DateTime { get; set; }
+    
+    /// <summary>
+    /// Пользователь САУБ
+    /// </summary>
+    public int? IdUser { get; set; }
 
-        /// <summary>
-        /// Режим работы САУБ:
-        /// 0 - "РУЧНОЙ"
-        /// 1 - "БУРЕНИЕ В РОТОРЕ"
-        /// 2 - "ПРОРАБОТКА"
-        /// 3 - "БУРЕНИЕ В СЛАЙДЕ"
-        /// 4 - "СПУСК СПО"
-        /// 5 - "ПОДЪЕМ СПО"
-        /// 6 - "ПОДЪЕМ С ПРОРАБОТКОЙ"
-        /// 10 - "БЛОКИРОВКА"
-        /// </summary>
-        [Required]
-        public short Mode { get; set; }
+    /// <summary>
+    /// Режим работы САУБ:
+    /// 0 - "РУЧНОЙ"
+    /// 1 - "БУРЕНИЕ В РОТОРЕ"
+    /// 2 - "ПРОРАБОТКА"
+    /// 3 - "БУРЕНИЕ В СЛАЙДЕ"
+    /// 4 - "СПУСК СПО"
+    /// 5 - "ПОДЪЕМ СПО"
+    /// 6 - "ПОДЪЕМ С ПРОРАБОТКОЙ"
+    /// 10 - "БЛОКИРОВКА"
+    /// </summary>
+    [Required]
+    public short Mode { get; set; }
 
-        /// <summary>
-        /// telemetry id
-        /// </summary>
-        public int IdTelemetry { get; set; }
+    /// <summary>
+    /// telemetry id
+    /// </summary>
+    public int IdTelemetry { get; set; }
 
-        /// <summary>
-        /// telemetry user
-        /// </summary>
-        public string? User { get; set; }
+    /// <summary>
+    /// telemetry user
+    /// </summary>
+    public string? User { get; set; }
 
-        /// <summary>
-        /// Глубина забоя, м
-        /// </summary>
-        public float WellDepth { get; set; }
+    /// <summary>
+    /// Глубина забоя, м
+    /// </summary>
+    public float WellDepth { get; set; }
 
-        /// <summary>
-        /// Глубина долота, м
-        /// </summary>
-        public float BitDepth { get; set; }
+    /// <summary>
+    /// Глубина долота, м
+    /// </summary>
+    public float BitDepth { get; set; }
 
-        /// <summary>
-        /// Талевый блок. Положение, м
-        /// </summary>
-        public float BlockPosition { get; set; }
+    /// <summary>
+    /// Талевый блок. Положение, м
+    /// </summary>
+    public float BlockPosition { get; set; }
 
-        /// <summary>
-        /// Талевый блок. Мин положение, м
-        /// </summary>
-        public float? BlockPositionMin { get; set; }
+    /// <summary>
+    /// Талевый блок. Мин положение, м
+    /// </summary>
+    public float? BlockPositionMin { get; set; }
 
-        /// <summary>
-        /// Талевый блок. Макс положение, м
-        /// </summary>
-        public float? BlockPositionMax { get; set; }
+    /// <summary>
+    /// Талевый блок. Макс положение, м
+    /// </summary>
+    public float? BlockPositionMax { get; set; }
 
-        /// <summary>
-        /// Талевый блок. Скорость, м/час
-        /// </summary>
-        public float? BlockSpeed { get; set; }
+    /// <summary>
+    /// Талевый блок. Скорость, м/час
+    /// </summary>
+    public float? BlockSpeed { get; set; }
 
-        /// <summary>
-        /// Талевый блок. Задание скорости, м/час
-        /// </summary>
-        public float? BlockSpeedSp { get; set; }
+    /// <summary>
+    /// Талевый блок. Задание скорости, м/час
+    /// </summary>
+    public float? BlockSpeedSp { get; set; }
 
-        /// <summary>
-        /// Талевый блок. Задание скорости для роторного бурения, м/час
-        /// </summary>
-        public float? BlockSpeedSpRotor { get; set; }
+    /// <summary>
+    /// Талевый блок. Задание скорости для роторного бурения, м/час
+    /// </summary>
+    public float? BlockSpeedSpRotor { get; set; }
 
-        /// <summary>
-        /// Талевый блок. Задание скорости для режима слайда, м/час
-        /// </summary>
-        public float? BlockSpeedSpSlide { get; set; }
+    /// <summary>
+    /// Талевый блок. Задание скорости для режима слайда, м/час
+    /// </summary>
+    public float? BlockSpeedSpSlide { get; set; }
 
-        /// <summary>
-        /// Талевый блок. Задание скорости для проработки, м/час
-        /// </summary>
-        public float? BlockSpeedSpDevelop { get; set; }
+    /// <summary>
+    /// Талевый блок. Задание скорости для проработки, м/час
+    /// </summary>
+    public float? BlockSpeedSpDevelop { get; set; }
 
-        /// <summary>
-        /// Давление, атм
-        /// </summary>
-        public float Pressure { get; set; }
+    /// <summary>
+    /// Давление, атм
+    /// </summary>
+    public float Pressure { get; set; }
 
-        /// <summary>
-        /// Давление при холостом ходе, атм
-        /// </summary>
-        public float? PressureIdle { get; set; }
+    /// <summary>
+    /// Давление при холостом ходе, атм
+    /// </summary>
+    public float? PressureIdle { get; set; }
 
-        /// <summary>
-        /// действующее задание давления, атм
-        /// </summary>
-        public float? PressureSp { get; set; }
+    /// <summary>
+    /// действующее задание давления, атм
+    /// </summary>
+    public float? PressureSp { get; set; }
 
-        /// <summary>
-        /// задание давления для роторного режима, атм
-        /// </summary>
-        public float? PressureSpRotor { get; set; }
+    /// <summary>
+    /// задание давления для роторного режима, атм
+    /// </summary>
+    public float? PressureSpRotor { get; set; }
 
-        /// <summary>
-        /// задание давления для режима слайда, атм
-        /// </summary>
-        public float? PressureSpSlide { get; set; }
+    /// <summary>
+    /// задание давления для режима слайда, атм
+    /// </summary>
+    public float? PressureSpSlide { get; set; }
 
-        /// <summary>
-        /// задание давления для проработки, атм
-        /// </summary>
-        public float? PressureSpDevelop { get; set; }
+    /// <summary>
+    /// задание давления для проработки, атм
+    /// </summary>
+    public float? PressureSpDevelop { get; set; }
 
-        /// <summary>
-        /// ограничение макс перепада давления, атм
-        /// </summary>
-        public float? PressureDeltaLimitMax { get; set; }
+    /// <summary>
+    /// ограничение макс перепада давления, атм
+    /// </summary>
+    public float? PressureDeltaLimitMax { get; set; }
 
-        /// <summary>
-        /// осевая нагрузка, т
-        /// </summary>
-        public float AxialLoad { get; set; }
+    /// <summary>
+    /// осевая нагрузка, т
+    /// </summary>
+    public float AxialLoad { get; set; }
 
-        /// <summary>
-        /// задание осевой нагрузки, т
-        /// </summary>
-        public float? AxialLoadSp { get; set; }
+    /// <summary>
+    /// задание осевой нагрузки, т
+    /// </summary>
+    public float? AxialLoadSp { get; set; }
 
-        /// <summary>
-        /// ограничение макс. осевой нагрузки, т
-        /// </summary>
-        public float? AxialLoadLimitMax { get; set; }
+    /// <summary>
+    /// ограничение макс. осевой нагрузки, т
+    /// </summary>
+    public float? AxialLoadLimitMax { get; set; }
 
-        /// <summary>
-        /// Вес на крюке, т
-        /// </summary>
-        public float HookWeight { get; set; }
+    /// <summary>
+    /// Вес на крюке, т
+    /// </summary>
+    public float HookWeight { get; set; }
 
-        /// <summary>
-        /// Вес на крюке на х.х., т
-        /// </summary>
-        public float? HookWeightIdle { get; set; }
+    /// <summary>
+    /// Вес на крюке на х.х., т
+    /// </summary>
+    public float? HookWeightIdle { get; set; }
 
-        /// <summary>
-        /// ограничение мин веса на крюке, т
-        /// </summary>
-        public float? HookWeightLimitMin { get; set; }
+    /// <summary>
+    /// ограничение мин веса на крюке, т
+    /// </summary>
+    public float? HookWeightLimitMin { get; set; }
 
-        /// <summary>
-        /// ограничение макс веса на крюке, т
-        /// </summary>
-        public float? HookWeightLimitMax { get; set; }
+    /// <summary>
+    /// ограничение макс веса на крюке, т
+    /// </summary>
+    public float? HookWeightLimitMax { get; set; }
 
-        /// <summary>
-        /// момент ротора, кН*м
-        /// </summary>
-        public float RotorTorque { get; set; }
+    /// <summary>
+    /// момент ротора, кН*м
+    /// </summary>
+    public float RotorTorque { get; set; }
 
-        /// <summary>
-        /// момент ротора на х.х., кН*м
-        /// </summary>
-        public float? RotorTorqueIdle { get; set; }
+    /// <summary>
+    /// момент ротора на х.х., кН*м
+    /// </summary>
+    public float? RotorTorqueIdle { get; set; }
 
-        /// <summary>
-        /// задание момента ротора, кН*м
-        /// </summary>
-        public float? RotorTorqueSp { get; set; }
+    /// <summary>
+    /// задание момента ротора, кН*м
+    /// </summary>
+    public float? RotorTorqueSp { get; set; }
 
-        /// <summary>
-        /// ограничение момента ротора, кН*м
-        /// </summary>
-        public float? RotorTorqueLimitMax { get; set; }
+    /// <summary>
+    /// ограничение момента ротора, кН*м
+    /// </summary>
+    public float? RotorTorqueLimitMax { get; set; }
 
-        /// <summary>
-        /// скорость ротора, об/мин
-        /// </summary>
-        public float RotorSpeed { get; set; }
+    /// <summary>
+    /// скорость ротора, об/мин
+    /// </summary>
+    public float RotorSpeed { get; set; }
 
-        /// <summary>
-        /// расход, л/с
-        /// </summary>
-        public float? Flow { get; set; }
+    /// <summary>
+    /// расход, л/с
+    /// </summary>
+    public float? Flow { get; set; }
 
-        /// <summary>
-        /// расход на х.х., л/с
-        /// </summary>
-        public float? FlowIdle { get; set; }
+    /// <summary>
+    /// расход на х.х., л/с
+    /// </summary>
+    public float? FlowIdle { get; set; }
 
-        /// <summary>
-        /// ограничение макс расхода, л/с
-        /// </summary>
-        public float? FlowDeltaLimitMax { get; set; }
+    /// <summary>
+    /// ограничение макс расхода, л/с
+    /// </summary>
+    public float? FlowDeltaLimitMax { get; set; }
 
-        /// <summary>
-        /// id текущего критерия бурения
-        /// </summary>
-        public short? IdFeedRegulator { get; set; }
+    /// <summary>
+    /// id текущего критерия бурения
+    /// </summary>
+    public short? IdFeedRegulator { get; set; }
 
-        /// <summary>
-        /// Текущее состояние работы MSE
-        /// </summary>
-        public short? MseState { get; set; }
+    /// <summary>
+    /// Текущее состояние работы MSE
+    /// </summary>
+    public short? MseState { get; set; }
 
-        /// <summary>
-        /// MSE
-        /// </summary>
-        public float? Mse { get; set; }
+    /// <summary>
+    /// MSE
+    /// </summary>
+    public float? Mse { get; set; }
 
-        /// <summary>
-        /// Расход. Буровой насос 1
-        /// </summary>
-        public float? Pump0Flow { get; set; }
+    /// <summary>
+    /// Расход. Буровой насос 1
+    /// </summary>
+    public float? Pump0Flow { get; set; }
 
-        /// <summary>
-        /// Расход. Буровой насос 2
-        /// </summary>
-        public float? Pump1Flow { get; set; }
+    /// <summary>
+    /// Расход. Буровой насос 2
+    /// </summary>
+    public float? Pump1Flow { get; set; }
 
-        /// <summary>
-        /// Расход. Буровой насос 3
-        /// </summary>
-        public float? Pump2Flow { get; set; }
-    }
+    /// <summary>
+    /// Расход. Буровой насос 3
+    /// </summary>
+    public float? Pump2Flow { get; set; }
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs b/AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs
index 329839be..f2390d92 100644
--- a/AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs
+++ b/AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs
@@ -1,115 +1,114 @@
 using System;
 
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB;
+
+/// <summary>
+/// Статистика телеметрии САУБ (усредненные значения) по интервалам глубины
+/// </summary>
+public class TelemetryDataSaubStatDto
 {
     /// <summary>
-    /// Статистика телеметрии САУБ (усредненные значения) по интервалам глубины
+    /// Кол-во записей в интервале
     /// </summary>
-    public class TelemetryDataSaubStatDto
-    {
-        /// <summary>
-        /// Кол-во записей в интервале
-        /// </summary>
-        public int Count { get; set; }
+    public int Count { get; set; }
 
-        /// <summary>
-        /// Дата начала интервала
-        /// </summary>
-        public DateTime DateMin { get; set; }
+    /// <summary>
+    /// Дата начала интервала
+    /// </summary>
+    public DateTime DateMin { get; set; }
 
-        /// <summary>
-        /// Дата окончания интервала
-        /// </summary>
-        public DateTime DateMax { get; set; }
+    /// <summary>
+    /// Дата окончания интервала
+    /// </summary>
+    public DateTime DateMax { get; set; }
 
-        /// <summary>
-        /// Глубина начала интервала
-        /// </summary>
-        public float WellDepthMin { get; set; }
+    /// <summary>
+    /// Глубина начала интервала
+    /// </summary>
+    public float WellDepthMin { get; set; }
 
-        /// <summary>
-        /// Глубина окончания интервала
-        /// </summary>
-        public float WellDepthMax { get; set; }
+    /// <summary>
+    /// Глубина окончания интервала
+    /// </summary>
+    public float WellDepthMax { get; set; }
 
-        /// <summary>
-        /// Давление
-        /// </summary>
-        public float Pressure { get; set; }
+    /// <summary>
+    /// Давление
+    /// </summary>
+    public float Pressure { get; set; }
 
-        /// <summary>
-        /// действующее задание давления
-        /// </summary>
-        public float PressureSp { get; set; }
-        
-        /// <summary>
-        /// действующее задание перепада давления
-        /// </summary>
-        public float PressureSpDelta { get; set; }
+    /// <summary>
+    /// действующее задание давления
+    /// </summary>
+    public float PressureSp { get; set; }
+    
+    /// <summary>
+    /// действующее задание перепада давления
+    /// </summary>
+    public float PressureSpDelta { get; set; }
 
-        /// <summary>
-        /// Давление при холостом ходе.
-        /// </summary>
-        public float PressureIdle { get; set; }
+    /// <summary>
+    /// Давление при холостом ходе.
+    /// </summary>
+    public float PressureIdle { get; set; }
 
-        /// <summary>
-        /// ограничение макс перепада давления
-        /// </summary>
-        public float PressureDeltaLimitMax { get; set; }
+    /// <summary>
+    /// ограничение макс перепада давления
+    /// </summary>
+    public float PressureDeltaLimitMax { get; set; }
 
-        /// <summary>
-        /// Перепад давления
-        /// </summary>
-        public float PressureDelta { get; set; }
+    /// <summary>
+    /// Перепад давления
+    /// </summary>
+    public float PressureDelta { get; set; }
 
-        /// <summary>
-        /// осевая нагрузка
-        /// </summary>
-        public float AxialLoad { get; set; }
+    /// <summary>
+    /// осевая нагрузка
+    /// </summary>
+    public float AxialLoad { get; set; }
 
-        /// <summary>
-        /// задание осевой нагрузки
-        /// </summary>
-        public float AxialLoadSp { get; set; }
+    /// <summary>
+    /// задание осевой нагрузки
+    /// </summary>
+    public float AxialLoadSp { get; set; }
 
-        /// <summary>
-        /// ограничение макс. осевой нагрузки
-        /// </summary>
-        public float AxialLoadLimitMax { get; set; }
+    /// <summary>
+    /// ограничение макс. осевой нагрузки
+    /// </summary>
+    public float AxialLoadLimitMax { get; set; }
 
-        /// <summary>
-        /// момент ротора
-        /// </summary>
-        public float RotorTorque { get; set; }
+    /// <summary>
+    /// момент ротора
+    /// </summary>
+    public float RotorTorque { get; set; }
 
-        /// <summary>
-        /// задание момента ротора
-        /// </summary>
-        public float RotorTorqueSp { get; set; }
+    /// <summary>
+    /// задание момента ротора
+    /// </summary>
+    public float RotorTorqueSp { get; set; }
 
-        /// <summary>
-        /// момент ротора на х.х.
-        /// </summary>
-        public float RotorTorqueLimitMax { get; set; }
+    /// <summary>
+    /// момент ротора на х.х.
+    /// </summary>
+    public float RotorTorqueLimitMax { get; set; }
 
-        /// <summary>
-        /// Талевый блок. Скорость
-        /// </summary>
-        public float BlockSpeed { get; set; }
+    /// <summary>
+    /// Талевый блок. Скорость
+    /// </summary>
+    public float BlockSpeed { get; set; }
 
-        /// <summary>
-        /// Талевый блок. Задание скорости
-        /// </summary>
-        public float BlockSpeedSp { get; set; }
+    /// <summary>
+    /// Талевый блок. Задание скорости
+    /// </summary>
+    public float BlockSpeedSp { get; set; }
 
-        /// <summary>
-        /// Режим САУБ
-        /// </summary>
-        public short IdMode { get; set; }
+    /// <summary>
+    /// Режим САУБ
+    /// </summary>
+    public short IdMode { get; set; }
 
-        /// <summary>
-        /// Текущий критерий бурения
-        /// </summary>
-        public short? IdFeedRegulator { get; set; }
-    }
+    /// <summary>
+    /// Текущий критерий бурения
+    /// </summary>
+    public short? IdFeedRegulator { get; set; }
 }
diff --git a/AsbCloudApp/Data/SAUB/TelemetryDataSpinDto.cs b/AsbCloudApp/Data/SAUB/TelemetryDataSpinDto.cs
index 83c55520..ee717583 100644
--- a/AsbCloudApp/Data/SAUB/TelemetryDataSpinDto.cs
+++ b/AsbCloudApp/Data/SAUB/TelemetryDataSpinDto.cs
@@ -1,84 +1,83 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB;
+
+/// <summary>
+/// телеметрия спин мастер
+/// </summary>
+public class TelemetryDataSpinDto : ITelemetryData
 {
     /// <summary>
-    /// телеметрия спин мастер
+    /// Идентификатор телеметрии
     /// </summary>
-    public class TelemetryDataSpinDto : ITelemetryData
-    {
-        /// <summary>
-        /// Идентификатор телеметрии
-        /// </summary>
-        public int IdTelemetry { get; set; }
+    public int IdTelemetry { get; set; }
 
-        /// <summary>
-        /// Дата
-        /// </summary>
-        [Required]
-        public DateTime DateTime { get; set; }
+    /// <summary>
+    /// Дата
+    /// </summary>
+    [Required]
+    public DateTime DateTime { get; set; }
 
-        /// <summary>
-        /// Ограничение числа оборотов вправо
-        /// </summary>
-        public float? RevolsRightLimit { get; set; }
+    /// <summary>
+    /// Ограничение числа оборотов вправо
+    /// </summary>
+    public float? RevolsRightLimit { get; set; }
 
-        /// <summary>
-        /// Ограничение числа оборотов влево
-        /// </summary>
-        public float? RevolsLeftLimit { get; set; }
+    /// <summary>
+    /// Ограничение числа оборотов влево
+    /// </summary>
+    public float? RevolsLeftLimit { get; set; }
 
-        /// <summary>
-        /// Заданная скорость вращения вправо
-        /// </summary>
-        public float? SpeedRightSp { get; set; }
+    /// <summary>
+    /// Заданная скорость вращения вправо
+    /// </summary>
+    public float? SpeedRightSp { get; set; }
 
-        /// <summary>
-        /// Заданная скорость вращения влево
-        /// </summary>
-        public float? SpeedLeftSp { get; set; }
+    /// <summary>
+    /// Заданная скорость вращения влево
+    /// </summary>
+    public float? SpeedLeftSp { get; set; }
 
-        /// <summary>
-        /// Суммарное количество оборотов вправо
-        /// </summary>
-        public float? RevolsRightTotal { get; set; }
+    /// <summary>
+    /// Суммарное количество оборотов вправо
+    /// </summary>
+    public float? RevolsRightTotal { get; set; }
 
-        /// <summary>
-        /// Суммарное количество оборотов влево
-        /// </summary>
-        public float? RevolsLeftTotal { get; set; }
+    /// <summary>
+    /// Суммарное количество оборотов влево
+    /// </summary>
+    public float? RevolsLeftTotal { get; set; }
 
-        /// <summary>
-        /// Нулевая позиция осцилляции
-        /// </summary>
-        public float? PositionZero { get; set; }
+    /// <summary>
+    /// Нулевая позиция осцилляции
+    /// </summary>
+    public float? PositionZero { get; set; }
 
-        /// <summary>
-        /// Крайний правый угол осцилляции
-        /// </summary>
-        public float? PositionRight { get; set; }
+    /// <summary>
+    /// Крайний правый угол осцилляции
+    /// </summary>
+    public float? PositionRight { get; set; }
 
-        /// <summary>
-        /// Выбранный режим управления
-        /// </summary>
-        public short? Mode { get; set; }
+    /// <summary>
+    /// Выбранный режим управления
+    /// </summary>
+    public short? Mode { get; set; }
 
-        /// <summary>
-        /// Переменная этапа
-        /// </summary>
-        public short? State { get; set; }
+    /// <summary>
+    /// Переменная этапа
+    /// </summary>
+    public short? State { get; set; }
 
-        /// <summary>
-        /// Осцилляция включена
-        /// </summary>
-        [Required]
-        public bool IsOscillating => State != 0 & State != 6 & State != 7;
+    /// <summary>
+    /// Осцилляция включена
+    /// </summary>
+    [Required]
+    public bool IsOscillating => State != 0 & State != 6 & State != 7;
 
-        /// <summary>
-        /// Демпфирование включено
-        /// </summary>
-        [Required]
-        public bool IsDampening => State == 7 && (Mode & 2) > 0;
-    }
+    /// <summary>
+    /// Демпфирование включено
+    /// </summary>
+    [Required]
+    public bool IsDampening => State == 7 && (Mode & 2) > 0;
 }
diff --git a/AsbCloudApp/Data/SAUB/TelemetryDataStatDto.cs b/AsbCloudApp/Data/SAUB/TelemetryDataStatDto.cs
index c2cb8926..8da5944b 100644
--- a/AsbCloudApp/Data/SAUB/TelemetryDataStatDto.cs
+++ b/AsbCloudApp/Data/SAUB/TelemetryDataStatDto.cs
@@ -1,30 +1,29 @@
 using System;
 
-namespace AsbCloudInfrastructure.Services.SAUB
+namespace AsbCloudInfrastructure.Services.SAUB;
+
+/// <summary>
+/// Статистика данных телеметрии
+/// </summary>
+public class TelemetryDataStatDto
 {
     /// <summary>
-    /// Статистика данных телеметрии
+    /// ID в БД
     /// </summary>
-    public class TelemetryDataStatDto
-    {
-        /// <summary>
-        /// ID в БД
-        /// </summary>
-        public int IdTelemetry { get; set; }
+    public int IdTelemetry { get; set; }
 
-        /// <summary>
-        /// дата получения первых данных
-        /// </summary>
-        public DateTimeOffset DateFirst { get; set; }
-        
-        /// <summary>
-        /// дата получения последних полученных данных
-        /// </summary>
-        public DateTimeOffset DateLast { get; set; }
-        
-        /// <summary>
-        /// смещение часового пояса
-        /// </summary>
-        public double TimezoneOffsetHours { get; set; }
-    }
+    /// <summary>
+    /// дата получения первых данных
+    /// </summary>
+    public DateTimeOffset DateFirst { get; set; }
+    
+    /// <summary>
+    /// дата получения последних полученных данных
+    /// </summary>
+    public DateTimeOffset DateLast { get; set; }
+    
+    /// <summary>
+    /// смещение часового пояса
+    /// </summary>
+    public double TimezoneOffsetHours { get; set; }
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/SAUB/TelemetryInfoDto.cs b/AsbCloudApp/Data/SAUB/TelemetryInfoDto.cs
index 8e89d474..95e64151 100644
--- a/AsbCloudApp/Data/SAUB/TelemetryInfoDto.cs
+++ b/AsbCloudApp/Data/SAUB/TelemetryInfoDto.cs
@@ -1,65 +1,64 @@
 using System;
 
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB;
+
+/// <summary>
+/// общая информация о панели оператора
+/// </summary>
+public class TelemetryInfoDto
 {
     /// <summary>
-    /// общая информация о панели оператора
+    /// дата начала бурения (заполнения данных на панели)
     /// </summary>
-    public class TelemetryInfoDto
-    {
-        /// <summary>
-        /// дата начала бурения (заполнения данных на панели)
-        /// </summary>
-        public DateTime DrillingStartDate { get; set; }
+    public DateTime DrillingStartDate { get; set; }
 
-        /// <summary>
-        /// идентификатор временной зоны
-        /// </summary>
-        public string? TimeZoneId { get; set; }
+    /// <summary>
+    /// идентификатор временной зоны
+    /// </summary>
+    public string? TimeZoneId { get; set; }
 
-        /// <summary>
-        /// смещение в часах относительно UTC
-        /// </summary>
-        public double TimeZoneOffsetTotalHours { get; set; }
+    /// <summary>
+    /// смещение в часах относительно UTC
+    /// </summary>
+    public double TimeZoneOffsetTotalHours { get; set; }
 
-        /// <summary>
-        /// название скважины
-        /// </summary>
-        public string Well { get; set; } = string.Empty;
+    /// <summary>
+    /// название скважины
+    /// </summary>
+    public string Well { get; set; } = string.Empty;
 
-        /// <summary>
-        /// название куста
-        /// </summary>
-        public string Cluster { get; set; } = string.Empty;
+    /// <summary>
+    /// название куста
+    /// </summary>
+    public string Cluster { get; set; } = string.Empty;
 
-        /// <summary>
-        /// название месторождения
-        /// </summary>
-        public string Deposit { get; set; } = string.Empty;
+    /// <summary>
+    /// название месторождения
+    /// </summary>
+    public string Deposit { get; set; } = string.Empty;
 
-        /// <summary>
-        /// название заказчика
-        /// </summary>
-        public string? Customer { get; set; }
-        
-        /// <summary>
-        /// версия ПО панели оператора
-        /// </summary>
-        public string? HmiVersion { get; set; }
+    /// <summary>
+    /// название заказчика
+    /// </summary>
+    public string? Customer { get; set; }
+    
+    /// <summary>
+    /// версия ПО панели оператора
+    /// </summary>
+    public string? HmiVersion { get; set; }
 
-        /// <summary>
-        /// версия ПО ПЛК САУБ
-        /// </summary>
-        public string? SaubPlcVersion { get; set; }
+    /// <summary>
+    /// версия ПО ПЛК САУБ
+    /// </summary>
+    public string? SaubPlcVersion { get; set; }
 
-        /// <summary>
-        /// версия ПО ПЛК Спин мастер
-        /// </summary>
-        public string? SpinPlcVersion { get; set; }
+    /// <summary>
+    /// версия ПО ПЛК Спин мастер
+    /// </summary>
+    public string? SpinPlcVersion { get; set; }
 
-        /// <summary>
-        /// комментарий
-        /// </summary>
-        public string? Comment { get; set; }
-    }
+    /// <summary>
+    /// комментарий
+    /// </summary>
+    public string? Comment { get; set; }
 }
diff --git a/AsbCloudApp/Data/SAUB/TelemetryMessageDto.cs b/AsbCloudApp/Data/SAUB/TelemetryMessageDto.cs
index 7c8e4d92..05562034 100644
--- a/AsbCloudApp/Data/SAUB/TelemetryMessageDto.cs
+++ b/AsbCloudApp/Data/SAUB/TelemetryMessageDto.cs
@@ -1,55 +1,54 @@
 using System;
 
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB;
+
+/// <summary>
+/// Сообщение получаемое от телеметрии с буровой
+/// </summary>
+public class TelemetryMessageDto : IId
 {
     /// <summary>
-    /// Сообщение получаемое от телеметрии с буровой
+    /// Id сообщения в базе панели оператора
     /// </summary>
-    public class TelemetryMessageDto : IId
-    {
-        /// <summary>
-        /// Id сообщения в базе панели оператора
-        /// </summary>
-        public int Id { get; set; }
+    public int Id { get; set; }
 
-        /// <summary>
-        /// отметка времени
-        /// </summary>
-        public DateTimeOffset Date { get; set; }
+    /// <summary>
+    /// отметка времени
+    /// </summary>
+    public DateTimeOffset Date { get; set; }
 
-        /// <summary>
-        /// глубина забоя
-        /// </summary>
-        public double WellDepth { get; set; }
+    /// <summary>
+    /// глубина забоя
+    /// </summary>
+    public double WellDepth { get; set; }
 
-        /// <summary>
-        /// Id события которое генерировало это сообщение
-        /// </summary>
-        public int IdEvent { get; set; }
+    /// <summary>
+    /// Id события которое генерировало это сообщение
+    /// </summary>
+    public int IdEvent { get; set; }
 
-        /// <summary>
-        /// идентификатор пользователя телеметрии
-        /// </summary>
-        public int? IdTelemetryUser { get; set; }
+    /// <summary>
+    /// идентификатор пользователя телеметрии
+    /// </summary>
+    public int? IdTelemetryUser { get; set; }
 
-        /// <summary>
-        /// аргумент №0 для подстановки в шаблон сообщения
-        /// </summary>
-        public string? Arg0 { get; set; }
+    /// <summary>
+    /// аргумент №0 для подстановки в шаблон сообщения
+    /// </summary>
+    public string? Arg0 { get; set; }
 
-        /// <summary>
-        /// аргумент №1 для подстановки в шаблон сообщения
-        /// </summary>
-        public string? Arg1 { get; set; }
+    /// <summary>
+    /// аргумент №1 для подстановки в шаблон сообщения
+    /// </summary>
+    public string? Arg1 { get; set; }
 
-        /// <summary>
-        /// аргумент №2 для подстановки в шаблон сообщения
-        /// </summary>
-        public string? Arg2 { get; set; }
+    /// <summary>
+    /// аргумент №2 для подстановки в шаблон сообщения
+    /// </summary>
+    public string? Arg2 { get; set; }
 
-        /// <summary>
-        /// аргумент №3 для подстановки в шаблон сообщения
-        /// </summary>
-        public string? Arg3 { get; set; }
-    }
+    /// <summary>
+    /// аргумент №3 для подстановки в шаблон сообщения
+    /// </summary>
+    public string? Arg3 { get; set; }
 }
diff --git a/AsbCloudApp/Data/SAUB/TelemetryUserDto.cs b/AsbCloudApp/Data/SAUB/TelemetryUserDto.cs
index ad7a8aab..a86c54dd 100644
--- a/AsbCloudApp/Data/SAUB/TelemetryUserDto.cs
+++ b/AsbCloudApp/Data/SAUB/TelemetryUserDto.cs
@@ -1,52 +1,51 @@
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB;
+
+/// <summary>
+/// Пользователь панели оператора
+/// </summary>
+public class TelemetryUserDto : IId
 {
+    /// <inheritdoc/>
+    public int Id { get; set; }
+
     /// <summary>
-    /// Пользователь панели оператора
+    /// Имя
     /// </summary>
-    public class TelemetryUserDto : IId
+    public string? Name { get; set; }
+
+    /// <summary>
+    /// Фамилия
+    /// </summary>
+    public string Surname { get; set; } = null!;
+
+    /// <summary>
+    /// Отчество
+    /// </summary>
+    public string? Patronymic { get; set; }
+
+    /// <summary>
+    /// Уровень доступа
+    /// </summary>
+    public int? Level { get; set; }
+
+    /// <summary>
+    /// Собрать отображаемое имя пользователя
+    /// </summary>
+    /// <returns></returns>
+    public string MakeDisplayName()
     {
-        /// <inheritdoc/>
-        public int Id { get; set; }
-
-        /// <summary>
-        /// Имя
-        /// </summary>
-        public string? Name { get; set; }
-
-        /// <summary>
-        /// Фамилия
-        /// </summary>
-        public string Surname { get; set; } = null!;
-
-        /// <summary>
-        /// Отчество
-        /// </summary>
-        public string? Patronymic { get; set; }
-
-        /// <summary>
-        /// Уровень доступа
-        /// </summary>
-        public int? Level { get; set; }
-
-        /// <summary>
-        /// Собрать отображаемое имя пользователя
-        /// </summary>
-        /// <returns></returns>
-        public string MakeDisplayName()
+        if (!string.IsNullOrEmpty(Surname))
         {
-            if (!string.IsNullOrEmpty(Surname))
+            var s = Surname;
+            if (!string.IsNullOrEmpty(Name))
             {
-                var s = Surname;
-                if (!string.IsNullOrEmpty(Name))
-                {
-                    s += $"{Name[0]}.";
-                    if (!string.IsNullOrEmpty(Patronymic))
-                        s += $" {Patronymic[0]}.";
-                }
-                return s;
+                s += $"{Name[0]}.";
+                if (!string.IsNullOrEmpty(Patronymic))
+                    s += $" {Patronymic[0]}.";
             }
-            else
-                return $"User #{Id}";
+            return s;
         }
+        else
+            return $"User #{Id}";
     }
 }
diff --git a/AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs b/AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs
index c6a52965..a15aca57 100644
--- a/AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs
+++ b/AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs
@@ -1,47 +1,46 @@
 using System;
 
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB;
+
+/// <summary>
+/// DTO телеметрии наработки талевого каната от панели бурильщика
+/// </summary>
+public class TelemetryWirelineRunOutBaseDto
 {
     /// <summary>
-    /// DTO телеметрии наработки талевого каната от панели бурильщика
+    /// отметка времени
     /// </summary>
-    public class TelemetryWirelineRunOutBaseDto
-    {
-        /// <summary>
-        /// отметка времени
-        /// </summary>
-        public DateTimeOffset DateTime { get; set; }
-
-        /// <summary>
-        /// Наработка талевого каната с момента перетяжки каната, т*км
-        /// </summary>
-        public float Hauling { get; set; }
-
-        /// <summary>
-        /// Наработка талевого каната до сигнализации о необходимости перетяжки, т*км
-        /// </summary>
-        public float HaulingWarnSp { get; set; }
-
-        /// <summary>
-        /// Наработка талевого каната с момента замены каната, т*км
-        /// </summary>
-        public float Replace { get; set; }
-
-        /// <summary>
-        /// Наработка талевого каната до сигнализации о необходимости замены, т*км
-        /// </summary>
-        public float ReplaceWarnSp { get; set; }
-    }
+    public DateTimeOffset DateTime { get; set; }
 
     /// <summary>
-    /// DTO телеметрии наработки талевого каната
+    /// Наработка талевого каната с момента перетяжки каната, т*км
     /// </summary>
-    public class TelemetryWirelineRunOutDto : TelemetryWirelineRunOutBaseDto
-    {
+    public float Hauling { get; set; }
 
-        /// <summary>
-        /// Информация по скважине
-        /// </summary>
-        public WellInfoDto WellInfo { get; set; } = null!;
-    }
+    /// <summary>
+    /// Наработка талевого каната до сигнализации о необходимости перетяжки, т*км
+    /// </summary>
+    public float HaulingWarnSp { get; set; }
+
+    /// <summary>
+    /// Наработка талевого каната с момента замены каната, т*км
+    /// </summary>
+    public float Replace { get; set; }
+
+    /// <summary>
+    /// Наработка талевого каната до сигнализации о необходимости замены, т*км
+    /// </summary>
+    public float ReplaceWarnSp { get; set; }
+}
+
+/// <summary>
+/// DTO телеметрии наработки талевого каната
+/// </summary>
+public class TelemetryWirelineRunOutDto : TelemetryWirelineRunOutBaseDto
+{
+
+    /// <summary>
+    /// Информация по скважине
+    /// </summary>
+    public WellInfoDto WellInfo { get; set; } = null!;
 }
diff --git a/AsbCloudApp/Data/ScheduleDto.cs b/AsbCloudApp/Data/ScheduleDto.cs
index e9c8d991..1a981f61 100644
--- a/AsbCloudApp/Data/ScheduleDto.cs
+++ b/AsbCloudApp/Data/ScheduleDto.cs
@@ -2,61 +2,60 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Описание данных графика работ
+/// </summary>
+public class ScheduleDto : IId, IWellRelated, IValidatableObject
 {
+    /// <inheritdoc/>
+    [Required]
+    public int Id { get; set; }
+
+    /// <inheritdoc/>
+    [Required]
+    public int IdWell { get; set; }
+
     /// <summary>
-    /// Описание данных графика работ
+    /// Идентификатор бурильщика
     /// </summary>
-    public class ScheduleDto : IId, IWellRelated, IValidatableObject
+    [Required]
+    public int IdDriller { get; set; }
+
+    /// <summary>
+    /// Начало смены
+    /// </summary>
+    [Required]
+    public TimeDto ShiftStart { get; set; } = null!;
+
+    /// <summary>
+    /// Конец смены
+    /// </summary>
+    [Required]
+    public TimeDto ShiftEnd { get; set; } = null!;
+
+    /// <summary>
+    /// Начало бурения
+    /// </summary>
+    [Required]
+    public DateTimeOffset DrillStart { get; set; }
+
+    /// <summary>
+    /// Конец бурения
+    /// </summary>
+    [Required]
+    public DateTimeOffset DrillEnd { get; set; }
+
+    /// <summary>
+    /// Бурильщик
+    /// </summary>
+    public DrillerDto? Driller { get; set; }
+    
+    /// <inheritdoc/>
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
-        /// <inheritdoc/>
-        [Required]
-        public int Id { get; set; }
-
-        /// <inheritdoc/>
-        [Required]
-        public int IdWell { get; set; }
-
-        /// <summary>
-        /// Идентификатор бурильщика
-        /// </summary>
-        [Required]
-        public int IdDriller { get; set; }
-
-        /// <summary>
-        /// Начало смены
-        /// </summary>
-        [Required]
-        public TimeDto ShiftStart { get; set; } = null!;
-
-        /// <summary>
-        /// Конец смены
-        /// </summary>
-        [Required]
-        public TimeDto ShiftEnd { get; set; } = null!;
-
-        /// <summary>
-        /// Начало бурения
-        /// </summary>
-        [Required]
-        public DateTimeOffset DrillStart { get; set; }
-
-        /// <summary>
-        /// Конец бурения
-        /// </summary>
-        [Required]
-        public DateTimeOffset DrillEnd { get; set; }
-
-        /// <summary>
-        /// Бурильщик
-        /// </summary>
-        public DrillerDto? Driller { get; set; }
-        
-        /// <inheritdoc/>
-        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
-        {
-            if(DrillStart >= DrillEnd)
-                yield return new ValidationResult($"DrillStart > DrillEnd");
-        }
+        if(DrillStart >= DrillEnd)
+            yield return new ValidationResult($"DrillStart > DrillEnd");
     }
 }
diff --git a/AsbCloudApp/Data/SimpleTimezoneDto.cs b/AsbCloudApp/Data/SimpleTimezoneDto.cs
index 5d2e1f8f..b869dbc9 100644
--- a/AsbCloudApp/Data/SimpleTimezoneDto.cs
+++ b/AsbCloudApp/Data/SimpleTimezoneDto.cs
@@ -1,51 +1,50 @@
 using System;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// временная зона
+/// </summary>
+public class SimpleTimezoneDto
 {
     /// <summary>
-    /// временная зона
+    /// смещение в часах относительно UTC
     /// </summary>
-    public class SimpleTimezoneDto
+    public double Hours { get; set; }
+
+    /// <summary>
+    /// идентификатор часовой зоны
+    /// </summary>
+    public string? TimezoneId { get; set; }
+
+    /// <summary>
+    /// запрет на переопределение
+    /// </summary>
+    public bool IsOverride { get; set; }
+
+    /// <summary>
+    /// Смещение часового пояса
+    /// </summary>
+    public TimeSpan Offset => TimeSpan.FromHours(Hours);
+
+    /// <inheritdoc/>
+    public override bool Equals(object? obj)
     {
-        /// <summary>
-        /// смещение в часах относительно UTC
-        /// </summary>
-        public double Hours { get; set; }
-
-        /// <summary>
-        /// идентификатор часовой зоны
-        /// </summary>
-        public string? TimezoneId { get; set; }
-
-        /// <summary>
-        /// запрет на переопределение
-        /// </summary>
-        public bool IsOverride { get; set; }
-
-        /// <summary>
-        /// Смещение часового пояса
-        /// </summary>
-        public TimeSpan Offset => TimeSpan.FromHours(Hours);
-
-        /// <inheritdoc/>
-        public override bool Equals(object? obj)
-        {
-            if (obj is SimpleTimezoneDto tTimeZone
-                && tTimeZone.Hours == Hours
-                && tTimeZone.TimezoneId == TimezoneId
-                && tTimeZone.IsOverride == IsOverride)
-                return true;
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-           => Hours.GetHashCode()
-            | TimezoneId?.GetHashCode()??-1
-            | IsOverride.GetHashCode();
-
-        /// <inheritdoc/>
-        public override string ToString()
-            => $"{TimezoneId} (UTC+{Hours:00.##})";
+        if (obj is SimpleTimezoneDto tTimeZone
+            && tTimeZone.Hours == Hours
+            && tTimeZone.TimezoneId == TimezoneId
+            && tTimeZone.IsOverride == IsOverride)
+            return true;
+        return false;
     }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+       => Hours.GetHashCode()
+        | TimezoneId?.GetHashCode()??-1
+        | IsOverride.GetHashCode();
+
+    /// <inheritdoc/>
+    public override string ToString()
+        => $"{TimezoneId} (UTC+{Hours:00.##})";
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/SlipsStatDto.cs b/AsbCloudApp/Data/SlipsStatDto.cs
index 13e381fa..b24854d8 100644
--- a/AsbCloudApp/Data/SlipsStatDto.cs
+++ b/AsbCloudApp/Data/SlipsStatDto.cs
@@ -4,41 +4,40 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO, описывающая аналитику удержания в клиньях
+/// </summary>
+public class SlipsStatDto
 {
     /// <summary>
-    /// DTO, описывающая аналитику удержания в клиньях
+    /// ФИО бурильщика
     /// </summary>
-    public class SlipsStatDto
-    {
-        /// <summary>
-        /// ФИО бурильщика
-        /// </summary>
-        public string DrillerName { get; set; } = null!;
+    public string DrillerName { get; set; } = null!;
 
-        /// <summary>
-        /// Количество скважин
-        /// </summary>
-        public int WellCount { get; set; }
+    /// <summary>
+    /// Количество скважин
+    /// </summary>
+    public int WellCount { get; set; }
 
-        /// <summary>
-        /// Название секции
-        /// </summary>
-        public string SectionCaption { get; set; } = null!;
+    /// <summary>
+    /// Название секции
+    /// </summary>
+    public string SectionCaption { get; set; } = null!;
 
-        /// <summary>
-        /// Количество удержаний в клиньях, шт.
-        /// </summary>
-        public int SlipsCount { get; set; }
+    /// <summary>
+    /// Количество удержаний в клиньях, шт.
+    /// </summary>
+    public int SlipsCount { get; set; }
 
-        /// <summary>
-        /// Время удержания в клиньях, мин.
-        /// </summary>
-        public double SlipsTimeInMinutes { get; set; }
+    /// <summary>
+    /// Время удержания в клиньях, мин.
+    /// </summary>
+    public double SlipsTimeInMinutes { get; set; }
 
-        /// <summary>
-        /// Проходка, м.
-        /// </summary>
-        public double SectionDepth { get; set; }
-    }
+    /// <summary>
+    /// Проходка, м.
+    /// </summary>
+    public double SectionDepth { get; set; }
 }
diff --git a/AsbCloudApp/Data/StatClusterDto.cs b/AsbCloudApp/Data/StatClusterDto.cs
index d407dda8..9e6aea41 100644
--- a/AsbCloudApp/Data/StatClusterDto.cs
+++ b/AsbCloudApp/Data/StatClusterDto.cs
@@ -2,27 +2,26 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO статистики скважин куста
+/// </summary>
+public class StatClusterDto : IId
 {
+    /// <inheritdoc/>
+    [Required]
+    public int Id { get; set; }
+
     /// <summary>
-    /// DTO статистики скважин куста
+    /// название куста
     /// </summary>
-    public class StatClusterDto : IId
-    {
-        /// <inheritdoc/>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public string Caption { get; set; } = string.Empty;
 
-        /// <summary>
-        /// название куста
-        /// </summary>
-        [Required]
-        public string Caption { get; set; } = string.Empty;
-
-        /// <summary>
-        /// список статистик скважин куста
-        /// </summary>
-        [Required]
-        public IEnumerable<StatWellDto> StatsWells { get; set; } = Enumerable.Empty<StatWellDto>();
-    }
+    /// <summary>
+    /// список статистик скважин куста
+    /// </summary>
+    [Required]
+    public IEnumerable<StatWellDto> StatsWells { get; set; } = Enumerable.Empty<StatWellDto>();
 }
diff --git a/AsbCloudApp/Data/StatOperationsDto.cs b/AsbCloudApp/Data/StatOperationsDto.cs
index 06d4cd8b..8e95392d 100644
--- a/AsbCloudApp/Data/StatOperationsDto.cs
+++ b/AsbCloudApp/Data/StatOperationsDto.cs
@@ -1,69 +1,68 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO статистики операций
+/// </summary>
+public class StatOperationsDto
 {
     /// <summary>
-    /// DTO статистики операций
+    /// Дата и время начала
     /// </summary>
-    public class StatOperationsDto
-    {
-        /// <summary>
-        /// Дата и время начала
-        /// </summary>
-        public DateTimeOffset? Start { get; set; }
+    public DateTimeOffset? Start { get; set; }
 
-        /// <summary>
-        /// Дата и время окончания
-        /// </summary>
-        public DateTimeOffset? End { get; set; }
+    /// <summary>
+    /// Дата и время окончания
+    /// </summary>
+    public DateTimeOffset? End { get; set; }
 
-        /// <summary>
-        /// Глубина, м
-        /// </summary>
-        [Required]
-        public double WellDepthStart { get; set; }
+    /// <summary>
+    /// Глубина, м
+    /// </summary>
+    [Required]
+    public double WellDepthStart { get; set; }
 
-        /// <summary>
-        /// Глубина, м
-        /// </summary>
-        [Required]
-        public double WellDepthEnd { get; set; }
+    /// <summary>
+    /// Глубина, м
+    /// </summary>
+    [Required]
+    public double WellDepthEnd { get; set; }
 
-        /// <summary>
-        /// Рейсовая скорость, м/час
-        /// </summary>
-        [Required]
-        public double RouteSpeed { get; set; }
+    /// <summary>
+    /// Рейсовая скорость, м/час
+    /// </summary>
+    [Required]
+    public double RouteSpeed { get; set; }
 
-        /// <summary>
-        /// Механическая скорость проходки, м/час
-        /// </summary>
-        [Required]
-        public double Rop { get; set; }
+    /// <summary>
+    /// Механическая скорость проходки, м/час
+    /// </summary>
+    [Required]
+    public double Rop { get; set; }
 
-        /// <summary>
-        /// Скорость подъема КНБК
-        /// </summary>
-        [Required]
-        public double BhaUpSpeed { get; set; }
+    /// <summary>
+    /// Скорость подъема КНБК
+    /// </summary>
+    [Required]
+    public double BhaUpSpeed { get; set; }
 
-        /// <summary>
-        /// Скорость спуска КНБК
-        /// </summary>
-        [Required]
-        public double BhaDownSpeed { get; set; }
+    /// <summary>
+    /// Скорость спуска КНБК
+    /// </summary>
+    [Required]
+    public double BhaDownSpeed { get; set; }
 
-        /// <summary>
-        /// Скорость спуска обсадной колонны
-        /// </summary>
-        [Required]
-        public double CasingDownSpeed { get; set; }
+    /// <summary>
+    /// Скорость спуска обсадной колонны
+    /// </summary>
+    [Required]
+    public double CasingDownSpeed { get; set; }
 
-        /// <summary>
-        /// Непроизводительное время
-        /// </summary>
-        [Required]
-        public double NonProductiveHours { get; set; }
-    }
+    /// <summary>
+    /// Непроизводительное время
+    /// </summary>
+    [Required]
+    public double NonProductiveHours { get; set; }
 }
diff --git a/AsbCloudApp/Data/StatSectionDto.cs b/AsbCloudApp/Data/StatSectionDto.cs
index e1cb8d91..39432f51 100644
--- a/AsbCloudApp/Data/StatSectionDto.cs
+++ b/AsbCloudApp/Data/StatSectionDto.cs
@@ -1,20 +1,19 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
-{
-    /// <summary>
-    /// План-факт статистики по операциям за секцию скважины
-    /// </summary>
-    public class StatSectionDto : PlanFactDto<StatOperationsDto>, IId
-    {
-        /// <inheritdoc/>
-        [Required]
-        public int Id { get; set; }
+namespace AsbCloudApp.Data;
 
-        /// <summary>
-        /// название секции
-        /// </summary>
-        [Required]
-        public string Caption { get; set; } = string.Empty;
-    }
+/// <summary>
+/// План-факт статистики по операциям за секцию скважины
+/// </summary>
+public class StatSectionDto : PlanFactDto<StatOperationsDto>, IId
+{
+    /// <inheritdoc/>
+    [Required]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// название секции
+    /// </summary>
+    [Required]
+    public string Caption { get; set; } = string.Empty;
 }
diff --git a/AsbCloudApp/Data/StatWellDto.cs b/AsbCloudApp/Data/StatWellDto.cs
index 2906267d..93413112 100644
--- a/AsbCloudApp/Data/StatWellDto.cs
+++ b/AsbCloudApp/Data/StatWellDto.cs
@@ -3,73 +3,72 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO статистики по операциям за скважину
+/// </summary>
+public class StatWellDto : IId
 {
+    /// <inheritdoc/>
+    [Required]
+    public int Id { get; set; }
+
     /// <summary>
-    /// DTO статистики по операциям за скважину
+    /// название 
     /// </summary>
-    public class StatWellDto : IId
-    {
-        /// <inheritdoc/>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public string Caption { get; set; } = string.Empty;
 
-        /// <summary>
-        /// название 
-        /// </summary>
-        [Required]
-        public string Caption { get; set; } = string.Empty;
+    /// <summary>
+    /// тип скважины
+    /// </summary>
+    [Required]
+    public string WellType { get; set; } = string.Empty;
 
-        /// <summary>
-        /// тип скважины
-        /// </summary>
-        [Required]
-        public string WellType { get; set; } = string.Empty;
+    /// <summary>
+    /// ИД состояния скважины
+    /// </summary>
+    [Required]
+    public int IdState { get; set; }
 
-        /// <summary>
-        /// ИД состояния скважины
-        /// </summary>
-        [Required]
-        public int IdState { get; set; }
+    /// <summary>
+    /// текст состояния скважины
+    /// </summary>
+    [Required]
+    public string State { get; set; } = string.Empty;
 
-        /// <summary>
-        /// текст состояния скважины
-        /// </summary>
-        [Required]
-        public string State { get; set; } = string.Empty;
+    /// <summary>
+    /// дата прихода последней телеметрии
+    /// </summary>
+    [Required]
+    public DateTimeOffset LastTelemetryDate { get; set; }
 
-        /// <summary>
-        /// дата прихода последней телеметрии
-        /// </summary>
-        [Required]
-        public DateTimeOffset LastTelemetryDate { get; set; }
+    /// <summary>
+    /// Статистика по секциям
+    /// </summary>
+    [Required]
+    public IEnumerable<StatSectionDto> Sections { get; set; } = Enumerable.Empty<StatSectionDto>();
 
-        /// <summary>
-        /// Статистика по секциям
-        /// </summary>
-        [Required]
-        public IEnumerable<StatSectionDto> Sections { get; set; } = Enumerable.Empty<StatSectionDto>();
+    /// <summary>
+    /// статистика за всю скважину
+    /// </summary>
+    [Required]
+    public PlanFactDto<StatOperationsDto> Total { get; set; } = new();
 
-        /// <summary>
-        /// статистика за всю скважину
-        /// </summary>
-        [Required]
-        public PlanFactDto<StatOperationsDto> Total { get; set; } = new();
+    /// <summary>
+    /// компании участвующие в строительстве скважины
+    /// </summary>
+    [Required]
+    public IEnumerable<CompanyDto> Companies { get; set; } = Enumerable.Empty<CompanyDto>();
 
-        /// <summary>
-        /// компании участвующие в строительстве скважины
-        /// </summary>
-        [Required]
-        public IEnumerable<CompanyDto> Companies { get; set; } = Enumerable.Empty<CompanyDto>();
-
-        /// <summary>
-        /// Отставание от ГГД, дни
-        /// </summary>
-        public double? TvdLagDays { get; set; }
-        
-        /// <summary>
-        /// Кол-во дней бурения по ГГД
-        /// </summary>
-        public double? TvdDrillingDays { get; set; }
-    }
+    /// <summary>
+    /// Отставание от ГГД, дни
+    /// </summary>
+    public double? TvdLagDays { get; set; }
+    
+    /// <summary>
+    /// Кол-во дней бурения по ГГД
+    /// </summary>
+    public double? TvdDrillingDays { get; set; }
 }
diff --git a/AsbCloudApp/Data/Subsystems/SubsystemDto.cs b/AsbCloudApp/Data/Subsystems/SubsystemDto.cs
index fa5c02d1..bd0c1b21 100644
--- a/AsbCloudApp/Data/Subsystems/SubsystemDto.cs
+++ b/AsbCloudApp/Data/Subsystems/SubsystemDto.cs
@@ -1,26 +1,25 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.Subsystems
+namespace AsbCloudApp.Data.Subsystems;
+
+/// <summary>
+/// Описание параметров подсистемы
+/// </summary>
+public class SubsystemDto : IId
 {
     /// <summary>
-    /// Описание параметров подсистемы
+    /// Идентификатор подсистемы
     /// </summary>
-    public class SubsystemDto : IId
-    {
-        /// <summary>
-        /// Идентификатор подсистемы
-        /// </summary>
-        [Required]
-        public int Id { get; set; }
-        /// <summary>
-        /// Наименование подсистемы
-        /// </summary>
-        [Required]
-        public string Name { get; set; } = null!;
-        /// <summary>
-        /// Детальное описание подсистемы
-        /// </summary>
-        [Required]
-        public string Description { get; set; } = string.Empty;
-    }
+    [Required]
+    public int Id { get; set; }
+    /// <summary>
+    /// Наименование подсистемы
+    /// </summary>
+    [Required]
+    public string Name { get; set; } = null!;
+    /// <summary>
+    /// Детальное описание подсистемы
+    /// </summary>
+    [Required]
+    public string Description { get; set; } = string.Empty;
 }
diff --git a/AsbCloudApp/Data/Subsystems/SubsystemStatDto.cs b/AsbCloudApp/Data/Subsystems/SubsystemStatDto.cs
index 3c566dea..78dd9b5c 100644
--- a/AsbCloudApp/Data/Subsystems/SubsystemStatDto.cs
+++ b/AsbCloudApp/Data/Subsystems/SubsystemStatDto.cs
@@ -1,52 +1,51 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.Subsystems
+namespace AsbCloudApp.Data.Subsystems;
+
+/// <summary>
+/// Статистика подсистемы
+/// </summary>
+public class SubsystemStatDto
 {
     /// <summary>
-    /// Статистика подсистемы
+    /// Идентификатор подсистемы
     /// </summary>
-    public class SubsystemStatDto
-    {
-        /// <summary>
-        /// Идентификатор подсистемы
-        /// </summary>
-        [Required]
-        public int IdSubsystem { get; set; }
-        /// <summary>
-        /// Название подсистемы
-        /// </summary>
-        [Required]
-        public string SubsystemName { get; set; } = null!;
-        /// <summary>
-        /// наработка подсистемы
-        /// </summary>
-        [Required]
-        public double UsedTimeHours { get; set; }
-        /// <summary>
-        /// коэффициент использования
-        /// </summary>
-        [Required]
-        public double KUsage { get; set; }
-        /// <summary>
-        /// сумма изменения глубин при включеной подсистеме
-        /// </summary>
-        [Required]
-        public double SumDepthInterval { get; set; }
-        /// <summary>
-        /// сумма проходок автоопределенных операций выполняемых подсистемой
-        /// </summary>
-        [Required]
-        public double SumOperationDepthInterval { get; set; }
-        /// <summary>
-        /// сумма продолжительности автоопределенных операций выполняемых подсистемой
-        /// </summary>
-        [Required]
-        public double SumOperationDurationHours { get; set; }
-        /// <summary>
-        /// количество включений подсистемы
-        /// </summary>
-        [Required]
-        public int OperationCount { get; set; }        
-    }
+    [Required]
+    public int IdSubsystem { get; set; }
+    /// <summary>
+    /// Название подсистемы
+    /// </summary>
+    [Required]
+    public string SubsystemName { get; set; } = null!;
+    /// <summary>
+    /// наработка подсистемы
+    /// </summary>
+    [Required]
+    public double UsedTimeHours { get; set; }
+    /// <summary>
+    /// коэффициент использования
+    /// </summary>
+    [Required]
+    public double KUsage { get; set; }
+    /// <summary>
+    /// сумма изменения глубин при включеной подсистеме
+    /// </summary>
+    [Required]
+    public double SumDepthInterval { get; set; }
+    /// <summary>
+    /// сумма проходок автоопределенных операций выполняемых подсистемой
+    /// </summary>
+    [Required]
+    public double SumOperationDepthInterval { get; set; }
+    /// <summary>
+    /// сумма продолжительности автоопределенных операций выполняемых подсистемой
+    /// </summary>
+    [Required]
+    public double SumOperationDurationHours { get; set; }
+    /// <summary>
+    /// количество включений подсистемы
+    /// </summary>
+    [Required]
+    public int OperationCount { get; set; }        
 }
diff --git a/AsbCloudApp/Data/TelemetryDto.cs b/AsbCloudApp/Data/TelemetryDto.cs
index 2934b721..6584a8df 100644
--- a/AsbCloudApp/Data/TelemetryDto.cs
+++ b/AsbCloudApp/Data/TelemetryDto.cs
@@ -1,44 +1,43 @@
 using AsbCloudApp.Data.SAUB;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO телеметрии панели
+/// </summary>
+public class TelemetryBaseDto : IId
+{
+    /// <inheritdoc/>
+    public int Id { get; set; }
+
+    /// <summary>
+    /// уникальный идентификатор телеметрии по которому панель оператора присылает данные
+    /// </summary>
+    public string RemoteUid { get; set; } = null!;
+
+    /// <summary>
+    /// информация о бурении, панели оператора и контроллерах
+    /// </summary>
+    public TelemetryInfoDto? Info { get; set; }
+
+    /// <summary>
+    /// Смещение часового пояса от UTC
+    /// </summary>
+    public SimpleTimezoneDto? TimeZone { get; set; }
+}
+
+/// <summary>
+/// DTO телеметрии панели с скважиной
+/// </summary>
+public class TelemetryDto : TelemetryBaseDto
 {
     /// <summary>
-    /// DTO телеметрии панели
+    /// ИД скважины
     /// </summary>
-    public class TelemetryBaseDto : IId
-    {
-        /// <inheritdoc/>
-        public int Id { get; set; }
-
-        /// <summary>
-        /// уникальный идентификатор телеметрии по которому панель оператора присылает данные
-        /// </summary>
-        public string RemoteUid { get; set; } = null!;
-
-        /// <summary>
-        /// информация о бурении, панели оператора и контроллерах
-        /// </summary>
-        public TelemetryInfoDto? Info { get; set; }
-
-        /// <summary>
-        /// Смещение часового пояса от UTC
-        /// </summary>
-        public SimpleTimezoneDto? TimeZone { get; set; }
-    }
+    public int? IdWell { get; set; }
 
     /// <summary>
-    /// DTO телеметрии панели с скважиной
+    /// DTO скважины
     /// </summary>
-    public class TelemetryDto : TelemetryBaseDto
-    {
-        /// <summary>
-        /// ИД скважины
-        /// </summary>
-        public int? IdWell { get; set; }
-
-        /// <summary>
-        /// DTO скважины
-        /// </summary>
-        public WellInfoDto? Well { get; set; }
-    }
+    public WellInfoDto? Well { get; set; }
 }
diff --git a/AsbCloudApp/Data/TimeDto.cs b/AsbCloudApp/Data/TimeDto.cs
index 34bcba3e..2cb40a6d 100644
--- a/AsbCloudApp/Data/TimeDto.cs
+++ b/AsbCloudApp/Data/TimeDto.cs
@@ -1,159 +1,158 @@
 using System;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO времени
+/// </summary>
+public class TimeDto : IComparable<TimeDto>
 {
+    private int hour = 0;
+    private int minute = 0;
+    private int second = 0;
+
     /// <summary>
-    /// DTO времени
+    /// час
     /// </summary>
-    public class TimeDto : IComparable<TimeDto>
+    public int Hour
     {
-        private int hour = 0;
-        private int minute = 0;
-        private int second = 0;
-
-        /// <summary>
-        /// час
-        /// </summary>
-        public int Hour
+        get => hour;
+        set
         {
-            get => hour;
-            set
-            {
-                if (value > 23 || value < 0)
-                    throw new ArgumentOutOfRangeException(nameof(Hour), "hour should be in [0; 23]");
-                hour = value;
-            }
+            if (value > 23 || value < 0)
+                throw new ArgumentOutOfRangeException(nameof(Hour), "hour should be in [0; 23]");
+            hour = value;
+        }
+    }
+
+    /// <summary>
+    /// минута
+    /// </summary>
+    public int Minute
+    {
+        get => minute;
+        set
+        {
+            if (value > 59 || value < 0)
+                throw new ArgumentOutOfRangeException(nameof(minute), "minute should be in [0; 59]");
+            minute = value;
+        }
+    }
+
+    /// <summary>
+    /// секунда
+    /// </summary>
+    public int Second
+    {
+        get => second;
+        set
+        {
+            if (value > 59 || value < 0)
+                throw new ArgumentOutOfRangeException(nameof(second), "second should be in [0; 59]");
+            second = value;
+        }
+    }
+
+    /// <summary>
+    /// Кол-во секунд с начала суток
+    /// </summary>
+    public int TotalSeconds => (Hour * 60 + minute) * 60 + second;
+
+    /// <inheritdoc/>
+    public TimeDto()
+    { }
+
+    /// <inheritdoc/>
+    public TimeDto(int hour = 0, int minute = 0, int second = 0)
+    {
+        this.hour = hour;
+        this.minute = minute;
+        this.second = second;
+    }
+
+    /// <inheritdoc/>
+    public TimeDto(TimeOnly time)
+    {
+        hour = time.Hour;
+        minute = time.Minute;
+        second = time.Second;
+    }
+
+    /// <inheritdoc/>
+    public TimeDto(DateTime fullDate)
+    {
+        hour = fullDate.Hour;
+        minute = fullDate.Minute;
+        second = fullDate.Second;
+    }
+
+    /// <inheritdoc/>
+    public TimeDto(DateTimeOffset fullDate)
+    {
+        hour = fullDate.Hour;
+        minute = fullDate.Minute;
+        second = fullDate.Second;
+    }
+
+    /// <summary>
+    /// Makes System.TimeOnly
+    /// </summary>
+    /// <returns>System.TimeOnly</returns>
+    public TimeOnly MakeTimeOnly() => new(Hour, Minute, Second);
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        var str = $"{Hour:00}:{Minute:00}:{Second:00}";
+        return str;
+    }
+
+    /// <inheritdoc/>
+    public static bool operator ==(TimeDto a, TimeDto b) => a?.TotalSeconds == b?.TotalSeconds;
+
+    /// <inheritdoc/>
+    public static bool operator !=(TimeDto a, TimeDto b) => !(a == b);
+
+    /// <inheritdoc/>
+    public static bool operator <=(TimeDto a, TimeDto b) => a.TotalSeconds <= b.TotalSeconds;
+
+    /// <inheritdoc/>
+    public static bool operator >=(TimeDto a, TimeDto b) => a.TotalSeconds >= b.TotalSeconds;
+
+    /// <inheritdoc/>
+    public static bool operator <(TimeDto a, TimeDto b) => a.TotalSeconds < b.TotalSeconds;
+
+    /// <inheritdoc/>
+    public static bool operator >(TimeDto a, TimeDto b) => a.TotalSeconds > b.TotalSeconds;
+
+    /// <inheritdoc/>
+    public int CompareTo(TimeDto? other)
+        => TotalSeconds - other?.TotalSeconds??0;
+
+    /// <inheritdoc/>
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
         }
 
-        /// <summary>
-        /// минута
-        /// </summary>
-        public int Minute
+        if (obj is null)
         {
-            get => minute;
-            set
-            {
-                if (value > 59 || value < 0)
-                    throw new ArgumentOutOfRangeException(nameof(minute), "minute should be in [0; 59]");
-                minute = value;
-            }
-        }
-
-        /// <summary>
-        /// секунда
-        /// </summary>
-        public int Second
-        {
-            get => second;
-            set
-            {
-                if (value > 59 || value < 0)
-                    throw new ArgumentOutOfRangeException(nameof(second), "second should be in [0; 59]");
-                second = value;
-            }
-        }
-
-        /// <summary>
-        /// Кол-во секунд с начала суток
-        /// </summary>
-        public int TotalSeconds => (Hour * 60 + minute) * 60 + second;
-
-        /// <inheritdoc/>
-        public TimeDto()
-        { }
-
-        /// <inheritdoc/>
-        public TimeDto(int hour = 0, int minute = 0, int second = 0)
-        {
-            this.hour = hour;
-            this.minute = minute;
-            this.second = second;
-        }
-
-        /// <inheritdoc/>
-        public TimeDto(TimeOnly time)
-        {
-            hour = time.Hour;
-            minute = time.Minute;
-            second = time.Second;
-        }
-
-        /// <inheritdoc/>
-        public TimeDto(DateTime fullDate)
-        {
-            hour = fullDate.Hour;
-            minute = fullDate.Minute;
-            second = fullDate.Second;
-        }
-
-        /// <inheritdoc/>
-        public TimeDto(DateTimeOffset fullDate)
-        {
-            hour = fullDate.Hour;
-            minute = fullDate.Minute;
-            second = fullDate.Second;
-        }
-
-        /// <summary>
-        /// Makes System.TimeOnly
-        /// </summary>
-        /// <returns>System.TimeOnly</returns>
-        public TimeOnly MakeTimeOnly() => new(Hour, Minute, Second);
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            var str = $"{Hour:00}:{Minute:00}:{Second:00}";
-            return str;
-        }
-
-        /// <inheritdoc/>
-        public static bool operator ==(TimeDto a, TimeDto b) => a?.TotalSeconds == b?.TotalSeconds;
-
-        /// <inheritdoc/>
-        public static bool operator !=(TimeDto a, TimeDto b) => !(a == b);
-
-        /// <inheritdoc/>
-        public static bool operator <=(TimeDto a, TimeDto b) => a.TotalSeconds <= b.TotalSeconds;
-
-        /// <inheritdoc/>
-        public static bool operator >=(TimeDto a, TimeDto b) => a.TotalSeconds >= b.TotalSeconds;
-
-        /// <inheritdoc/>
-        public static bool operator <(TimeDto a, TimeDto b) => a.TotalSeconds < b.TotalSeconds;
-
-        /// <inheritdoc/>
-        public static bool operator >(TimeDto a, TimeDto b) => a.TotalSeconds > b.TotalSeconds;
-
-        /// <inheritdoc/>
-        public int CompareTo(TimeDto? other)
-            => TotalSeconds - other?.TotalSeconds??0;
-
-        /// <inheritdoc/>
-        public override bool Equals(object? obj)
-        {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null)
-            {
-                return false;
-            }
-
-            if (obj is TimeDto objTime)
-            {
-                return objTime == this;
-            }
-
             return false;
         }
 
-        /// <inheritdoc/>
-        public override int GetHashCode()
+        if (obj is TimeDto objTime)
         {
-            return base.GetHashCode();
+            return objTime == this;
         }
+
+        return false;
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        return base.GetHashCode();
     }
 }
diff --git a/AsbCloudApp/Data/Trajectory/TrajectoryCartesianFactDto.cs b/AsbCloudApp/Data/Trajectory/TrajectoryCartesianFactDto.cs
index 218462db..bff00570 100644
--- a/AsbCloudApp/Data/Trajectory/TrajectoryCartesianFactDto.cs
+++ b/AsbCloudApp/Data/Trajectory/TrajectoryCartesianFactDto.cs
@@ -1,30 +1,29 @@
-namespace AsbCloudApp.Data.Trajectory
+namespace AsbCloudApp.Data.Trajectory;
+
+
+
+/// <summary>
+/// Визуализация траектории 3D
+/// </summary>
+public class TrajectoryCartesianDto
 {
-
+    /// <summary>
+    /// Координаты по оси X, в сторону востока (м)
+    /// </summary>
+    public double X { get; set; }
 
     /// <summary>
-    /// Визуализация траектории 3D
+    /// Координаты по оси Y, в высоту (м)
     /// </summary>
-    public class TrajectoryCartesianDto
-    {
-        /// <summary>
-        /// Координаты по оси X, в сторону востока (м)
-        /// </summary>
-        public double X { get; set; }
-
-        /// <summary>
-        /// Координаты по оси Y, в высоту (м)
-        /// </summary>
-        public double Y { get; set; }
-
-        /// <summary>
-        /// Координаты по оси Z, в сторону юга (м)
-        /// </summary>
-        public double Z { get; set; }
-    }
+    public double Y { get; set; }
 
     /// <summary>
-    /// Визуализация фактической траектории 3D
+    /// Координаты по оси Z, в сторону юга (м)
     /// </summary>
-    public class TrajectoryCartesianFactDto : TrajectoryCartesianDto { }
+    public double Z { get; set; }
 }
+
+/// <summary>
+/// Визуализация фактической траектории 3D
+/// </summary>
+public class TrajectoryCartesianFactDto : TrajectoryCartesianDto { }
diff --git a/AsbCloudApp/Data/Trajectory/TrajectoryCartesianPlanDto.cs b/AsbCloudApp/Data/Trajectory/TrajectoryCartesianPlanDto.cs
index 91096ad6..fc31e9d3 100644
--- a/AsbCloudApp/Data/Trajectory/TrajectoryCartesianPlanDto.cs
+++ b/AsbCloudApp/Data/Trajectory/TrajectoryCartesianPlanDto.cs
@@ -1,18 +1,17 @@
-namespace AsbCloudApp.Data.Trajectory
+namespace AsbCloudApp.Data.Trajectory;
+
+/// <summary>
+/// Визуализация траектории 3D для построения радиуса цели
+/// </summary>
+public class TrajectoryCartesianPlanDto : TrajectoryCartesianFactDto
 {
     /// <summary>
-    /// Визуализация траектории 3D для построения радиуса цели
+    /// радиус цели
     /// </summary>
-    public class TrajectoryCartesianPlanDto : TrajectoryCartesianFactDto
-    {
-        /// <summary>
-        /// радиус цели
-        /// </summary>
-        public double? Radius { get; set; }
+    public double? Radius { get; set; }
 
-        /// <summary>
-        /// комментарий
-        /// </summary>
-        public string? Comment { get; set; }
-    }
+    /// <summary>
+    /// комментарий
+    /// </summary>
+    public string? Comment { get; set; }
 }
diff --git a/AsbCloudApp/Data/Trajectory/TrajectoryGeoDto.cs b/AsbCloudApp/Data/Trajectory/TrajectoryGeoDto.cs
index 2c940043..987fa6ce 100644
--- a/AsbCloudApp/Data/Trajectory/TrajectoryGeoDto.cs
+++ b/AsbCloudApp/Data/Trajectory/TrajectoryGeoDto.cs
@@ -3,60 +3,59 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace AsbCloudApp.Data.Trajectory
+namespace AsbCloudApp.Data.Trajectory;
+
+/// <summary>
+/// Базовая географическая траектория
+/// </summary>
+public abstract class TrajectoryGeoDto : IId, IValidatableObject
 {
     /// <summary>
-    /// Базовая географическая траектория
+    /// ИД строки с координатами
+    /// </summary>        
+    public int Id { get; set; }
+    /// <summary>
+    /// Id скважины
     /// </summary>
-    public abstract class TrajectoryGeoDto : IId, IValidatableObject
+    public int IdWell { get; set; }
+
+    /// <summary>
+    /// Глубина по стволу
+    /// </summary>
+    public double WellboreDepth { get; set; }
+    /// <summary>
+    /// Угол зенитный
+    /// </summary>
+    public double ZenithAngle { get; set; }
+
+    /// <summary>
+    /// Азимут Географ.
+    /// </summary>
+    public double AzimuthGeo { get; set; }
+
+    /// <summary>
+    /// Азимут Магнитный
+    /// </summary>
+    public double? AzimuthMagnetic { get; set; }
+
+    /// <summary>
+    /// Глубина вертикальная
+    /// </summary>
+    public double? VerticalDepth { get; set; }
+
+    /// <summary>
+    /// Дата загрузки
+    /// </summary>
+    public DateTimeOffset UpdateDate { get; set; }
+
+    /// <summary>
+    /// ИД пользователя 
+    /// </summary>
+    public int IdUser { get; set; }
+
+    /// <inheritdoc />
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
-        /// <summary>
-        /// ИД строки с координатами
-        /// </summary>        
-        public int Id { get; set; }
-        /// <summary>
-        /// Id скважины
-        /// </summary>
-        public int IdWell { get; set; }
-
-        /// <summary>
-        /// Глубина по стволу
-        /// </summary>
-        public double WellboreDepth { get; set; }
-        /// <summary>
-        /// Угол зенитный
-        /// </summary>
-        public double ZenithAngle { get; set; }
-
-        /// <summary>
-        /// Азимут Географ.
-        /// </summary>
-        public double AzimuthGeo { get; set; }
-
-        /// <summary>
-        /// Азимут Магнитный
-        /// </summary>
-        public double? AzimuthMagnetic { get; set; }
-
-        /// <summary>
-        /// Глубина вертикальная
-        /// </summary>
-        public double? VerticalDepth { get; set; }
-
-        /// <summary>
-        /// Дата загрузки
-        /// </summary>
-        public DateTimeOffset UpdateDate { get; set; }
-
-        /// <summary>
-        /// ИД пользователя 
-        /// </summary>
-        public int IdUser { get; set; }
-
-        /// <inheritdoc />
-        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
-        {
-            return Enumerable.Empty<ValidationResult>();
-        }
+        return Enumerable.Empty<ValidationResult>();
     }
 }
diff --git a/AsbCloudApp/Data/Trajectory/TrajectoryGeoPlanDto.cs b/AsbCloudApp/Data/Trajectory/TrajectoryGeoPlanDto.cs
index 6730e6db..e13cb2e2 100644
--- a/AsbCloudApp/Data/Trajectory/TrajectoryGeoPlanDto.cs
+++ b/AsbCloudApp/Data/Trajectory/TrajectoryGeoPlanDto.cs
@@ -1,21 +1,20 @@
 using System;
 
-namespace AsbCloudApp.Data.Trajectory
+namespace AsbCloudApp.Data.Trajectory;
+
+/// <summary>
+/// Формирование данных по плановой географической траектории
+/// </summary>
+public class TrajectoryGeoPlanDto : TrajectoryGeoDto
 {
     /// <summary>
-    /// Формирование данных по плановой географической траектории
+    /// Радиус цели
     /// </summary>
-    public class TrajectoryGeoPlanDto : TrajectoryGeoDto
-    {
-        /// <summary>
-        /// Радиус цели
-        /// </summary>
-        public double? Radius { get; set; }
+    public double? Radius { get; set; }
 
-        /// <summary>
-        /// Комментарии
-        /// </summary>        
-        public string? Comment { get; set; }
-    }
+    /// <summary>
+    /// Комментарии
+    /// </summary>        
+    public string? Comment { get; set; }
 }
 
diff --git a/AsbCloudApp/Data/Trajectory/TrajectoryPlanFactDto.cs b/AsbCloudApp/Data/Trajectory/TrajectoryPlanFactDto.cs
index f691fb76..6fc18c7b 100644
--- a/AsbCloudApp/Data/Trajectory/TrajectoryPlanFactDto.cs
+++ b/AsbCloudApp/Data/Trajectory/TrajectoryPlanFactDto.cs
@@ -1,25 +1,24 @@
-namespace AsbCloudApp.Data.Trajectory
+namespace AsbCloudApp.Data.Trajectory;
+
+/// <summary>
+/// DTO объединяющее плановые и фактические значения траекторий
+/// </summary>
+/// <typeparam name="T"></typeparam>
+/// <typeparam name="V"></typeparam>
+public class TrajectoryPlanFactDto<T, V>
 {
     /// <summary>
-    /// DTO объединяющее плановые и фактические значения траекторий
+    /// Плановое значение
     /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <typeparam name="V"></typeparam>
-    public class TrajectoryPlanFactDto<T, V>
-    {
-        /// <summary>
-        /// Плановое значение
-        /// </summary>
-        public T? Plan { get; set; }
+    public T? Plan { get; set; }
 
-        /// <summary>
-        /// Фактическое значение
-        /// </summary>
-        public V? FactManual { get; set; }
+    /// <summary>
+    /// Фактическое значение
+    /// </summary>
+    public V? FactManual { get; set; }
 
-        /// <summary>
-        /// Фактическое ннб-значение
-        /// </summary>
-        public V? FactNnb { get; set; }
-    }
+    /// <summary>
+    /// Фактическое ннб-значение
+    /// </summary>
+    public V? FactNnb { get; set; }
 }
diff --git a/AsbCloudApp/Data/User/UserDto.cs b/AsbCloudApp/Data/User/UserDto.cs
index ce1d6f4a..4ad8934a 100644
--- a/AsbCloudApp/Data/User/UserDto.cs
+++ b/AsbCloudApp/Data/User/UserDto.cs
@@ -1,96 +1,95 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.User
+namespace AsbCloudApp.Data.User;
+
+/// <summary>
+/// DTO пользователя платформы
+/// </summary>
+public class UserDto : IId
 {
+    /// <inheritdoc/>
+    public int Id { get; set; }
+
     /// <summary>
-    /// DTO пользователя платформы
+    /// логин
     /// </summary>
-    public class UserDto : IId
+    [Required(ErrorMessage = "Логин не должен быть пустым")]
+    [StringLength(50, MinimumLength = 3, ErrorMessage = "Допустимая длина логина от 3 до 50 символов")]
+    public string Login { get; set; } = null!;
+
+    /// <summary>
+    /// Имя
+    /// </summary>
+    [StringLength(50, MinimumLength = 0, ErrorMessage = "Допустимая длина имени от 1 до 50 символов")]
+    public string? Name { get; set; }
+
+    /// <summary>
+    /// Фамилия
+    /// </summary>
+    [StringLength(50, MinimumLength = 0, ErrorMessage = "Допустимая длина фамилии от 1 до 50 символов")]
+    public string? Surname { get; set; }
+
+    /// <summary>
+    /// Отчество
+    /// </summary>
+    [StringLength(50, MinimumLength = 0, ErrorMessage = "Допустимая длина отчества от 1 до 50 символов")]
+    public string? Patronymic { get; set; }
+
+    /// <summary>
+    /// Email
+    /// </summary>
+    [Required]
+    [StringLength(260, MinimumLength = 3, ErrorMessage = "Допустимая длина email от 3 до 260 символов")]
+    public string Email { get; set; } = null!;
+
+    /// <summary>
+    /// Phone
+    /// </summary>
+    [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимая длина телефона от 1 до 50 символов")]
+    public string? Phone { get; set; }
+
+    /// <summary>
+    /// Должность
+    /// </summary>
+    [StringLength(100, MinimumLength = 1, ErrorMessage = "Допустимая длина должности от 1 до 100 символов")]
+    public string? Position { get; set; }
+
+    /// <summary>
+    /// Id компании
+    /// </summary>
+    [Required]
+    public int IdCompany { get; set; }
+
+    /// <summary>
+    /// Id состояния пользователя
+    /// 0 - не активен, 
+    /// 1 - активен,
+    /// 2 - заблокирован
+    /// </summary>
+    public short IdState { get; set; }
+
+    /// <summary>
+    /// DTO компании
+    /// </summary>
+    public CompanyDto? Company { get; set; }
+
+    /// <summary>
+    /// Получение отображаемого имени
+    /// </summary>
+    /// <returns></returns>
+    public string MakeDisplayName()
     {
-        /// <inheritdoc/>
-        public int Id { get; set; }
+        if (string.IsNullOrEmpty(Surname))
+            return Login;
 
-        /// <summary>
-        /// логин
-        /// </summary>
-        [Required(ErrorMessage = "Логин не должен быть пустым")]
-        [StringLength(50, MinimumLength = 3, ErrorMessage = "Допустимая длина логина от 3 до 50 символов")]
-        public string Login { get; set; } = null!;
-
-        /// <summary>
-        /// Имя
-        /// </summary>
-        [StringLength(50, MinimumLength = 0, ErrorMessage = "Допустимая длина имени от 1 до 50 символов")]
-        public string? Name { get; set; }
-
-        /// <summary>
-        /// Фамилия
-        /// </summary>
-        [StringLength(50, MinimumLength = 0, ErrorMessage = "Допустимая длина фамилии от 1 до 50 символов")]
-        public string? Surname { get; set; }
-
-        /// <summary>
-        /// Отчество
-        /// </summary>
-        [StringLength(50, MinimumLength = 0, ErrorMessage = "Допустимая длина отчества от 1 до 50 символов")]
-        public string? Patronymic { get; set; }
-
-        /// <summary>
-        /// Email
-        /// </summary>
-        [Required]
-        [StringLength(260, MinimumLength = 3, ErrorMessage = "Допустимая длина email от 3 до 260 символов")]
-        public string Email { get; set; } = null!;
-
-        /// <summary>
-        /// Phone
-        /// </summary>
-        [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимая длина телефона от 1 до 50 символов")]
-        public string? Phone { get; set; }
-
-        /// <summary>
-        /// Должность
-        /// </summary>
-        [StringLength(100, MinimumLength = 1, ErrorMessage = "Допустимая длина должности от 1 до 100 символов")]
-        public string? Position { get; set; }
-
-        /// <summary>
-        /// Id компании
-        /// </summary>
-        [Required]
-        public int IdCompany { get; set; }
-
-        /// <summary>
-        /// Id состояния пользователя
-        /// 0 - не активен, 
-        /// 1 - активен,
-        /// 2 - заблокирован
-        /// </summary>
-        public short IdState { get; set; }
-
-        /// <summary>
-        /// DTO компании
-        /// </summary>
-        public CompanyDto? Company { get; set; }
-
-        /// <summary>
-        /// Получение отображаемого имени
-        /// </summary>
-        /// <returns></returns>
-        public string MakeDisplayName()
+        var s = Surname;
+        if (!string.IsNullOrEmpty(Name))
         {
-            if (string.IsNullOrEmpty(Surname))
-                return Login;
-
-            var s = Surname;
-            if (!string.IsNullOrEmpty(Name))
-            {
-                s += $"{Name[0]}.";
-                if (!string.IsNullOrEmpty(Patronymic))
-                    s += $" {Patronymic[0]}.";
-            }
-
-            return s;
+            s += $"{Name[0]}.";
+            if (!string.IsNullOrEmpty(Patronymic))
+                s += $" {Patronymic[0]}.";
         }
+
+        return s;
     }
 }
diff --git a/AsbCloudApp/Data/User/UserExtendedDto.cs b/AsbCloudApp/Data/User/UserExtendedDto.cs
index 9cec40a6..2ac5e498 100644
--- a/AsbCloudApp/Data/User/UserExtendedDto.cs
+++ b/AsbCloudApp/Data/User/UserExtendedDto.cs
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AsbCloudApp.Data.User
+namespace AsbCloudApp.Data.User;
+
+/// <inheritdoc/>
+public class UserExtendedDto : UserDto
 {
-    /// <inheritdoc/>
-    public class UserExtendedDto : UserDto
-    {
-        /// <summary>
-        /// Роли пользователя
-        /// </summary>
-        public IEnumerable<string> RoleNames { get; set; } = Enumerable.Empty<string>();
-    }
+    /// <summary>
+    /// Роли пользователя
+    /// </summary>
+    public IEnumerable<string> RoleNames { get; set; } = Enumerable.Empty<string>();
 }
diff --git a/AsbCloudApp/Data/User/UserRegistrationDto.cs b/AsbCloudApp/Data/User/UserRegistrationDto.cs
index 26530fa4..403de12f 100644
--- a/AsbCloudApp/Data/User/UserRegistrationDto.cs
+++ b/AsbCloudApp/Data/User/UserRegistrationDto.cs
@@ -1,15 +1,14 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.User
+namespace AsbCloudApp.Data.User;
+
+/// <inheritdoc/>
+public class UserRegistrationDto : UserDto
 {
-    /// <inheritdoc/>
-    public class UserRegistrationDto : UserDto
-    {
-        /// <summary>
-        /// пароль, используется только при регистрации.
-        /// </summary>
-        [Required(ErrorMessage = "Пароль не должен быть пустым")]
-        [StringLength(50, MinimumLength = 3, ErrorMessage = "Допустимая длина пароля от 3 до 50 символов")]
-        public string Password { get; set; } = null!;
-    }
+    /// <summary>
+    /// пароль, используется только при регистрации.
+    /// </summary>
+    [Required(ErrorMessage = "Пароль не должен быть пустым")]
+    [StringLength(50, MinimumLength = 3, ErrorMessage = "Допустимая длина пароля от 3 до 50 символов")]
+    public string Password { get; set; } = null!;
 }
diff --git a/AsbCloudApp/Data/User/UserRoleDto.cs b/AsbCloudApp/Data/User/UserRoleDto.cs
index 68f54434..d78a2d4c 100644
--- a/AsbCloudApp/Data/User/UserRoleDto.cs
+++ b/AsbCloudApp/Data/User/UserRoleDto.cs
@@ -2,36 +2,35 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace AsbCloudApp.Data.User
+namespace AsbCloudApp.Data.User;
+
+/// <summary>
+/// Роль пользователя платформы
+/// </summary>
+public class UserRoleDto : IId
 {
+    /// <inheritdoc/>
+    public int Id { get; set; }
+
     /// <summary>
-    /// Роль пользователя платформы
+    /// название
     /// </summary>
-    public class UserRoleDto : IId
-    {
-        /// <inheritdoc/>
-        public int Id { get; set; }
+    [Required]
+    [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимая длина названия роли от 1 до 50 символов")]
+    public string Caption { get; set; } = null!;
 
-        /// <summary>
-        /// название
-        /// </summary>
-        [Required]
-        [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимая длина названия роли от 1 до 50 символов")]
-        public string Caption { get; set; } = null!;
+    /// <summary>
+    /// id типа роли
+    /// </summary>
+    public int IdType { get; set; }
 
-        /// <summary>
-        /// id типа роли
-        /// </summary>
-        public int IdType { get; set; }
+    /// <summary>
+    /// список разрешений
+    /// </summary>
+    public IEnumerable<PermissionDto> Permissions { get; set; } = Enumerable.Empty<PermissionDto>();
 
-        /// <summary>
-        /// список разрешений
-        /// </summary>
-        public IEnumerable<PermissionDto> Permissions { get; set; } = Enumerable.Empty<PermissionDto>();
-
-        /// <summary>
-        /// Включенные роли
-        /// </summary>
-        public virtual IEnumerable<UserRoleDto> Roles { get; set; } = Enumerable.Empty<UserRoleDto>();
-    }
+    /// <summary>
+    /// Включенные роли
+    /// </summary>
+    public virtual IEnumerable<UserRoleDto> Roles { get; set; } = Enumerable.Empty<UserRoleDto>();
 }
diff --git a/AsbCloudApp/Data/User/UserTokenDto.cs b/AsbCloudApp/Data/User/UserTokenDto.cs
index e11a1f8f..ca91f3a6 100644
--- a/AsbCloudApp/Data/User/UserTokenDto.cs
+++ b/AsbCloudApp/Data/User/UserTokenDto.cs
@@ -1,19 +1,18 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AsbCloudApp.Data.User
-{
-    /// <inheritdoc/>
-    public class UserTokenDto : UserExtendedDto
-    {
-        /// <summary>
-        /// все разрешения пользователя
-        /// </summary>
-        public IEnumerable<PermissionDto> Permissions { get; set; } = Enumerable.Empty<PermissionDto>();
+namespace AsbCloudApp.Data.User;
 
-        /// <summary>
-        /// bearer token (для работы с web-api)
-        /// </summary>
-        public string Token { get; set; } = null!;
-    }
+/// <inheritdoc/>
+public class UserTokenDto : UserExtendedDto
+{
+    /// <summary>
+    /// все разрешения пользователя
+    /// </summary>
+    public IEnumerable<PermissionDto> Permissions { get; set; } = Enumerable.Empty<PermissionDto>();
+
+    /// <summary>
+    /// bearer token (для работы с web-api)
+    /// </summary>
+    public string Token { get; set; } = null!;
 }
diff --git a/AsbCloudApp/Data/WITS/Record1Dto.cs b/AsbCloudApp/Data/WITS/Record1Dto.cs
index 28a0aaa2..0d0fa162 100644
--- a/AsbCloudApp/Data/WITS/Record1Dto.cs
+++ b/AsbCloudApp/Data/WITS/Record1Dto.cs
@@ -1,582 +1,581 @@
-namespace AsbCloudApp.Data.WITS
+namespace AsbCloudApp.Data.WITS;
+
+/// <summary>
+/// Record name: General Time-Based
+/// Description: Drilling data gathered at regular time intervals
+/// </summary>
+
+public class Record1Dto : RecordBaseDto
 {
+
     /// <summary>
-    /// Record name: General Time-Based
-    /// Description: Drilling data gathered at regular time intervals
+    /// RecordId = 1,
+    /// ItemId = 8,
+    /// LongMnemonic = "DEPTBITM",
+    /// ShortMnemonic = "DBTM",
+    /// Description = "Depth Bit (meas)",
+    /// Description2 = "Code indicating what activity is currently being performed on the rig. IT IS ESSENTIAL that this information be as accurate and current as possible. Acceptable codes are shown here",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
     /// </summary>
 
-    public class Record1Dto : RecordBaseDto
-    {
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 8,
-        /// LongMnemonic = "DEPTBITM",
-        /// ShortMnemonic = "DBTM",
-        /// Description = "Depth Bit (meas)",
-        /// Description2 = "Code indicating what activity is currently being performed on the rig. IT IS ESSENTIAL that this information be as accurate and current as possible. Acceptable codes are shown here",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptbitm { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 9,
-        /// LongMnemonic = "DEPTBITV",
-        /// ShortMnemonic = "DBTV",
-        /// Description = "Depth Bit (vert)",
-        /// Description2 = "Measured depth of the bit at the time the record is generated. This is the measured depth of the shoe when running casing or liner.",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptbitv { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 10,
-        /// LongMnemonic = "DEPTMEAS",
-        /// ShortMnemonic = "DMEA",
-        /// Description = "Depth Hole (meas)",
-        /// Description2 = "Vertical depth of the bit at the time the record is generated. This is the vertical depth of the shoe when running casing or liner.",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptmeas { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 11,
-        /// LongMnemonic = "DEPTVERT",
-        /// ShortMnemonic = "DVER",
-        /// Description = "Depth Hole (vet)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptvert { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 12,
-        /// LongMnemonic = "BLKPOS",
-        /// ShortMnemonic = "BPOS",
-        /// Description = "Block Position",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Blkpos { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 13,
-        /// LongMnemonic = "ROPA",
-        /// ShortMnemonic = "ROPA",
-        /// Description = "Rate of Penetration (avg)",
-        /// Description2 = "",
-        /// FPSUnits = "F/HR",
-        /// MetricUnits = "M/HR",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Ropa { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 14,
-        /// LongMnemonic = "HKLA",
-        /// ShortMnemonic = "HKLA",
-        /// Description = "Hook-load (avg)",
-        /// Description2 = "",
-        /// FPSUnits = "KLB",
-        /// MetricUnits = "KDN",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Hkla { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 15,
-        /// LongMnemonic = "HKLX",
-        /// ShortMnemonic = "HKLX",
-        /// Description = "Hook-load (max)",
-        /// Description2 = "",
-        /// FPSUnits = "KLB",
-        /// MetricUnits = "KDN",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Hklx { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 16,
-        /// LongMnemonic = "WOBA",
-        /// ShortMnemonic = "WOBA",
-        /// Description = "Weight-on-Bit (surf,avg)",
-        /// Description2 = "",
-        /// FPSUnits = "KLB",
-        /// MetricUnits = "KDN",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Woba { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 17,
-        /// LongMnemonic = "WOBX",
-        /// ShortMnemonic = "WOBX",
-        /// Description = "Weight-on-Bit (surf,max)",
-        /// Description2 = "",
-        /// FPSUnits = "KLB",
-        /// MetricUnits = "KDN",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Wobx { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 18,
-        /// LongMnemonic = "TORQA",
-        /// ShortMnemonic = "TQA",
-        /// Description = "Rotary Torque (surf,avg)",
-        /// Description2 = "",
-        /// FPSUnits = "KFLB",
-        /// MetricUnits = "KNM",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Torqa { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 19,
-        /// LongMnemonic = "TORQX",
-        /// ShortMnemonic = "TQX",
-        /// Description = "Rotary Torque (surf,max)",
-        /// Description2 = "",
-        /// FPSUnits = "KFLB",
-        /// MetricUnits = "KNM",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Torqx { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 20,
-        /// LongMnemonic = "RPMA",
-        /// ShortMnemonic = "RPMA",
-        /// Description = "Rotary Speed (surf,avg)",
-        /// Description2 = "",
-        /// FPSUnits = "RPM",
-        /// MetricUnits = "RPM",
-        /// Length = 2,
-        /// ValueType = "S"
-        /// </summary>
-
-        public short? Rpma { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 21,
-        /// LongMnemonic = "SPPA",
-        /// ShortMnemonic = "SPPA",
-        /// Description = "Standpipe Pressure (avg)",
-        /// Description2 = "",
-        /// FPSUnits = "PSI",
-        /// MetricUnits = "KPA",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Sppa { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 22,
-        /// LongMnemonic = "CHKP",
-        /// ShortMnemonic = "CHKP",
-        /// Description = "Casing (Choke) Pressure",
-        /// Description2 = "",
-        /// FPSUnits = "PSI",
-        /// MetricUnits = "KPA",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Chkp { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 23,
-        /// LongMnemonic = "SPM1",
-        /// ShortMnemonic = "SPM1",
-        /// Description = "Pump Stroke Rate #1",
-        /// Description2 = "",
-        /// FPSUnits = "SPM",
-        /// MetricUnits = "SPM",
-        /// Length = 2,
-        /// ValueType = "S"
-        /// </summary>
-
-        public short? Spm1 { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 24,
-        /// LongMnemonic = "SPM2",
-        /// ShortMnemonic = "SPM2",
-        /// Description = "Pump Stroke Rate #2",
-        /// Description2 = "",
-        /// FPSUnits = "SPM",
-        /// MetricUnits = "SPM",
-        /// Length = 2,
-        /// ValueType = "S"
-        /// </summary>
-
-        public short? Spm2 { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 25,
-        /// LongMnemonic = "SPM3",
-        /// ShortMnemonic = "SPM3",
-        /// Description = "Pump Stroke Rate #3",
-        /// Description2 = "",
-        /// FPSUnits = "SPM",
-        /// MetricUnits = "SPM",
-        /// Length = 2,
-        /// ValueType = "S"
-        /// </summary>
-
-        public short? Spm3 { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 26,
-        /// LongMnemonic = "TVOLACT",
-        /// ShortMnemonic = "TVA",
-        /// Description = "Tank Volume (active)",
-        /// Description2 = "",
-        /// FPSUnits = "BBL",
-        /// MetricUnits = "M3",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Tvolact { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 27,
-        /// LongMnemonic = "TVOLCACT",
-        /// ShortMnemonic = "TVCA",
-        /// Description = "Tank Volume Change (act)",
-        /// Description2 = "",
-        /// FPSUnits = "BBL",
-        /// MetricUnits = "M3",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Tvolcact { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 28,
-        /// LongMnemonic = "MFOP",
-        /// ShortMnemonic = "MFOP",
-        /// Description = "Mud Flow Out %",
-        /// Description2 = "",
-        /// FPSUnits = "%",
-        /// MetricUnits = "%",
-        /// Length = 2,
-        /// ValueType = "S"
-        /// </summary>
-
-        public short? Mfop { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 29,
-        /// LongMnemonic = "MFOA",
-        /// ShortMnemonic = "MFOA",
-        /// Description = "Mud Flow Out (avg)",
-        /// Description2 = "",
-        /// FPSUnits = "GPM",
-        /// MetricUnits = "L/M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mfoa { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 30,
-        /// LongMnemonic = "MFIA",
-        /// ShortMnemonic = "MFIA",
-        /// Description = "Mud Flow In (avg)",
-        /// Description2 = "",
-        /// FPSUnits = "GPM",
-        /// MetricUnits = "L/M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mfia { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 31,
-        /// LongMnemonic = "MDOA",
-        /// ShortMnemonic = "MDOA",
-        /// Description = "Mud Density Out (avg)",
-        /// Description2 = "",
-        /// FPSUnits = "PPG",
-        /// MetricUnits = "KGM3",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mdoa { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 32,
-        /// LongMnemonic = "MDIA",
-        /// ShortMnemonic = "MDIA",
-        /// Description = "Mud Density In (avg)",
-        /// Description2 = "",
-        /// FPSUnits = "PPG",
-        /// MetricUnits = "KGM3",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mdia { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 33,
-        /// LongMnemonic = "MTOA",
-        /// ShortMnemonic = "MTOA",
-        /// Description = "Mud Temperature Out (avg)",
-        /// Description2 = "",
-        /// FPSUnits = "DEGF",
-        /// MetricUnits = "DEGC",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mtoa { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 34,
-        /// LongMnemonic = "MTIA",
-        /// ShortMnemonic = "MTIA",
-        /// Description = "Mud Temperature In (avg)",
-        /// Description2 = "",
-        /// FPSUnits = "DEGF",
-        /// MetricUnits = "DEGC",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mtia { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 35,
-        /// LongMnemonic = "MCOA",
-        /// ShortMnemonic = "MCOA",
-        /// Description = "Mud Conductivity Out (avg)",
-        /// Description2 = "",
-        /// FPSUnits = "MMHO",
-        /// MetricUnits = "MMHO",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mcoa { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 36,
-        /// LongMnemonic = "MCIA",
-        /// ShortMnemonic = "MCIA",
-        /// Description = "Mud Conductivity In (avg)",
-        /// Description2 = "",
-        /// FPSUnits = "MMHO",
-        /// MetricUnits = "MMHO",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mcia { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 37,
-        /// LongMnemonic = "STKC",
-        /// ShortMnemonic = "STKC",
-        /// Description = "Pump Stroke Count (cum)",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "L"
-        /// </summary>
-
-        public int? Stkc { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 38,
-        /// LongMnemonic = "LAGSTKS",
-        /// ShortMnemonic = "LSTK",
-        /// Description = "Lag Strokes",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 2,
-        /// ValueType = "S"
-        /// </summary>
-
-        public short? Lagstks { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 39,
-        /// LongMnemonic = "DEPTRETM",
-        /// ShortMnemonic = "DRTM",
-        /// Description = "Depth Returns (meas)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptretm { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 40,
-        /// LongMnemonic = "GASA",
-        /// ShortMnemonic = "GASA",
-        /// Description = "Gas (avg)",
-        /// Description2 = "",
-        /// FPSUnits = "%",
-        /// MetricUnits = "%",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Gasa { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 41,
-        /// LongMnemonic = "SPARE1",
-        /// ShortMnemonic = "SPR1",
-        /// Description = "SPARE 1",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare1 { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 42,
-        /// LongMnemonic = "SPARE2",
-        /// ShortMnemonic = "SPR2",
-        /// Description = "SPARE 2",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare2 { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 43,
-        /// LongMnemonic = "SPARE3",
-        /// ShortMnemonic = "SPR3",
-        /// Description = "SPARE 3",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare3 { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 44,
-        /// LongMnemonic = "SPARE4",
-        /// ShortMnemonic = "SPR4",
-        /// Description = "SPARE 4",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare4 { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 45,
-        /// LongMnemonic = "SPARE5",
-        /// ShortMnemonic = "SPR5",
-        /// Description = "SPARE 5",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare5 { get; set; }
-
-    }
+    public float? Deptbitm { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 9,
+    /// LongMnemonic = "DEPTBITV",
+    /// ShortMnemonic = "DBTV",
+    /// Description = "Depth Bit (vert)",
+    /// Description2 = "Measured depth of the bit at the time the record is generated. This is the measured depth of the shoe when running casing or liner.",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptbitv { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 10,
+    /// LongMnemonic = "DEPTMEAS",
+    /// ShortMnemonic = "DMEA",
+    /// Description = "Depth Hole (meas)",
+    /// Description2 = "Vertical depth of the bit at the time the record is generated. This is the vertical depth of the shoe when running casing or liner.",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptmeas { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 11,
+    /// LongMnemonic = "DEPTVERT",
+    /// ShortMnemonic = "DVER",
+    /// Description = "Depth Hole (vet)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptvert { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 12,
+    /// LongMnemonic = "BLKPOS",
+    /// ShortMnemonic = "BPOS",
+    /// Description = "Block Position",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Blkpos { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 13,
+    /// LongMnemonic = "ROPA",
+    /// ShortMnemonic = "ROPA",
+    /// Description = "Rate of Penetration (avg)",
+    /// Description2 = "",
+    /// FPSUnits = "F/HR",
+    /// MetricUnits = "M/HR",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Ropa { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 14,
+    /// LongMnemonic = "HKLA",
+    /// ShortMnemonic = "HKLA",
+    /// Description = "Hook-load (avg)",
+    /// Description2 = "",
+    /// FPSUnits = "KLB",
+    /// MetricUnits = "KDN",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Hkla { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 15,
+    /// LongMnemonic = "HKLX",
+    /// ShortMnemonic = "HKLX",
+    /// Description = "Hook-load (max)",
+    /// Description2 = "",
+    /// FPSUnits = "KLB",
+    /// MetricUnits = "KDN",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Hklx { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 16,
+    /// LongMnemonic = "WOBA",
+    /// ShortMnemonic = "WOBA",
+    /// Description = "Weight-on-Bit (surf,avg)",
+    /// Description2 = "",
+    /// FPSUnits = "KLB",
+    /// MetricUnits = "KDN",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Woba { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 17,
+    /// LongMnemonic = "WOBX",
+    /// ShortMnemonic = "WOBX",
+    /// Description = "Weight-on-Bit (surf,max)",
+    /// Description2 = "",
+    /// FPSUnits = "KLB",
+    /// MetricUnits = "KDN",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Wobx { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 18,
+    /// LongMnemonic = "TORQA",
+    /// ShortMnemonic = "TQA",
+    /// Description = "Rotary Torque (surf,avg)",
+    /// Description2 = "",
+    /// FPSUnits = "KFLB",
+    /// MetricUnits = "KNM",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Torqa { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 19,
+    /// LongMnemonic = "TORQX",
+    /// ShortMnemonic = "TQX",
+    /// Description = "Rotary Torque (surf,max)",
+    /// Description2 = "",
+    /// FPSUnits = "KFLB",
+    /// MetricUnits = "KNM",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Torqx { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 20,
+    /// LongMnemonic = "RPMA",
+    /// ShortMnemonic = "RPMA",
+    /// Description = "Rotary Speed (surf,avg)",
+    /// Description2 = "",
+    /// FPSUnits = "RPM",
+    /// MetricUnits = "RPM",
+    /// Length = 2,
+    /// ValueType = "S"
+    /// </summary>
+
+    public short? Rpma { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 21,
+    /// LongMnemonic = "SPPA",
+    /// ShortMnemonic = "SPPA",
+    /// Description = "Standpipe Pressure (avg)",
+    /// Description2 = "",
+    /// FPSUnits = "PSI",
+    /// MetricUnits = "KPA",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Sppa { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 22,
+    /// LongMnemonic = "CHKP",
+    /// ShortMnemonic = "CHKP",
+    /// Description = "Casing (Choke) Pressure",
+    /// Description2 = "",
+    /// FPSUnits = "PSI",
+    /// MetricUnits = "KPA",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Chkp { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 23,
+    /// LongMnemonic = "SPM1",
+    /// ShortMnemonic = "SPM1",
+    /// Description = "Pump Stroke Rate #1",
+    /// Description2 = "",
+    /// FPSUnits = "SPM",
+    /// MetricUnits = "SPM",
+    /// Length = 2,
+    /// ValueType = "S"
+    /// </summary>
+
+    public short? Spm1 { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 24,
+    /// LongMnemonic = "SPM2",
+    /// ShortMnemonic = "SPM2",
+    /// Description = "Pump Stroke Rate #2",
+    /// Description2 = "",
+    /// FPSUnits = "SPM",
+    /// MetricUnits = "SPM",
+    /// Length = 2,
+    /// ValueType = "S"
+    /// </summary>
+
+    public short? Spm2 { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 25,
+    /// LongMnemonic = "SPM3",
+    /// ShortMnemonic = "SPM3",
+    /// Description = "Pump Stroke Rate #3",
+    /// Description2 = "",
+    /// FPSUnits = "SPM",
+    /// MetricUnits = "SPM",
+    /// Length = 2,
+    /// ValueType = "S"
+    /// </summary>
+
+    public short? Spm3 { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 26,
+    /// LongMnemonic = "TVOLACT",
+    /// ShortMnemonic = "TVA",
+    /// Description = "Tank Volume (active)",
+    /// Description2 = "",
+    /// FPSUnits = "BBL",
+    /// MetricUnits = "M3",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Tvolact { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 27,
+    /// LongMnemonic = "TVOLCACT",
+    /// ShortMnemonic = "TVCA",
+    /// Description = "Tank Volume Change (act)",
+    /// Description2 = "",
+    /// FPSUnits = "BBL",
+    /// MetricUnits = "M3",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Tvolcact { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 28,
+    /// LongMnemonic = "MFOP",
+    /// ShortMnemonic = "MFOP",
+    /// Description = "Mud Flow Out %",
+    /// Description2 = "",
+    /// FPSUnits = "%",
+    /// MetricUnits = "%",
+    /// Length = 2,
+    /// ValueType = "S"
+    /// </summary>
+
+    public short? Mfop { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 29,
+    /// LongMnemonic = "MFOA",
+    /// ShortMnemonic = "MFOA",
+    /// Description = "Mud Flow Out (avg)",
+    /// Description2 = "",
+    /// FPSUnits = "GPM",
+    /// MetricUnits = "L/M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mfoa { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 30,
+    /// LongMnemonic = "MFIA",
+    /// ShortMnemonic = "MFIA",
+    /// Description = "Mud Flow In (avg)",
+    /// Description2 = "",
+    /// FPSUnits = "GPM",
+    /// MetricUnits = "L/M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mfia { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 31,
+    /// LongMnemonic = "MDOA",
+    /// ShortMnemonic = "MDOA",
+    /// Description = "Mud Density Out (avg)",
+    /// Description2 = "",
+    /// FPSUnits = "PPG",
+    /// MetricUnits = "KGM3",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mdoa { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 32,
+    /// LongMnemonic = "MDIA",
+    /// ShortMnemonic = "MDIA",
+    /// Description = "Mud Density In (avg)",
+    /// Description2 = "",
+    /// FPSUnits = "PPG",
+    /// MetricUnits = "KGM3",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mdia { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 33,
+    /// LongMnemonic = "MTOA",
+    /// ShortMnemonic = "MTOA",
+    /// Description = "Mud Temperature Out (avg)",
+    /// Description2 = "",
+    /// FPSUnits = "DEGF",
+    /// MetricUnits = "DEGC",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mtoa { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 34,
+    /// LongMnemonic = "MTIA",
+    /// ShortMnemonic = "MTIA",
+    /// Description = "Mud Temperature In (avg)",
+    /// Description2 = "",
+    /// FPSUnits = "DEGF",
+    /// MetricUnits = "DEGC",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mtia { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 35,
+    /// LongMnemonic = "MCOA",
+    /// ShortMnemonic = "MCOA",
+    /// Description = "Mud Conductivity Out (avg)",
+    /// Description2 = "",
+    /// FPSUnits = "MMHO",
+    /// MetricUnits = "MMHO",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mcoa { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 36,
+    /// LongMnemonic = "MCIA",
+    /// ShortMnemonic = "MCIA",
+    /// Description = "Mud Conductivity In (avg)",
+    /// Description2 = "",
+    /// FPSUnits = "MMHO",
+    /// MetricUnits = "MMHO",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mcia { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 37,
+    /// LongMnemonic = "STKC",
+    /// ShortMnemonic = "STKC",
+    /// Description = "Pump Stroke Count (cum)",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "L"
+    /// </summary>
+
+    public int? Stkc { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 38,
+    /// LongMnemonic = "LAGSTKS",
+    /// ShortMnemonic = "LSTK",
+    /// Description = "Lag Strokes",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 2,
+    /// ValueType = "S"
+    /// </summary>
+
+    public short? Lagstks { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 39,
+    /// LongMnemonic = "DEPTRETM",
+    /// ShortMnemonic = "DRTM",
+    /// Description = "Depth Returns (meas)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptretm { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 40,
+    /// LongMnemonic = "GASA",
+    /// ShortMnemonic = "GASA",
+    /// Description = "Gas (avg)",
+    /// Description2 = "",
+    /// FPSUnits = "%",
+    /// MetricUnits = "%",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Gasa { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 41,
+    /// LongMnemonic = "SPARE1",
+    /// ShortMnemonic = "SPR1",
+    /// Description = "SPARE 1",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare1 { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 42,
+    /// LongMnemonic = "SPARE2",
+    /// ShortMnemonic = "SPR2",
+    /// Description = "SPARE 2",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare2 { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 43,
+    /// LongMnemonic = "SPARE3",
+    /// ShortMnemonic = "SPR3",
+    /// Description = "SPARE 3",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare3 { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 44,
+    /// LongMnemonic = "SPARE4",
+    /// ShortMnemonic = "SPR4",
+    /// Description = "SPARE 4",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare4 { get; set; }
+
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 45,
+    /// LongMnemonic = "SPARE5",
+    /// ShortMnemonic = "SPR5",
+    /// Description = "SPARE 5",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare5 { get; set; }
+
 }
diff --git a/AsbCloudApp/Data/WITS/Record50Dto.cs b/AsbCloudApp/Data/WITS/Record50Dto.cs
index c72fa154..a7d848d5 100644
--- a/AsbCloudApp/Data/WITS/Record50Dto.cs
+++ b/AsbCloudApp/Data/WITS/Record50Dto.cs
@@ -1,298 +1,297 @@
-namespace AsbCloudApp.Data.WITS
+namespace AsbCloudApp.Data.WITS;
+
+/// <summary>
+/// Record name: Резистивиметр MCR
+/// Description: SibReciver. Резистивиметр MCR
+/// Description2: 
+/// </summary>
+
+public class Record50Dto : RecordBaseDto
 {
+
     /// <summary>
-    /// Record name: Резистивиметр MCR
-    /// Description: SibReciver. Резистивиметр MCR
-    /// Description2: 
+    /// RecordId = 50,
+    /// ItemId = 8,
+    /// LongMnemonic = "DEPTBITM",
+    /// ShortMnemonic = "DBTM",
+    /// Description = "SibReceiver custom. Положение долота",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
     /// </summary>
 
-    public class Record50Dto : RecordBaseDto
-    {
+    public float? Deptbitm { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 8,
-        /// LongMnemonic = "DEPTBITM",
-        /// ShortMnemonic = "DBTM",
-        /// Description = "SibReceiver custom. Положение долота",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 10,
+    /// LongMnemonic = "DEPTMEAS_MCRSTAT",
+    /// ShortMnemonic = "DEPTMEAS_MCRSTAT",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Deptbitm { get; set; }
+    public float? DeptmeasMcrstat { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 10,
-        /// LongMnemonic = "DEPTMEAS_MCRSTAT",
-        /// ShortMnemonic = "DEPTMEAS_MCRSTAT",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 11,
+    /// LongMnemonic = "MCRSTAT",
+    /// ShortMnemonic = "MCRSTAT",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? DeptmeasMcrstat { get; set; }
+    public float? Mcrstat { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 11,
-        /// LongMnemonic = "MCRSTAT",
-        /// ShortMnemonic = "MCRSTAT",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 12,
+    /// LongMnemonic = "DEPTMEAS_SLVL_mc",
+    /// ShortMnemonic = "DEPTMEAS_SLVL_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Mcrstat { get; set; }
+    public float? DeptmeasSlvlMc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 12,
-        /// LongMnemonic = "DEPTMEAS_SLVL_mc",
-        /// ShortMnemonic = "DEPTMEAS_SLVL_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 13,
+    /// LongMnemonic = "SLVL_mc",
+    /// ShortMnemonic = "SLVL_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? DeptmeasSlvlMc { get; set; }
+    public float? SlvlMc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 13,
-        /// LongMnemonic = "SLVL_mc",
-        /// ShortMnemonic = "SLVL_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 14,
+    /// LongMnemonic = "DEPTMEAS_GDP_mc",
+    /// ShortMnemonic = "DEPTMEAS_GDP_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? SlvlMc { get; set; }
+    public float? DeptmeasGdpMc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 14,
-        /// LongMnemonic = "DEPTMEAS_GDP_mc",
-        /// ShortMnemonic = "DEPTMEAS_GDP_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 15,
+    /// LongMnemonic = "GDP_mc",
+    /// ShortMnemonic = "GDP_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? DeptmeasGdpMc { get; set; }
+    public float? GdpMc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 15,
-        /// LongMnemonic = "GDP_mc",
-        /// ShortMnemonic = "GDP_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 16,
+    /// LongMnemonic = "DEPTMEAS_RA33F2_mc",
+    /// ShortMnemonic = "DEPTMEAS_RA33F2_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? GdpMc { get; set; }
+    public float? DeptmeasRa33f2Mc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 16,
-        /// LongMnemonic = "DEPTMEAS_RA33F2_mc",
-        /// ShortMnemonic = "DEPTMEAS_RA33F2_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 17,
+    /// LongMnemonic = "RA33F2_mc",
+    /// ShortMnemonic = "RA33F2_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? DeptmeasRa33f2Mc { get; set; }
+    public float? Ra33f2Mc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 17,
-        /// LongMnemonic = "RA33F2_mc",
-        /// ShortMnemonic = "RA33F2_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 18,
+    /// LongMnemonic = "DEPTMEAS_RP33F2_mc",
+    /// ShortMnemonic = "DEPTMEAS_RP33F2_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Ra33f2Mc { get; set; }
+    public float? DeptmeasRp33f2Mc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 18,
-        /// LongMnemonic = "DEPTMEAS_RP33F2_mc",
-        /// ShortMnemonic = "DEPTMEAS_RP33F2_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 19,
+    /// LongMnemonic = "RP33F2_mc",
+    /// ShortMnemonic = "RP33F2_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? DeptmeasRp33f2Mc { get; set; }
+    public float? Rp33f2Mc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 19,
-        /// LongMnemonic = "RP33F2_mc",
-        /// ShortMnemonic = "RP33F2_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 20,
+    /// LongMnemonic = "DEPTMEAS_RA33F4_mc",
+    /// ShortMnemonic = "DEPTMEAS_RA33F4_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Rp33f2Mc { get; set; }
+    public float? DeptmeasRa33f4Mc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 20,
-        /// LongMnemonic = "DEPTMEAS_RA33F4_mc",
-        /// ShortMnemonic = "DEPTMEAS_RA33F4_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 21,
+    /// LongMnemonic = "RA33F4_mc",
+    /// ShortMnemonic = "RA33F4_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? DeptmeasRa33f4Mc { get; set; }
+    public float? Ra33f4Mc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 21,
-        /// LongMnemonic = "RA33F4_mc",
-        /// ShortMnemonic = "RA33F4_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 22,
+    /// LongMnemonic = "DEPTMEAS_RP33F4_mc",
+    /// ShortMnemonic = "DEPTMEAS_RP33F4_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Ra33f4Mc { get; set; }
+    public float? DeptmeasRp33f4Mc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 22,
-        /// LongMnemonic = "DEPTMEAS_RP33F4_mc",
-        /// ShortMnemonic = "DEPTMEAS_RP33F4_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 23,
+    /// LongMnemonic = "RP33F4_mc",
+    /// ShortMnemonic = "RP33F4_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? DeptmeasRp33f4Mc { get; set; }
+    public float? Rp33f4Mc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 23,
-        /// LongMnemonic = "RP33F4_mc",
-        /// ShortMnemonic = "RP33F4_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 46,
+    /// LongMnemonic = "DEPTMEAS_RA33_mc",
+    /// ShortMnemonic = "DEPTMEAS_RA33_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Rp33f4Mc { get; set; }
+    public float? DeptmeasRa33Mc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 46,
-        /// LongMnemonic = "DEPTMEAS_RA33_mc",
-        /// ShortMnemonic = "DEPTMEAS_RA33_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 47,
+    /// LongMnemonic = "RA33_mc",
+    /// ShortMnemonic = "RA33_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? DeptmeasRa33Mc { get; set; }
+    public float? Ra33Mc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 47,
-        /// LongMnemonic = "RA33_mc",
-        /// ShortMnemonic = "RA33_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 28,
+    /// LongMnemonic = "DEPTMEAS_RP33_mc",
+    /// ShortMnemonic = "DEPTMEAS_RP33_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Ra33Mc { get; set; }
+    public float? DeptmeasRp33Mc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 28,
-        /// LongMnemonic = "DEPTMEAS_RP33_mc",
-        /// ShortMnemonic = "DEPTMEAS_RP33_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 50,
+    /// ItemId = 29,
+    /// LongMnemonic = "RP33_mc",
+    /// ShortMnemonic = "RP33_mc",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? DeptmeasRp33Mc { get; set; }
+    public float? Rp33Mc { get; set; }
 
-        /// <summary>
-        /// RecordId = 50,
-        /// ItemId = 29,
-        /// LongMnemonic = "RP33_mc",
-        /// ShortMnemonic = "RP33_mc",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Rp33Mc { get; set; }
-
-    }
 }
diff --git a/AsbCloudApp/Data/WITS/Record60Dto.cs b/AsbCloudApp/Data/WITS/Record60Dto.cs
index 19dc5338..0387cbeb 100644
--- a/AsbCloudApp/Data/WITS/Record60Dto.cs
+++ b/AsbCloudApp/Data/WITS/Record60Dto.cs
@@ -1,163 +1,162 @@
-namespace AsbCloudApp.Data.WITS
+namespace AsbCloudApp.Data.WITS;
+
+/// <summary>
+/// Record name: Передача полных
+/// Description: SibReciver. Передача полных
+/// Description2: 
+/// </summary>
+
+public class Record60Dto : RecordBaseDto
 {
+
     /// <summary>
-    /// Record name: Передача полных
-    /// Description: SibReciver. Передача полных
-    /// Description2: 
+    /// RecordId = 60,
+    /// ItemId = 99,
+    /// LongMnemonic = "DEPTBITM",
+    /// ShortMnemonic = "DBTM",
+    /// Description = "SibReceiver custom. Положение долота",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
     /// </summary>
 
-    public class Record60Dto : RecordBaseDto
-    {
+    public float? Deptbitm { get; set; }
 
-        /// <summary>
-        /// RecordId = 60,
-        /// ItemId = 99,
-        /// LongMnemonic = "DEPTBITM",
-        /// ShortMnemonic = "DBTM",
-        /// Description = "SibReceiver custom. Положение долота",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 60,
+    /// ItemId = 10,
+    /// LongMnemonic = "DEPTMEAS",
+    /// ShortMnemonic = "DMEA",
+    /// Description = "SibReceiver custom. Точка Замера",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Deptbitm { get; set; }
+    public float? Deptmeas { get; set; }
 
-        /// <summary>
-        /// RecordId = 60,
-        /// ItemId = 10,
-        /// LongMnemonic = "DEPTMEAS",
-        /// ShortMnemonic = "DMEA",
-        /// Description = "SibReceiver custom. Точка Замера",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 60,
+    /// ItemId = 11,
+    /// LongMnemonic = "Gtot",
+    /// ShortMnemonic = "Gtot",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Deptmeas { get; set; }
+    public float? Gtot { get; set; }
 
-        /// <summary>
-        /// RecordId = 60,
-        /// ItemId = 11,
-        /// LongMnemonic = "Gtot",
-        /// ShortMnemonic = "Gtot",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 60,
+    /// ItemId = 12,
+    /// LongMnemonic = "Gx",
+    /// ShortMnemonic = "Gx",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Gtot { get; set; }
+    public float? Gx { get; set; }
 
-        /// <summary>
-        /// RecordId = 60,
-        /// ItemId = 12,
-        /// LongMnemonic = "Gx",
-        /// ShortMnemonic = "Gx",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 60,
+    /// ItemId = 13,
+    /// LongMnemonic = "Gy",
+    /// ShortMnemonic = "Gy",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Gx { get; set; }
+    public float? Gy { get; set; }
 
-        /// <summary>
-        /// RecordId = 60,
-        /// ItemId = 13,
-        /// LongMnemonic = "Gy",
-        /// ShortMnemonic = "Gy",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 60,
+    /// ItemId = 14,
+    /// LongMnemonic = "Gz",
+    /// ShortMnemonic = "Gz",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Gy { get; set; }
+    public float? Gz { get; set; }
 
-        /// <summary>
-        /// RecordId = 60,
-        /// ItemId = 14,
-        /// LongMnemonic = "Gz",
-        /// ShortMnemonic = "Gz",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 60,
+    /// ItemId = 15,
+    /// LongMnemonic = "Btot",
+    /// ShortMnemonic = "Btot",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Gz { get; set; }
+    public float? Btot { get; set; }
 
-        /// <summary>
-        /// RecordId = 60,
-        /// ItemId = 15,
-        /// LongMnemonic = "Btot",
-        /// ShortMnemonic = "Btot",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 60,
+    /// ItemId = 16,
+    /// LongMnemonic = "Bx",
+    /// ShortMnemonic = "Bx",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Btot { get; set; }
+    public float? Bx { get; set; }
 
-        /// <summary>
-        /// RecordId = 60,
-        /// ItemId = 16,
-        /// LongMnemonic = "Bx",
-        /// ShortMnemonic = "Bx",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 60,
+    /// ItemId = 17,
+    /// LongMnemonic = "By",
+    /// ShortMnemonic = "By",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Bx { get; set; }
+    public float? By { get; set; }
 
-        /// <summary>
-        /// RecordId = 60,
-        /// ItemId = 17,
-        /// LongMnemonic = "By",
-        /// ShortMnemonic = "By",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 60,
+    /// ItemId = 18,
+    /// LongMnemonic = "Bz",
+    /// ShortMnemonic = "Bz",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? By { get; set; }
+    public float? Bz { get; set; }
 
-        /// <summary>
-        /// RecordId = 60,
-        /// ItemId = 18,
-        /// LongMnemonic = "Bz",
-        /// ShortMnemonic = "Bz",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Bz { get; set; }
-
-    }
 }
diff --git a/AsbCloudApp/Data/WITS/Record61Dto.cs b/AsbCloudApp/Data/WITS/Record61Dto.cs
index 12d59663..18f0e202 100644
--- a/AsbCloudApp/Data/WITS/Record61Dto.cs
+++ b/AsbCloudApp/Data/WITS/Record61Dto.cs
@@ -1,178 +1,177 @@
-namespace AsbCloudApp.Data.WITS
+namespace AsbCloudApp.Data.WITS;
+
+/// <summary>
+/// Record name:  Резистивиметр Corvet
+/// Description: SibReciver. Резистивиметр Corvet
+/// Description2: 
+/// </summary>
+
+public class Record61Dto : RecordBaseDto
 {
+
     /// <summary>
-    /// Record name:  Резистивиметр Corvet
-    /// Description: SibReciver. Резистивиметр Corvet
-    /// Description2: 
+    /// RecordId = 61,
+    /// ItemId = 99,
+    /// LongMnemonic = "DEPTBITM",
+    /// ShortMnemonic = "DBTM",
+    /// Description = "SibReceiver custom. Положение долота",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
     /// </summary>
 
-    public class Record61Dto : RecordBaseDto
-    {
+    public float? Deptbitm { get; set; }
 
-        /// <summary>
-        /// RecordId = 61,
-        /// ItemId = 99,
-        /// LongMnemonic = "DEPTBITM",
-        /// ShortMnemonic = "DBTM",
-        /// Description = "SibReceiver custom. Положение долота",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 61,
+    /// ItemId = 10,
+    /// LongMnemonic = "DEPTMEAS",
+    /// ShortMnemonic = "DMEA",
+    /// Description = "SibReceiver custom. Точка Замера",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Deptbitm { get; set; }
+    public float? Deptmeas { get; set; }
 
-        /// <summary>
-        /// RecordId = 61,
-        /// ItemId = 10,
-        /// LongMnemonic = "DEPTMEAS",
-        /// ShortMnemonic = "DMEA",
-        /// Description = "SibReceiver custom. Точка Замера",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 61,
+    /// ItemId = 11,
+    /// LongMnemonic = "PHL1F1",
+    /// ShortMnemonic = "PHL1F1",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Deptmeas { get; set; }
+    public float? Phl1f1 { get; set; }
 
-        /// <summary>
-        /// RecordId = 61,
-        /// ItemId = 11,
-        /// LongMnemonic = "PHL1F1",
-        /// ShortMnemonic = "PHL1F1",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 61,
+    /// ItemId = 12,
+    /// LongMnemonic = "PHL1F2",
+    /// ShortMnemonic = "PHL1F2",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Phl1f1 { get; set; }
+    public float? Phl1f2 { get; set; }
 
-        /// <summary>
-        /// RecordId = 61,
-        /// ItemId = 12,
-        /// LongMnemonic = "PHL1F2",
-        /// ShortMnemonic = "PHL1F2",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 61,
+    /// ItemId = 13,
+    /// LongMnemonic = "PHL2F1",
+    /// ShortMnemonic = "PHL2F1",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Phl1f2 { get; set; }
+    public float? Phl2f1 { get; set; }
 
-        /// <summary>
-        /// RecordId = 61,
-        /// ItemId = 13,
-        /// LongMnemonic = "PHL2F1",
-        /// ShortMnemonic = "PHL2F1",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 61,
+    /// ItemId = 14,
+    /// LongMnemonic = "PHL2F2",
+    /// ShortMnemonic = "PHL2F2",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Phl2f1 { get; set; }
+    public float? Phl2f2 { get; set; }
 
-        /// <summary>
-        /// RecordId = 61,
-        /// ItemId = 14,
-        /// LongMnemonic = "PHL2F2",
-        /// ShortMnemonic = "PHL2F2",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 61,
+    /// ItemId = 15,
+    /// LongMnemonic = "ATT06H",
+    /// ShortMnemonic = "ATT06H",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Phl2f2 { get; set; }
+    public float? Att06h { get; set; }
 
-        /// <summary>
-        /// RecordId = 61,
-        /// ItemId = 15,
-        /// LongMnemonic = "ATT06H",
-        /// ShortMnemonic = "ATT06H",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 61,
+    /// ItemId = 16,
+    /// LongMnemonic = "ATT06L",
+    /// ShortMnemonic = "ATT06L",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Att06h { get; set; }
+    public float? Att06l { get; set; }
 
-        /// <summary>
-        /// RecordId = 61,
-        /// ItemId = 16,
-        /// LongMnemonic = "ATT06L",
-        /// ShortMnemonic = "ATT06L",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 61,
+    /// ItemId = 17,
+    /// LongMnemonic = "ATT10H",
+    /// ShortMnemonic = "ATT10H",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Att06l { get; set; }
+    public float? Att10h { get; set; }
 
-        /// <summary>
-        /// RecordId = 61,
-        /// ItemId = 17,
-        /// LongMnemonic = "ATT10H",
-        /// ShortMnemonic = "ATT10H",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 61,
+    /// ItemId = 18,
+    /// LongMnemonic = "ATT10L",
+    /// ShortMnemonic = "ATT10L",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Att10h { get; set; }
+    public float? Att10l { get; set; }
 
-        /// <summary>
-        /// RecordId = 61,
-        /// ItemId = 18,
-        /// LongMnemonic = "ATT10L",
-        /// ShortMnemonic = "ATT10L",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 61,
+    /// ItemId = 19,
+    /// LongMnemonic = "Status",
+    /// ShortMnemonic = "Status",
+    /// Description = "SibReceiver custom",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Att10l { get; set; }
+    public float? Status { get; set; }
 
-        /// <summary>
-        /// RecordId = 61,
-        /// ItemId = 19,
-        /// LongMnemonic = "Status",
-        /// ShortMnemonic = "Status",
-        /// Description = "SibReceiver custom",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Status { get; set; }
-
-    }
 }
diff --git a/AsbCloudApp/Data/WITS/Record7Dto.cs b/AsbCloudApp/Data/WITS/Record7Dto.cs
index 0e7664ff..54c05501 100644
--- a/AsbCloudApp/Data/WITS/Record7Dto.cs
+++ b/AsbCloudApp/Data/WITS/Record7Dto.cs
@@ -1,298 +1,297 @@
-namespace AsbCloudApp.Data.WITS
+namespace AsbCloudApp.Data.WITS;
+
+/// <summary>
+/// Record name: Survey/Directional
+/// Description: Directional/Survey data
+/// Description2: 
+/// </summary>
+
+public class Record7Dto : RecordBaseDto
 {
+
     /// <summary>
-    /// Record name: Survey/Directional
-    /// Description: Directional/Survey data
-    /// Description2: 
+    /// RecordId = 7,
+    /// ItemId = 8,
+    /// LongMnemonic = "DEPTSVYM",
+    /// ShortMnemonic = "DSVM",
+    /// Description = "Depth Svy/reading (meas)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
     /// </summary>
 
-    public class Record7Dto : RecordBaseDto
-    {
+    public float? Deptsvym { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 8,
-        /// LongMnemonic = "DEPTSVYM",
-        /// ShortMnemonic = "DSVM",
-        /// Description = "Depth Svy/reading (meas)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 9,
+    /// LongMnemonic = "DEPTSVYV",
+    /// ShortMnemonic = "DSVV",
+    /// Description = "Depth Svy/reading (vert)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Deptsvym { get; set; }
+    public float? Deptsvyv { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 9,
-        /// LongMnemonic = "DEPTSVYV",
-        /// ShortMnemonic = "DSVV",
-        /// Description = "Depth Svy/reading (vert)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 10,
+    /// LongMnemonic = "PASSNUM",
+    /// ShortMnemonic = "PASS",
+    /// Description = "Pass Number",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 2,
+    /// ValueType = "S"
+    /// </summary>
 
-        public float? Deptsvyv { get; set; }
+    public short? Passnum { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 10,
-        /// LongMnemonic = "PASSNUM",
-        /// ShortMnemonic = "PASS",
-        /// Description = "Pass Number",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 2,
-        /// ValueType = "S"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 11,
+    /// LongMnemonic = "DEPTMEAS",
+    /// ShortMnemonic = "DMEA",
+    /// Description = "Depth Hole (meas)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public short? Passnum { get; set; }
+    public float? Deptmeas { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 11,
-        /// LongMnemonic = "DEPTMEAS",
-        /// ShortMnemonic = "DMEA",
-        /// Description = "Depth Hole (meas)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 12,
+    /// LongMnemonic = "SVYTYPE",
+    /// ShortMnemonic = "STYP",
+    /// Description = "Svy Type",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 8,
+    /// ValueType = "A"
+    /// </summary>
 
-        public float? Deptmeas { get; set; }
+    public string Svytype { get; set; } = string.Empty;
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 12,
-        /// LongMnemonic = "SVYTYPE",
-        /// ShortMnemonic = "STYP",
-        /// Description = "Svy Type",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 8,
-        /// ValueType = "A"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 13,
+    /// LongMnemonic = "SVYINC",
+    /// ShortMnemonic = "SINC",
+    /// Description = "Svy Inclination",
+    /// Description2 = "",
+    /// FPSUnits = "DEG",
+    /// MetricUnits = "DEG",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public string Svytype { get; set; } = string.Empty;
+    public float? Svyinc { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 13,
-        /// LongMnemonic = "SVYINC",
-        /// ShortMnemonic = "SINC",
-        /// Description = "Svy Inclination",
-        /// Description2 = "",
-        /// FPSUnits = "DEG",
-        /// MetricUnits = "DEG",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 14,
+    /// LongMnemonic = "SVYAZU",
+    /// ShortMnemonic = "SAZU",
+    /// Description = "Svy Azimuth (uncorrected)",
+    /// Description2 = "",
+    /// FPSUnits = "DEG",
+    /// MetricUnits = "DEG",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Svyinc { get; set; }
+    public float? Svyazu { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 14,
-        /// LongMnemonic = "SVYAZU",
-        /// ShortMnemonic = "SAZU",
-        /// Description = "Svy Azimuth (uncorrected)",
-        /// Description2 = "",
-        /// FPSUnits = "DEG",
-        /// MetricUnits = "DEG",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 15,
+    /// LongMnemonic = "SVYAZC",
+    /// ShortMnemonic = "SAZC",
+    /// Description = "Svy Azimuth (corrected)",
+    /// Description2 = "",
+    /// FPSUnits = "DEG",
+    /// MetricUnits = "DEG",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Svyazu { get; set; }
+    public float? Svyazc { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 15,
-        /// LongMnemonic = "SVYAZC",
-        /// ShortMnemonic = "SAZC",
-        /// Description = "Svy Azimuth (corrected)",
-        /// Description2 = "",
-        /// FPSUnits = "DEG",
-        /// MetricUnits = "DEG",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 16,
+    /// LongMnemonic = "SVYMTF",
+    /// ShortMnemonic = "SMTF",
+    /// Description = "Svy Magnetic Toolface",
+    /// Description2 = "",
+    /// FPSUnits = "DEG",
+    /// MetricUnits = "DEG",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Svyazc { get; set; }
+    public float? Svymtf { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 16,
-        /// LongMnemonic = "SVYMTF",
-        /// ShortMnemonic = "SMTF",
-        /// Description = "Svy Magnetic Toolface",
-        /// Description2 = "",
-        /// FPSUnits = "DEG",
-        /// MetricUnits = "DEG",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 17,
+    /// LongMnemonic = "SVYGTF",
+    /// ShortMnemonic = "SGTF",
+    /// Description = "Svy Gravity Toolface",
+    /// Description2 = "",
+    /// FPSUnits = "DEG",
+    /// MetricUnits = "DEG",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Svymtf { get; set; }
+    public float? Svygtf { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 17,
-        /// LongMnemonic = "SVYGTF",
-        /// ShortMnemonic = "SGTF",
-        /// Description = "Svy Gravity Toolface",
-        /// Description2 = "",
-        /// FPSUnits = "DEG",
-        /// MetricUnits = "DEG",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 18,
+    /// LongMnemonic = "SVYNS",
+    /// ShortMnemonic = "SNS",
+    /// Description = "Svy North-South Position",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Svygtf { get; set; }
+    public float? Svyns { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 18,
-        /// LongMnemonic = "SVYNS",
-        /// ShortMnemonic = "SNS",
-        /// Description = "Svy North-South Position",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 19,
+    /// LongMnemonic = "SVYEW",
+    /// ShortMnemonic = "SEW",
+    /// Description = "Svy East-West Position",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Svyns { get; set; }
+    public float? Svyew { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 19,
-        /// LongMnemonic = "SVYEW",
-        /// ShortMnemonic = "SEW",
-        /// Description = "Svy East-West Position",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 20,
+    /// LongMnemonic = "SVYDLS",
+    /// ShortMnemonic = "SDLS",
+    /// Description = "Svy Dog Leg Severity",
+    /// Description2 = "",
+    /// FPSUnits = "DGHF",
+    /// MetricUnits = "DGHM",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Svyew { get; set; }
+    public float? Svydls { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 20,
-        /// LongMnemonic = "SVYDLS",
-        /// ShortMnemonic = "SDLS",
-        /// Description = "Svy Dog Leg Severity",
-        /// Description2 = "",
-        /// FPSUnits = "DGHF",
-        /// MetricUnits = "DGHM",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 21,
+    /// LongMnemonic = "SVYWALK",
+    /// ShortMnemonic = "SWLK",
+    /// Description = "Svy Rate of Walk",
+    /// Description2 = "",
+    /// FPSUnits = "DGHF",
+    /// MetricUnits = "DGHM",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Svydls { get; set; }
+    public float? Svywalk { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 21,
-        /// LongMnemonic = "SVYWALK",
-        /// ShortMnemonic = "SWLK",
-        /// Description = "Svy Rate of Walk",
-        /// Description2 = "",
-        /// FPSUnits = "DGHF",
-        /// MetricUnits = "DGHM",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 22,
+    /// LongMnemonic = "SPARE1",
+    /// ShortMnemonic = "SPR1",
+    /// Description = "SPARE 1",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Svywalk { get; set; }
+    public float? Spare1 { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 22,
-        /// LongMnemonic = "SPARE1",
-        /// ShortMnemonic = "SPR1",
-        /// Description = "SPARE 1",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 23,
+    /// LongMnemonic = "SPARE2",
+    /// ShortMnemonic = "SPR2",
+    /// Description = "SPARE 2",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Spare1 { get; set; }
+    public float? Spare2 { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 23,
-        /// LongMnemonic = "SPARE2",
-        /// ShortMnemonic = "SPR2",
-        /// Description = "SPARE 2",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 24,
+    /// LongMnemonic = "SPARE3",
+    /// ShortMnemonic = "SPR3",
+    /// Description = "SPARE 3",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Spare2 { get; set; }
+    public float? Spare3 { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 24,
-        /// LongMnemonic = "SPARE3",
-        /// ShortMnemonic = "SPR3",
-        /// Description = "SPARE 3",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 25,
+    /// LongMnemonic = "SPARE4",
+    /// ShortMnemonic = "SPR4",
+    /// Description = "SPARE 4",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Spare3 { get; set; }
+    public float? Spare4 { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 25,
-        /// LongMnemonic = "SPARE4",
-        /// ShortMnemonic = "SPR4",
-        /// Description = "SPARE 4",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
+    /// <summary>
+    /// RecordId = 7,
+    /// ItemId = 26,
+    /// LongMnemonic = "SPARE5",
+    /// ShortMnemonic = "SPR5",
+    /// Description = "SPARE 5",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
 
-        public float? Spare4 { get; set; }
+    public float? Spare5 { get; set; }
 
-        /// <summary>
-        /// RecordId = 7,
-        /// ItemId = 26,
-        /// LongMnemonic = "SPARE5",
-        /// ShortMnemonic = "SPR5",
-        /// Description = "SPARE 5",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare5 { get; set; }
-
-    }
 }
diff --git a/AsbCloudApp/Data/WITS/Record8Dto.cs b/AsbCloudApp/Data/WITS/Record8Dto.cs
index 7a8d7331..ee196058 100644
--- a/AsbCloudApp/Data/WITS/Record8Dto.cs
+++ b/AsbCloudApp/Data/WITS/Record8Dto.cs
@@ -1,733 +1,732 @@
-namespace AsbCloudApp.Data.WITS
+namespace AsbCloudApp.Data.WITS;
+
+/// <summary>
+/// Record name: MWD Formation Evaluation
+/// Description: MWD Formation Evaluation data
+/// Description2: 
+/// </summary>
+
+public class Record8Dto : RecordBaseDto
 {
+
     /// <summary>
-    /// Record name: MWD Formation Evaluation
-    /// Description: MWD Formation Evaluation data
-    /// Description2: 
+    /// RecordId = 8,
+    /// ItemId = 8,
+    /// LongMnemonic = "DEPTMEAS",
+    /// ShortMnemonic = "DMEA",
+    /// Description = "Depth Hole (meas)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
     /// </summary>
 
-    public class Record8Dto : RecordBaseDto
-    {
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 8,
-        /// LongMnemonic = "DEPTMEAS",
-        /// ShortMnemonic = "DMEA",
-        /// Description = "Depth Hole (meas)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptmeas { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 9,
-        /// LongMnemonic = "DEPTVERT",
-        /// ShortMnemonic = "DVER",
-        /// Description = "Depth Hole (vert)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptvert { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 10,
-        /// LongMnemonic = "DEPTBITM",
-        /// ShortMnemonic = "DBTM",
-        /// Description = "Depth Bit (meas)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptbitm { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 11,
-        /// LongMnemonic = "DEPTBITV",
-        /// ShortMnemonic = "DBTV",
-        /// Description = "Depth Bit (vert)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptbitv { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 12,
-        /// LongMnemonic = "PASSNUM",
-        /// ShortMnemonic = "PASS",
-        /// Description = "Pass Number",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 2,
-        /// ValueType = "S"
-        /// </summary>
-
-        public short? Passnum { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 13,
-        /// LongMnemonic = "DEPTRS1M",
-        /// ShortMnemonic = "DR1M",
-        /// Description = "Depth Resis 1 sensor (meas)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptrs1m { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 14,
-        /// LongMnemonic = "DEPTRS1V",
-        /// ShortMnemonic = "DR1V",
-        /// Description = "Depth Resis 1 sensor (vert)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptrs1v { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 15,
-        /// LongMnemonic = "MR1",
-        /// ShortMnemonic = "MR1",
-        /// Description = "Resis 1 reading",
-        /// Description2 = "",
-        /// FPSUnits = "OHMM",
-        /// MetricUnits = "OHMM",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mr1 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 16,
-        /// LongMnemonic = "MR1C",
-        /// ShortMnemonic = "MR1C",
-        /// Description = "Resis 1 (borehole corr)",
-        /// Description2 = "",
-        /// FPSUnits = "OHMM",
-        /// MetricUnits = "OHMM",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mr1c { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 17,
-        /// LongMnemonic = "DEPTRS2M",
-        /// ShortMnemonic = "DR2M",
-        /// Description = "Depth Resis 2 sensor (meas)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptrs2m { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 18,
-        /// LongMnemonic = "DEPTRS2V",
-        /// ShortMnemonic = "DR2V",
-        /// Description = "Depth Resis 2 sensor (vert)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptrs2v { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 19,
-        /// LongMnemonic = "MR2",
-        /// ShortMnemonic = "MR2",
-        /// Description = "Resis 2 reading",
-        /// Description2 = "",
-        /// FPSUnits = "OHMM",
-        /// MetricUnits = "OHMM",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mr2 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 20,
-        /// LongMnemonic = "MR2C",
-        /// ShortMnemonic = "MR2C",
-        /// Description = "Resis 2 (borehole corr)",
-        /// Description2 = "",
-        /// FPSUnits = "OHMM",
-        /// MetricUnits = "OHMM",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mr2c { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 21,
-        /// LongMnemonic = "DEPTGR1M",
-        /// ShortMnemonic = "DG1M",
-        /// Description = "Depth G.Ray 1 sensor(meas)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptgr1m { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 22,
-        /// LongMnemonic = "DEPTGR1V",
-        /// ShortMnemonic = "DG1V",
-        /// Description = "Depth G.Ray 1 sensor(vert)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptgr1v { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 23,
-        /// LongMnemonic = "MG1",
-        /// ShortMnemonic = "MG1",
-        /// Description = "Gamma Ray 1 reading",
-        /// Description2 = "",
-        /// FPSUnits = "API",
-        /// MetricUnits = "API",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mg1 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 24,
-        /// LongMnemonic = "MG1C",
-        /// ShortMnemonic = "MG1C",
-        /// Description = "Gamma Ray 1(borehole corr)",
-        /// Description2 = "",
-        /// FPSUnits = "API",
-        /// MetricUnits = "API",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mg1c { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 25,
-        /// LongMnemonic = "DEPTGR2M",
-        /// ShortMnemonic = "DG2M",
-        /// Description = "Depth G.Ray 2 sensor(meas)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptgr2m { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 26,
-        /// LongMnemonic = "DEPTGR2V",
-        /// ShortMnemonic = "DG2V",
-        /// Description = "Depth G.Ray 2 sensor(vert)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptgr2v { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 27,
-        /// LongMnemonic = "MG2",
-        /// ShortMnemonic = "MG2",
-        /// Description = "Gamma Ray 2 reading",
-        /// Description2 = "",
-        /// FPSUnits = "API",
-        /// MetricUnits = "API",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mg2 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 28,
-        /// LongMnemonic = "MG2C",
-        /// ShortMnemonic = "MG2C",
-        /// Description = "Gamma Ray 2(borehole corr)",
-        /// Description2 = "",
-        /// FPSUnits = "API",
-        /// MetricUnits = "API",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mg2c { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 29,
-        /// LongMnemonic = "DEPTP1M",
-        /// ShortMnemonic = "DP1M",
-        /// Description = "Depth Por 1 sensor (meas)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptp1m { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 30,
-        /// LongMnemonic = "DEPTP1V",
-        /// ShortMnemonic = "DP1V",
-        /// Description = "Depth Por 1 sensor (vert)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptp1v { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 31,
-        /// LongMnemonic = "MPO1",
-        /// ShortMnemonic = "MPO1",
-        /// Description = "Porosity Tool 1 reading",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mpo1 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 32,
-        /// LongMnemonic = "DEPTP2M",
-        /// ShortMnemonic = "DP2M",
-        /// Description = "Depth Por 2 sensor (meas)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptp2m { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 33,
-        /// LongMnemonic = "DEPTP2V",
-        /// ShortMnemonic = "DP2V",
-        /// Description = "Depth Por 2 sensor (vert)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptp2v { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 34,
-        /// LongMnemonic = "MPO2",
-        /// ShortMnemonic = "MPO2",
-        /// Description = "Porosity Tool 2 reading",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mpo2 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 35,
-        /// LongMnemonic = "MFTANN",
-        /// ShortMnemonic = "MFTA",
-        /// Description = "Downhole Fluid Temp (ann)",
-        /// Description2 = "",
-        /// FPSUnits = "DEGF",
-        /// MetricUnits = "DEGC",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mftann { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 36,
-        /// LongMnemonic = "MFTPIPE",
-        /// ShortMnemonic = "MFTP",
-        /// Description = "Downhole Fluid Temp (pipe)",
-        /// Description2 = "",
-        /// FPSUnits = "DEGF",
-        /// MetricUnits = "DEGC",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mftpipe { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 37,
-        /// LongMnemonic = "MFRANN",
-        /// ShortMnemonic = "MFRA",
-        /// Description = "Downhole Fluid Resis (ann)",
-        /// Description2 = "",
-        /// FPSUnits = "OHMM",
-        /// MetricUnits = "OHMM",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mfrann { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 38,
-        /// LongMnemonic = "MFRPIPE",
-        /// ShortMnemonic = "MFRP",
-        /// Description = "Downhole Fluid Resis (pipe)",
-        /// Description2 = "",
-        /// FPSUnits = "OHMM",
-        /// MetricUnits = "OHMM",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mfrpipe { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 39,
-        /// LongMnemonic = "DEPTFDM",
-        /// ShortMnemonic = "DFDM",
-        /// Description = "Depth Form Density (meas)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptfdm { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 40,
-        /// LongMnemonic = "DEPTFDV",
-        /// ShortMnemonic = "DFDV",
-        /// Description = "Depth Form Density (vert)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptfdv { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 41,
-        /// LongMnemonic = "MFD",
-        /// ShortMnemonic = "MFD",
-        /// Description = "Formation Density",
-        /// Description2 = "",
-        /// FPSUnits = "G/CC",
-        /// MetricUnits = "G/CC",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mfd { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 42,
-        /// LongMnemonic = "DEPTCALM",
-        /// ShortMnemonic = "DCLM",
-        /// Description = "Depth Caliper (meas)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptcalm { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 43,
-        /// LongMnemonic = "DEPTCALV",
-        /// ShortMnemonic = "DCLV",
-        /// Description = "Depth Caliper (vert)",
-        /// Description2 = "",
-        /// FPSUnits = "F",
-        /// MetricUnits = "M",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Deptcalv { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 44,
-        /// LongMnemonic = "MCLP",
-        /// ShortMnemonic = "MCLP",
-        /// Description = "Caliper",
-        /// Description2 = "",
-        /// FPSUnits = "IN",
-        /// MetricUnits = "MM",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mclp { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 45,
-        /// LongMnemonic = "MFPP",
-        /// ShortMnemonic = "MFPP",
-        /// Description = "Pore Pressure Grad MWD",
-        /// Description2 = "",
-        /// FPSUnits = "PPG",
-        /// MetricUnits = "KGM3",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mfpp { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 46,
-        /// LongMnemonic = "MFFP",
-        /// ShortMnemonic = "MFFP",
-        /// Description = "Frac Pressure Grad MWD",
-        /// Description2 = "",
-        /// FPSUnits = "PPG",
-        /// MetricUnits = "KGM3",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Mffp { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 47,
-        /// LongMnemonic = "SPARE1",
-        /// ShortMnemonic = "SPR1",
-        /// Description = "SPARE 1",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare1 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 48,
-        /// LongMnemonic = "SPARE2",
-        /// ShortMnemonic = "SPR2",
-        /// Description = "SPARE 2",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare2 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 49,
-        /// LongMnemonic = "SPARE3",
-        /// ShortMnemonic = "SPR3",
-        /// Description = "SPARE 3",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare3 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 50,
-        /// LongMnemonic = "SPARE4",
-        /// ShortMnemonic = "SPR4",
-        /// Description = "SPARE 4",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare4 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 51,
-        /// LongMnemonic = "SPARE5",
-        /// ShortMnemonic = "SPR5",
-        /// Description = "SPARE 5",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "---",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare5 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 52,
-        /// LongMnemonic = "SPARE6",
-        /// ShortMnemonic = "SPR6",
-        /// Description = "SPARE 6",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare6 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 53,
-        /// LongMnemonic = "SPARE7",
-        /// ShortMnemonic = "SPR7",
-        /// Description = "SPARE 7",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare7 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 54,
-        /// LongMnemonic = "SPARE8",
-        /// ShortMnemonic = "SPR8",
-        /// Description = "SPARE 8",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare8 { get; set; }
-
-        /// <summary>
-        /// RecordId = 8,
-        /// ItemId = 55,
-        /// LongMnemonic = "SPARE9",
-        /// ShortMnemonic = "SPR9",
-        /// Description = "SPARE 9",
-        /// Description2 = "",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "F"
-        /// </summary>
-
-        public float? Spare9 { get; set; }
-
-    }
+    public float? Deptmeas { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 9,
+    /// LongMnemonic = "DEPTVERT",
+    /// ShortMnemonic = "DVER",
+    /// Description = "Depth Hole (vert)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptvert { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 10,
+    /// LongMnemonic = "DEPTBITM",
+    /// ShortMnemonic = "DBTM",
+    /// Description = "Depth Bit (meas)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptbitm { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 11,
+    /// LongMnemonic = "DEPTBITV",
+    /// ShortMnemonic = "DBTV",
+    /// Description = "Depth Bit (vert)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptbitv { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 12,
+    /// LongMnemonic = "PASSNUM",
+    /// ShortMnemonic = "PASS",
+    /// Description = "Pass Number",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 2,
+    /// ValueType = "S"
+    /// </summary>
+
+    public short? Passnum { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 13,
+    /// LongMnemonic = "DEPTRS1M",
+    /// ShortMnemonic = "DR1M",
+    /// Description = "Depth Resis 1 sensor (meas)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptrs1m { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 14,
+    /// LongMnemonic = "DEPTRS1V",
+    /// ShortMnemonic = "DR1V",
+    /// Description = "Depth Resis 1 sensor (vert)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptrs1v { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 15,
+    /// LongMnemonic = "MR1",
+    /// ShortMnemonic = "MR1",
+    /// Description = "Resis 1 reading",
+    /// Description2 = "",
+    /// FPSUnits = "OHMM",
+    /// MetricUnits = "OHMM",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mr1 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 16,
+    /// LongMnemonic = "MR1C",
+    /// ShortMnemonic = "MR1C",
+    /// Description = "Resis 1 (borehole corr)",
+    /// Description2 = "",
+    /// FPSUnits = "OHMM",
+    /// MetricUnits = "OHMM",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mr1c { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 17,
+    /// LongMnemonic = "DEPTRS2M",
+    /// ShortMnemonic = "DR2M",
+    /// Description = "Depth Resis 2 sensor (meas)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptrs2m { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 18,
+    /// LongMnemonic = "DEPTRS2V",
+    /// ShortMnemonic = "DR2V",
+    /// Description = "Depth Resis 2 sensor (vert)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptrs2v { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 19,
+    /// LongMnemonic = "MR2",
+    /// ShortMnemonic = "MR2",
+    /// Description = "Resis 2 reading",
+    /// Description2 = "",
+    /// FPSUnits = "OHMM",
+    /// MetricUnits = "OHMM",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mr2 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 20,
+    /// LongMnemonic = "MR2C",
+    /// ShortMnemonic = "MR2C",
+    /// Description = "Resis 2 (borehole corr)",
+    /// Description2 = "",
+    /// FPSUnits = "OHMM",
+    /// MetricUnits = "OHMM",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mr2c { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 21,
+    /// LongMnemonic = "DEPTGR1M",
+    /// ShortMnemonic = "DG1M",
+    /// Description = "Depth G.Ray 1 sensor(meas)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptgr1m { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 22,
+    /// LongMnemonic = "DEPTGR1V",
+    /// ShortMnemonic = "DG1V",
+    /// Description = "Depth G.Ray 1 sensor(vert)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptgr1v { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 23,
+    /// LongMnemonic = "MG1",
+    /// ShortMnemonic = "MG1",
+    /// Description = "Gamma Ray 1 reading",
+    /// Description2 = "",
+    /// FPSUnits = "API",
+    /// MetricUnits = "API",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mg1 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 24,
+    /// LongMnemonic = "MG1C",
+    /// ShortMnemonic = "MG1C",
+    /// Description = "Gamma Ray 1(borehole corr)",
+    /// Description2 = "",
+    /// FPSUnits = "API",
+    /// MetricUnits = "API",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mg1c { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 25,
+    /// LongMnemonic = "DEPTGR2M",
+    /// ShortMnemonic = "DG2M",
+    /// Description = "Depth G.Ray 2 sensor(meas)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptgr2m { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 26,
+    /// LongMnemonic = "DEPTGR2V",
+    /// ShortMnemonic = "DG2V",
+    /// Description = "Depth G.Ray 2 sensor(vert)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptgr2v { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 27,
+    /// LongMnemonic = "MG2",
+    /// ShortMnemonic = "MG2",
+    /// Description = "Gamma Ray 2 reading",
+    /// Description2 = "",
+    /// FPSUnits = "API",
+    /// MetricUnits = "API",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mg2 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 28,
+    /// LongMnemonic = "MG2C",
+    /// ShortMnemonic = "MG2C",
+    /// Description = "Gamma Ray 2(borehole corr)",
+    /// Description2 = "",
+    /// FPSUnits = "API",
+    /// MetricUnits = "API",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mg2c { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 29,
+    /// LongMnemonic = "DEPTP1M",
+    /// ShortMnemonic = "DP1M",
+    /// Description = "Depth Por 1 sensor (meas)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptp1m { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 30,
+    /// LongMnemonic = "DEPTP1V",
+    /// ShortMnemonic = "DP1V",
+    /// Description = "Depth Por 1 sensor (vert)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptp1v { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 31,
+    /// LongMnemonic = "MPO1",
+    /// ShortMnemonic = "MPO1",
+    /// Description = "Porosity Tool 1 reading",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mpo1 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 32,
+    /// LongMnemonic = "DEPTP2M",
+    /// ShortMnemonic = "DP2M",
+    /// Description = "Depth Por 2 sensor (meas)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptp2m { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 33,
+    /// LongMnemonic = "DEPTP2V",
+    /// ShortMnemonic = "DP2V",
+    /// Description = "Depth Por 2 sensor (vert)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptp2v { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 34,
+    /// LongMnemonic = "MPO2",
+    /// ShortMnemonic = "MPO2",
+    /// Description = "Porosity Tool 2 reading",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mpo2 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 35,
+    /// LongMnemonic = "MFTANN",
+    /// ShortMnemonic = "MFTA",
+    /// Description = "Downhole Fluid Temp (ann)",
+    /// Description2 = "",
+    /// FPSUnits = "DEGF",
+    /// MetricUnits = "DEGC",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mftann { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 36,
+    /// LongMnemonic = "MFTPIPE",
+    /// ShortMnemonic = "MFTP",
+    /// Description = "Downhole Fluid Temp (pipe)",
+    /// Description2 = "",
+    /// FPSUnits = "DEGF",
+    /// MetricUnits = "DEGC",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mftpipe { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 37,
+    /// LongMnemonic = "MFRANN",
+    /// ShortMnemonic = "MFRA",
+    /// Description = "Downhole Fluid Resis (ann)",
+    /// Description2 = "",
+    /// FPSUnits = "OHMM",
+    /// MetricUnits = "OHMM",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mfrann { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 38,
+    /// LongMnemonic = "MFRPIPE",
+    /// ShortMnemonic = "MFRP",
+    /// Description = "Downhole Fluid Resis (pipe)",
+    /// Description2 = "",
+    /// FPSUnits = "OHMM",
+    /// MetricUnits = "OHMM",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mfrpipe { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 39,
+    /// LongMnemonic = "DEPTFDM",
+    /// ShortMnemonic = "DFDM",
+    /// Description = "Depth Form Density (meas)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptfdm { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 40,
+    /// LongMnemonic = "DEPTFDV",
+    /// ShortMnemonic = "DFDV",
+    /// Description = "Depth Form Density (vert)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptfdv { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 41,
+    /// LongMnemonic = "MFD",
+    /// ShortMnemonic = "MFD",
+    /// Description = "Formation Density",
+    /// Description2 = "",
+    /// FPSUnits = "G/CC",
+    /// MetricUnits = "G/CC",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mfd { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 42,
+    /// LongMnemonic = "DEPTCALM",
+    /// ShortMnemonic = "DCLM",
+    /// Description = "Depth Caliper (meas)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptcalm { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 43,
+    /// LongMnemonic = "DEPTCALV",
+    /// ShortMnemonic = "DCLV",
+    /// Description = "Depth Caliper (vert)",
+    /// Description2 = "",
+    /// FPSUnits = "F",
+    /// MetricUnits = "M",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Deptcalv { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 44,
+    /// LongMnemonic = "MCLP",
+    /// ShortMnemonic = "MCLP",
+    /// Description = "Caliper",
+    /// Description2 = "",
+    /// FPSUnits = "IN",
+    /// MetricUnits = "MM",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mclp { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 45,
+    /// LongMnemonic = "MFPP",
+    /// ShortMnemonic = "MFPP",
+    /// Description = "Pore Pressure Grad MWD",
+    /// Description2 = "",
+    /// FPSUnits = "PPG",
+    /// MetricUnits = "KGM3",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mfpp { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 46,
+    /// LongMnemonic = "MFFP",
+    /// ShortMnemonic = "MFFP",
+    /// Description = "Frac Pressure Grad MWD",
+    /// Description2 = "",
+    /// FPSUnits = "PPG",
+    /// MetricUnits = "KGM3",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Mffp { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 47,
+    /// LongMnemonic = "SPARE1",
+    /// ShortMnemonic = "SPR1",
+    /// Description = "SPARE 1",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare1 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 48,
+    /// LongMnemonic = "SPARE2",
+    /// ShortMnemonic = "SPR2",
+    /// Description = "SPARE 2",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare2 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 49,
+    /// LongMnemonic = "SPARE3",
+    /// ShortMnemonic = "SPR3",
+    /// Description = "SPARE 3",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare3 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 50,
+    /// LongMnemonic = "SPARE4",
+    /// ShortMnemonic = "SPR4",
+    /// Description = "SPARE 4",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare4 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 51,
+    /// LongMnemonic = "SPARE5",
+    /// ShortMnemonic = "SPR5",
+    /// Description = "SPARE 5",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "---",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare5 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 52,
+    /// LongMnemonic = "SPARE6",
+    /// ShortMnemonic = "SPR6",
+    /// Description = "SPARE 6",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare6 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 53,
+    /// LongMnemonic = "SPARE7",
+    /// ShortMnemonic = "SPR7",
+    /// Description = "SPARE 7",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare7 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 54,
+    /// LongMnemonic = "SPARE8",
+    /// ShortMnemonic = "SPR8",
+    /// Description = "SPARE 8",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare8 { get; set; }
+
+    /// <summary>
+    /// RecordId = 8,
+    /// ItemId = 55,
+    /// LongMnemonic = "SPARE9",
+    /// ShortMnemonic = "SPR9",
+    /// Description = "SPARE 9",
+    /// Description2 = "",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "F"
+    /// </summary>
+
+    public float? Spare9 { get; set; }
+
 }
diff --git a/AsbCloudApp/Data/WITS/RecordBaseDto.cs b/AsbCloudApp/Data/WITS/RecordBaseDto.cs
index 8c874136..4c3f7261 100644
--- a/AsbCloudApp/Data/WITS/RecordBaseDto.cs
+++ b/AsbCloudApp/Data/WITS/RecordBaseDto.cs
@@ -1,133 +1,132 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.WITS
+namespace AsbCloudApp.Data.WITS;
+
+/// <summary>
+/// This is base class for all WITS-0 records
+/// </summary>
+public abstract class RecordBaseDto : IId, ITelemetryData
 {
+    /// <inheritdoc/>
+    [Required]
+    public int Id { get; set; }
+
+    /// <inheritdoc/>
+    public int IdTelemetry { get; set; }
+
+    /// <inheritdoc/>
+    [Required]
+    public DateTime DateTime { get; set; }
+
     /// <summary>
-    /// This is base class for all WITS-0 records
+    /// отметка времени
     /// </summary>
-    public abstract class RecordBaseDto : IId, ITelemetryData
-    {
-        /// <inheritdoc/>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    public int TimeStamp { get; set; }
 
-        /// <inheritdoc/>
-        public int IdTelemetry { get; set; }
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 1,
+    /// LongMnemonic = "WELLID",
+    /// ShortMnemonic = "WID",
+    /// Description = "Well Identifier",
+    /// Description2 = "Number/name assigned to the well by the operator for identification purposes. This item is common to all records. This includes a four-character code identifying the SENDER.",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 16,
+    /// ValueType = "A"
+    /// </summary>
+    [Required]
+    public string Wellid { get; set; } = string.Empty;
 
-        /// <inheritdoc/>
-        [Required]
-        public DateTime DateTime { get; set; }
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 2,
+    /// LongMnemonic = "STKNUM",
+    /// ShortMnemonic = "SKNO",
+    /// Description = "Sidetrack/Hole Sect No.",
+    /// Description2 = "Measured depth of the hole at the time the record is generated.",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 2,
+    /// ValueType = "S"
+    /// </summary>
 
-        /// <summary>
-        /// отметка времени
-        /// </summary>
-        [Required]
-        public int TimeStamp { get; set; }
+    public short? Stknum { get; set; }
 
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 1,
-        /// LongMnemonic = "WELLID",
-        /// ShortMnemonic = "WID",
-        /// Description = "Well Identifier",
-        /// Description2 = "Number/name assigned to the well by the operator for identification purposes. This item is common to all records. This includes a four-character code identifying the SENDER.",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 16,
-        /// ValueType = "A"
-        /// </summary>
-        [Required]
-        public string Wellid { get; set; } = string.Empty;
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 3,
+    /// LongMnemonic = "RECID",
+    /// ShortMnemonic = "RID",
+    /// Description = "Record Identifier",
+    /// Description2 = "Number of the sidetrack being drilled at the time the computer generated the record. Prior to having a sidetrack, this number is always 0. The sidetrack number indexes at the time drilling new formation commences (not while drilling the cement plug). This item is common to all records.",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 2,
+    /// ValueType = "S"
+    /// </summary>
 
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 2,
-        /// LongMnemonic = "STKNUM",
-        /// ShortMnemonic = "SKNO",
-        /// Description = "Sidetrack/Hole Sect No.",
-        /// Description2 = "Measured depth of the hole at the time the record is generated.",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 2,
-        /// ValueType = "S"
-        /// </summary>
+    public short? Recid { get; set; }
 
-        public short? Stknum { get; set; }
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 4,
+    /// LongMnemonic = "SEQID",
+    /// ShortMnemonic = "SQID",
+    /// Description = "Sequence Identifier",
+    /// Description2 = "Logical data record type identifier. This item is common to all records and, for current Pre-Defined Records, contains a value between 1 and 25, according to the record type. Types 26 through 49 inclusive are reserved for future expansion of the Pre-Defined records. Types 50 through 80 inclusive are open for Custom user definition. NOTE that the Logical Record Type for a record is this number plus 150, thus WITS Record 1 is Logical Record Type 151, WITS Record 2 is Logical Record Type 152, etc.",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "L"
+    /// </summary>
 
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 3,
-        /// LongMnemonic = "RECID",
-        /// ShortMnemonic = "RID",
-        /// Description = "Record Identifier",
-        /// Description2 = "Number of the sidetrack being drilled at the time the computer generated the record. Prior to having a sidetrack, this number is always 0. The sidetrack number indexes at the time drilling new formation commences (not while drilling the cement plug). This item is common to all records.",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 2,
-        /// ValueType = "S"
-        /// </summary>
+    public int? Seqid { get; set; }
 
-        public short? Recid { get; set; }
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 5,
+    /// LongMnemonic = "DATE",
+    /// ShortMnemonic = "DATE",
+    /// Description = "Date",
+    /// Description2 = "Indicates the number of times this record has been generated (it is not reset to zero for a sidetrack). The computer should automatically increase the number by one each time it creates a new record. This item is common to all records. The sequence identifier in each individual record type keeps track of the count for that particular record only. Thus there is a sequence identifier for each record type used.",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "L"
+    /// </summary>
 
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 4,
-        /// LongMnemonic = "SEQID",
-        /// ShortMnemonic = "SQID",
-        /// Description = "Sequence Identifier",
-        /// Description2 = "Logical data record type identifier. This item is common to all records and, for current Pre-Defined Records, contains a value between 1 and 25, according to the record type. Types 26 through 49 inclusive are reserved for future expansion of the Pre-Defined records. Types 50 through 80 inclusive are open for Custom user definition. NOTE that the Logical Record Type for a record is this number plus 150, thus WITS Record 1 is Logical Record Type 151, WITS Record 2 is Logical Record Type 152, etc.",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "L"
-        /// </summary>
+    public int? Date_ { get; set; }
 
-        public int? Seqid { get; set; }
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 6,
+    /// LongMnemonic = "TIME",
+    /// ShortMnemonic = "TIME",
+    /// Description = "Time",
+    /// Description2 = "Indicates the date the computer generated this record. The date is reported as a 6 digit integer in a YYMMDD type format. e.g. 910404 would represent April 4, 1991. It is common to all records. Note that, like Time below, Universal Coordinated Time (Greenwich Mean Time) is used as the common reference. Note also that though this number should never decrease, there is no guarantee of this fact.",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 4,
+    /// ValueType = "L"
+    /// </summary>
 
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 5,
-        /// LongMnemonic = "DATE",
-        /// ShortMnemonic = "DATE",
-        /// Description = "Date",
-        /// Description2 = "Indicates the number of times this record has been generated (it is not reset to zero for a sidetrack). The computer should automatically increase the number by one each time it creates a new record. This item is common to all records. The sequence identifier in each individual record type keeps track of the count for that particular record only. Thus there is a sequence identifier for each record type used.",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "L"
-        /// </summary>
+    public int? Time { get; set; }
 
-        public int? Date_ { get; set; }
+    /// <summary>
+    /// RecordId = 1,
+    /// ItemId = 7,
+    /// LongMnemonic = "ACTCOD",
+    /// ShortMnemonic = "ACTC",
+    /// Description = "Activity Code",
+    /// Description2 = "Indicates the time of day (24 hour clock), when the computer generated the record, eg. 225015 would represent 10:50:15 pm. This item is common to all records. Note that, like Date above, Universal Coordinated Time (Greenwich Mean Time) is used as the common reference.",
+    /// FPSUnits = "----",
+    /// MetricUnits = "----",
+    /// Length = 2,
+    /// ValueType = "S"
+    /// </summary>
 
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 6,
-        /// LongMnemonic = "TIME",
-        /// ShortMnemonic = "TIME",
-        /// Description = "Time",
-        /// Description2 = "Indicates the date the computer generated this record. The date is reported as a 6 digit integer in a YYMMDD type format. e.g. 910404 would represent April 4, 1991. It is common to all records. Note that, like Time below, Universal Coordinated Time (Greenwich Mean Time) is used as the common reference. Note also that though this number should never decrease, there is no guarantee of this fact.",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 4,
-        /// ValueType = "L"
-        /// </summary>
-
-        public int? Time { get; set; }
-
-        /// <summary>
-        /// RecordId = 1,
-        /// ItemId = 7,
-        /// LongMnemonic = "ACTCOD",
-        /// ShortMnemonic = "ACTC",
-        /// Description = "Activity Code",
-        /// Description2 = "Indicates the time of day (24 hour clock), when the computer generated the record, eg. 225015 would represent 10:50:15 pm. This item is common to all records. Note that, like Date above, Universal Coordinated Time (Greenwich Mean Time) is used as the common reference.",
-        /// FPSUnits = "----",
-        /// MetricUnits = "----",
-        /// Length = 2,
-        /// ValueType = "S"
-        /// </summary>
-
-        public short? Actcod { get; set; }
-    }
+    public short? Actcod { get; set; }
 }
diff --git a/AsbCloudApp/Data/WellCaseDto.cs b/AsbCloudApp/Data/WellCaseDto.cs
index b3a50693..4984f88d 100644
--- a/AsbCloudApp/Data/WellCaseDto.cs
+++ b/AsbCloudApp/Data/WellCaseDto.cs
@@ -2,30 +2,28 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Дела скважины
+/// </summary>
+public class WellCaseDto
 {
     /// <summary>
-    /// Дела скважины
+    /// Скважина
     /// </summary>
-    public class WellCaseDto
-    {
-        /// <summary>
-        /// Скважина
-        /// </summary>
-        [Required]
-        public int IdWell { get; set; }
+    [Required]
+    public int IdWell { get; set; }
 
-        /// <summary>
-        /// Разрешение для текущего пользователя добавлять ответственных
-        /// </summary>
-        [Required]
-        public bool PermissionToSetPubliher { get; set; } = true;
-
-        /// <summary>
-        /// Документ дела скважины
-        /// </summary>
-        [Required]
-        public IEnumerable<WellFinalDocumentDto> WellFinalDocuments { get; set; } = Enumerable.Empty<WellFinalDocumentDto>();
-    }
+    /// <summary>
+    /// Разрешение для текущего пользователя добавлять ответственных
+    /// </summary>
+    [Required]
+    public bool PermissionToSetPubliher { get; set; } = true;
 
+    /// <summary>
+    /// Документ дела скважины
+    /// </summary>
+    [Required]
+    public IEnumerable<WellFinalDocumentDto> WellFinalDocuments { get; set; } = Enumerable.Empty<WellFinalDocumentDto>();
 }
diff --git a/AsbCloudApp/Data/WellCompositeDto.cs b/AsbCloudApp/Data/WellCompositeDto.cs
index af9a91a8..f2516cf0 100644
--- a/AsbCloudApp/Data/WellCompositeDto.cs
+++ b/AsbCloudApp/Data/WellCompositeDto.cs
@@ -1,26 +1,25 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO элемент композитной скважины
+/// </summary>
+public class WellCompositeDto : IWellRelated
 {
+    /// <inheritdoc/>
+    [Required]
+    public int IdWell { get; set; }
+
     /// <summary>
-    /// DTO элемент композитной скважины
+    /// id скважины входящей в композитную для этой
     /// </summary>
-    public class WellCompositeDto : IWellRelated
-    {
-        /// <inheritdoc/>
-        [Required]
-        public int IdWell { get; set; }
+    [Required]
+    public int IdWellSrc { get; set; }
 
-        /// <summary>
-        /// id скважины входящей в композитную для этой
-        /// </summary>
-        [Required]
-        public int IdWellSrc { get; set; }
-
-        /// <summary>
-        /// id секции скважины входящей в композитную для этой
-        /// </summary>
-        [Required]
-        public int IdWellSectionType { get; set; }
-    }
+    /// <summary>
+    /// id секции скважины входящей в композитную для этой
+    /// </summary>
+    [Required]
+    public int IdWellSectionType { get; set; }
 }
diff --git a/AsbCloudApp/Data/WellCompositeOperationDto.cs b/AsbCloudApp/Data/WellCompositeOperationDto.cs
index 97c1ff90..f6f47143 100644
--- a/AsbCloudApp/Data/WellCompositeOperationDto.cs
+++ b/AsbCloudApp/Data/WellCompositeOperationDto.cs
@@ -5,22 +5,21 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Хранение операций по композитной скважине 
+/// и по скважинам, на основе которых была рассчитана композитная скважина
+/// </summary>
+public class WellCompositeOperationDto
 {
     /// <summary>
-    /// Хранение операций по композитной скважине 
-    /// и по скважинам, на основе которых была рассчитана композитная скважина
+    /// Список операций композитной скважины
     /// </summary>
-    public class WellCompositeOperationDto
-    {
-        /// <summary>
-        /// Список операций композитной скважины
-        /// </summary>
-        public IEnumerable<WellOperationDto> WellOperationsComposite { get; set; } = null!;
+    public IEnumerable<WellOperationDto> WellOperationsComposite { get; set; } = null!;
 
-        /// <summary>
-        /// Список операций, на основе которых были рассчитаны операции по композитной скважине
-        /// </summary>
-        public IEnumerable<WellCompositeOperationSourceDto> WellCompositeSourceOperations { get; set; } = null!;
-    }
+    /// <summary>
+    /// Список операций, на основе которых были рассчитаны операции по композитной скважине
+    /// </summary>
+    public IEnumerable<WellCompositeOperationSourceDto> WellCompositeSourceOperations { get; set; } = null!;
 }
diff --git a/AsbCloudApp/Data/WellCompositeOperationSourceDto.cs b/AsbCloudApp/Data/WellCompositeOperationSourceDto.cs
index e991dd3f..18c54646 100644
--- a/AsbCloudApp/Data/WellCompositeOperationSourceDto.cs
+++ b/AsbCloudApp/Data/WellCompositeOperationSourceDto.cs
@@ -1,21 +1,20 @@
 using AsbCloudApp.Data.WellOperation;
 using System.Collections.Generic;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Операции по скважине, по которой рассчитывается композитная скважина
+/// </summary>
+public class WellCompositeOperationSourceDto
 {
     /// <summary>
-    /// Операции по скважине, по которой рассчитывается композитная скважина
+    /// Скважина
     /// </summary>
-    public class WellCompositeOperationSourceDto
-    {
-        /// <summary>
-        /// Скважина
-        /// </summary>
-        public WellDto Well { get; set; } = null!;
+    public WellDto Well { get; set; } = null!;
 
-        /// <summary>
-        /// Операции по скважине
-        /// </summary>
-        public IEnumerable<WellOperationDto> Operations { get; set; } = null!;
-    }
+    /// <summary>
+    /// Операции по скважине
+    /// </summary>
+    public IEnumerable<WellOperationDto> Operations { get; set; } = null!;
 }
diff --git a/AsbCloudApp/Data/WellDto.cs b/AsbCloudApp/Data/WellDto.cs
index 223aad41..a158c5a8 100644
--- a/AsbCloudApp/Data/WellDto.cs
+++ b/AsbCloudApp/Data/WellDto.cs
@@ -3,90 +3,89 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// базовая информация о скважине
+/// </summary>
+public class WellWithTimezoneDto : WellInfoDto
 {
-    /// <summary>
-    /// базовая информация о скважине
-    /// </summary>
-    public class WellWithTimezoneDto : WellInfoDto
-    {
-        /// <inheritdoc/>
-        [Required]
-        public SimpleTimezoneDto Timezone { get; set; } = null!;
-
-        /// <summary>
-        /// 0 - неизвестно,
-        /// 1 - в работе,
-        /// 2 - завершена
-        /// </summary>
-        [Required]
-        public int IdState { get; set; }
-    }
+    /// <inheritdoc/>
+    [Required]
+    public SimpleTimezoneDto Timezone { get; set; } = null!;
 
     /// <summary>
-    /// Скважина
+    /// 0 - неизвестно,
+    /// 1 - в работе,
+    /// 2 - завершена
     /// </summary>
-    public class WellDto : WellInfoDto, IMapPoint, IId
-    {
-        /// <inheritdoc/>        
-        [Range(-90, 90, ErrorMessage = "Допустимые значения широты от -90 до 90")]
-        public double? Latitude { get; set; }
-
-        /// <inheritdoc/>
-        [Range(-180, 180, ErrorMessage = "Допустимые значения долготы от -180 до 180")]
-        public double? Longitude { get; set; }
-
-        /// <inheritdoc/>
-        [Required]
-        public SimpleTimezoneDto Timezone { get; set; } = null!;
-
-        /// <summary>
-        /// Название типа скважины
-        /// </summary>
-        public string? WellType { get; set; }
-
-        /// <summary>
-        /// ID типа скважины
-        /// </summary>
-        [Range(1, 2, ErrorMessage = "Тип скважины указан неправильно.")]
-        public int IdWellType { get; set; }
-
-        /// <summary>
-        /// ID куста
-        /// </summary>
-        public int IdCluster { get; set; }
-
-        /// <summary>
-        /// 0 - неизвестно,
-        /// 1 - в работе,
-        /// 2 - завершена
-        /// </summary>
-        [Range(0, 2, ErrorMessage = "Текущее состояние работы скважины указано неправильно.")]
-        public int IdState { get; set; }
-
-        /// <summary>
-        /// Дата/время первой операции
-        /// </summary>
-        public DateTimeOffset? StartDate { get; set; }
-
-        /// <summary>
-        /// Дата/время кода приходили данные последний раз
-        /// </summary>
-        public DateTimeOffset LastTelemetryDate { get; set; }
-
-        /// <summary>
-        /// ID телеметрии
-        /// </summary>
-        public int? IdTelemetry { get; set; }
-
-        /// <summary>
-        /// Объект телеметрии (инфо от панели оператора)
-        /// </summary>
-        public TelemetryBaseDto? Telemetry { get; set; }
-
-        /// <summary>
-        /// Компании участвующие в работах на скважине
-        /// </summary>
-        public IEnumerable<CompanyDto> Companies { get; set; } = Enumerable.Empty<CompanyDto>();
-    }
+    [Required]
+    public int IdState { get; set; }
+}
+
+/// <summary>
+/// Скважина
+/// </summary>
+public class WellDto : WellInfoDto, IMapPoint, IId
+{
+    /// <inheritdoc/>        
+    [Range(-90, 90, ErrorMessage = "Допустимые значения широты от -90 до 90")]
+    public double? Latitude { get; set; }
+
+    /// <inheritdoc/>
+    [Range(-180, 180, ErrorMessage = "Допустимые значения долготы от -180 до 180")]
+    public double? Longitude { get; set; }
+
+    /// <inheritdoc/>
+    [Required]
+    public SimpleTimezoneDto Timezone { get; set; } = null!;
+
+    /// <summary>
+    /// Название типа скважины
+    /// </summary>
+    public string? WellType { get; set; }
+
+    /// <summary>
+    /// ID типа скважины
+    /// </summary>
+    [Range(1, 2, ErrorMessage = "Тип скважины указан неправильно.")]
+    public int IdWellType { get; set; }
+
+    /// <summary>
+    /// ID куста
+    /// </summary>
+    public int IdCluster { get; set; }
+
+    /// <summary>
+    /// 0 - неизвестно,
+    /// 1 - в работе,
+    /// 2 - завершена
+    /// </summary>
+    [Range(0, 2, ErrorMessage = "Текущее состояние работы скважины указано неправильно.")]
+    public int IdState { get; set; }
+
+    /// <summary>
+    /// Дата/время первой операции
+    /// </summary>
+    public DateTimeOffset? StartDate { get; set; }
+
+    /// <summary>
+    /// Дата/время кода приходили данные последний раз
+    /// </summary>
+    public DateTimeOffset LastTelemetryDate { get; set; }
+
+    /// <summary>
+    /// ID телеметрии
+    /// </summary>
+    public int? IdTelemetry { get; set; }
+
+    /// <summary>
+    /// Объект телеметрии (инфо от панели оператора)
+    /// </summary>
+    public TelemetryBaseDto? Telemetry { get; set; }
+
+    /// <summary>
+    /// Компании участвующие в работах на скважине
+    /// </summary>
+    public IEnumerable<CompanyDto> Companies { get; set; } = Enumerable.Empty<CompanyDto>();
 }
diff --git a/AsbCloudApp/Data/WellFinalDocumentDBDto.cs b/AsbCloudApp/Data/WellFinalDocumentDBDto.cs
index d69c793e..eae27862 100644
--- a/AsbCloudApp/Data/WellFinalDocumentDBDto.cs
+++ b/AsbCloudApp/Data/WellFinalDocumentDBDto.cs
@@ -1,23 +1,22 @@
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO Дело скважины
+/// </summary>
+public class WellFinalDocumentDBDto
 {
     /// <summary>
-    /// DTO Дело скважины
+    /// Идентификатор скважины
     /// </summary>
-    public class WellFinalDocumentDBDto
-    {
-        /// <summary>
-        /// Идентификатор скважины
-        /// </summary>
-        public int IdWell { get; set; }
+    public int IdWell { get; set; }
 
-        /// <summary>
-        /// Идентификатор ответственного
-        /// </summary>
-        public int IdUser { get; set; }
+    /// <summary>
+    /// Идентификатор ответственного
+    /// </summary>
+    public int IdUser { get; set; }
 
-        /// <summary>
-        /// Идентификатор категории файла
-        /// </summary>
-        public int IdCategory { get; set; }
-    }
+    /// <summary>
+    /// Идентификатор категории файла
+    /// </summary>
+    public int IdCategory { get; set; }
 }
diff --git a/AsbCloudApp/Data/WellFinalDocumentDto.cs b/AsbCloudApp/Data/WellFinalDocumentDto.cs
index 7fe90b6a..f507bbf0 100644
--- a/AsbCloudApp/Data/WellFinalDocumentDto.cs
+++ b/AsbCloudApp/Data/WellFinalDocumentDto.cs
@@ -3,45 +3,44 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using AsbCloudApp.Data.User;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO Документ дела скважины
+/// </summary>
+public class WellFinalDocumentDto
 {
     /// <summary>
-    /// DTO Документ дела скважины
+    /// Идентификатор категории файла
     /// </summary>
-    public class WellFinalDocumentDto
-    {
-        /// <summary>
-        /// Идентификатор категории файла
-        /// </summary>
-        [Required]
-        public int IdCategory { get; set; }
+    [Required]
+    public int IdCategory { get; set; }
 
-        /// <summary>
-        /// Наименование категории файла
-        /// </summary>
-        public string NameCategory { get; set; } = string.Empty;
+    /// <summary>
+    /// Наименование категории файла
+    /// </summary>
+    public string NameCategory { get; set; } = string.Empty;
 
-        /// <summary>
-        /// Разрешение для текущего пользователя загружать документ
-        /// </summary>
-        [Required]
-        public bool PermissionToUpload { get; set; } = false;
+    /// <summary>
+    /// Разрешение для текущего пользователя загружать документ
+    /// </summary>
+    [Required]
+    public bool PermissionToUpload { get; set; } = false;
 
-        /// <summary>
-        /// Список ответственных
-        /// </summary>
-        [Required]
-        public IEnumerable<UserDto> Publishers { get; set; } = Enumerable.Empty<UserDto>();
+    /// <summary>
+    /// Список ответственных
+    /// </summary>
+    [Required]
+    public IEnumerable<UserDto> Publishers { get; set; } = Enumerable.Empty<UserDto>();
 
-        /// <summary>
-        /// Количество файлов этой категории загруженных ранее
-        /// </summary>
-        [Required]
-        public int FilesCount { get; set; }
+    /// <summary>
+    /// Количество файлов этой категории загруженных ранее
+    /// </summary>
+    [Required]
+    public int FilesCount { get; set; }
 
-        /// <summary>
-        /// Актуальный файл
-        /// </summary>
-        public FileInfoDto? File { get; set; }
-    }
+    /// <summary>
+    /// Актуальный файл
+    /// </summary>
+    public FileInfoDto? File { get; set; }
 }
diff --git a/AsbCloudApp/Data/WellFinalDocumentInputDto.cs b/AsbCloudApp/Data/WellFinalDocumentInputDto.cs
index 82e2072d..1da39906 100644
--- a/AsbCloudApp/Data/WellFinalDocumentInputDto.cs
+++ b/AsbCloudApp/Data/WellFinalDocumentInputDto.cs
@@ -2,23 +2,22 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO Для сохранения категорий дела скважины
+/// </summary>
+public class WellFinalDocumentInputDto
 {
     /// <summary>
-    /// DTO Для сохранения категорий дела скважины
+    /// Идентификатор категории файла
     /// </summary>
-    public class WellFinalDocumentInputDto
-    {
-        /// <summary>
-        /// Идентификатор категории файла
-        /// </summary>
-        [Required]
-        public int IdCategory { get; set; }
+    [Required]
+    public int IdCategory { get; set; }
 
-        /// <summary>
-        /// Список ответственных
-        /// </summary>
-        [Required]
-        public IEnumerable<int> IdsPublishers { get; set; } = Enumerable.Empty<int>();
-    }
+    /// <summary>
+    /// Список ответственных
+    /// </summary>
+    [Required]
+    public IEnumerable<int> IdsPublishers { get; set; } = Enumerable.Empty<int>();
 }
diff --git a/AsbCloudApp/Data/WellFinalDocumentsHistoryDto.cs b/AsbCloudApp/Data/WellFinalDocumentsHistoryDto.cs
index b69bb415..0e2239a3 100644
--- a/AsbCloudApp/Data/WellFinalDocumentsHistoryDto.cs
+++ b/AsbCloudApp/Data/WellFinalDocumentsHistoryDto.cs
@@ -1,29 +1,28 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// DTO Дело скважины, история файлов
+/// </summary>
+public class WellFinalDocumentsHistoryDto
 {
     /// <summary>
-    /// DTO Дело скважины, история файлов
+    /// Вышка
     /// </summary>
-    public class WellFinalDocumentsHistoryDto
-    {
-        /// <summary>
-        /// Вышка
-        /// </summary>
-        [Required]
-        public int IdWell { get; set; }
+    [Required]
+    public int IdWell { get; set; }
 
-        /// <summary>
-        /// Наименование категории файла
-        /// </summary>
-        [Required]
-        public int IdCategory { get; set; }
+    /// <summary>
+    /// Наименование категории файла
+    /// </summary>
+    [Required]
+    public int IdCategory { get; set; }
 
-        /// <summary>
-        /// Файлы
-        /// </summary>
-        [Required]
-        public IEnumerable<FileInfoDto> Files { get; set; } = null!;
-    }
+    /// <summary>
+    /// Файлы
+    /// </summary>
+    [Required]
+    public IEnumerable<FileInfoDto> Files { get; set; } = null!;
 }
diff --git a/AsbCloudApp/Data/WellInfoDto.cs b/AsbCloudApp/Data/WellInfoDto.cs
index 58ce537d..3d85ad48 100644
--- a/AsbCloudApp/Data/WellInfoDto.cs
+++ b/AsbCloudApp/Data/WellInfoDto.cs
@@ -1,29 +1,28 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// базовая информация о скважине
+/// </summary>
+public class WellInfoDto: IId
 {
+    /// <inheritdoc/>
+    public int Id { get; set; }
+
     /// <summary>
-    /// базовая информация о скважине
+    /// Название
     /// </summary>
-    public class WellInfoDto: IId
-    {
-        /// <inheritdoc/>
-        public int Id { get; set; }
+    [Required]
+    public string Caption { get; set; } = null!;
 
-        /// <summary>
-        /// Название
-        /// </summary>
-        [Required]
-        public string Caption { get; set; } = null!;
+    /// <summary>
+    /// Название куста
+    /// </summary>
+    public string? Cluster { get; set; }
 
-        /// <summary>
-        /// Название куста
-        /// </summary>
-        public string? Cluster { get; set; }
-
-        /// <summary>
-        /// Название месторождения
-        /// </summary>
-        public string? Deposit { get; set; }
-    }
+    /// <summary>
+    /// Название месторождения
+    /// </summary>
+    public string? Deposit { get; set; }
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/WellMapInfoDto.cs b/AsbCloudApp/Data/WellMapInfoDto.cs
index 2b49ad3f..49e3d57f 100644
--- a/AsbCloudApp/Data/WellMapInfoDto.cs
+++ b/AsbCloudApp/Data/WellMapInfoDto.cs
@@ -3,142 +3,141 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AsbCloudApp.Data
+namespace AsbCloudApp.Data;
+
+/// <summary>
+/// Инфо о скважине для отображения на карте последними данными телеметрии
+/// </summary>
+public class WellMapInfoWithTelemetryStat : WellMapInfoDto
 {
     /// <summary>
-    /// Инфо о скважине для отображения на карте последними данными телеметрии
+    /// Последние полученные данные от АПД
     /// </summary>
-    public class WellMapInfoWithTelemetryStat : WellMapInfoDto
-    {
-        /// <summary>
-        /// Последние полученные данные от АПД
-        /// </summary>
-        public TelemetryDataSaubDto? LastDataSaub { get; set; }
-
-        /// <summary>
-        /// Последние полученные данные от Осцилляции
-        /// </summary>
-        public TelemetryDataSpinDto? LastDataSpin { get; set; }
-
-        /// <summary>
-        /// Дата полседнего получения данных от ННБ
-        /// </summary>
-        public DateTime? LastDataDdsDate { get; set; }
-
-        /// <summary>
-        /// Дата полседнего получения данных от ГТИ
-        /// </summary>
-        public DateTime? LastDataGtrDate { get; set; }
-
-        /// <summary>
-        /// Дата полседнего получения данных от СКПБ
-        /// </summary>
-        public DateTime? LastDataDpcsDate { get; set; }
-
-        /// <summary>
-        /// Дата полседнего получения данных от станции контроля параметров цементирования (СКЦ)
-        /// </summary>
-        public DateTime? LastDataCpmsDate { get; set; }
-
-        /// <summary>
-        /// Компании
-        /// </summary>
-        public IEnumerable<CompanyDto> Companies { get; set; } = Enumerable.Empty<CompanyDto>();
-    }
+    public TelemetryDataSaubDto? LastDataSaub { get; set; }
 
     /// <summary>
-    /// Инфо о скважине для отображения на карте
+    /// Последние полученные данные от Осцилляции
     /// </summary>
-    public class WellMapInfoDto: MapPointBaseDto
-    {
-        /// <summary>
-        /// 0 - неизвестно,
-        /// 1 - в работе,
-        /// 2 - завершена
-        /// </summary>
-        public int IdState { get; set; }
-        
-        /// <summary>
-        /// Название текущей секции
-        /// </summary>
-        public string? Section { get; set; }
+    public TelemetryDataSpinDto? LastDataSpin { get; set; }
 
-        /// <summary>
-        /// Коэф-т использования автоподачи долота (суммарный ротор + слайд)
-        /// </summary>
-        public double SaubUsage { get; set; }
+    /// <summary>
+    /// Дата полседнего получения данных от ННБ
+    /// </summary>
+    public DateTime? LastDataDdsDate { get; set; }
 
-        /// <summary>
-        /// Коэф-т использования осциллятора
-        /// </summary>
-        public double SpinUsage { get; set; }
+    /// <summary>
+    /// Дата полседнего получения данных от ГТИ
+    /// </summary>
+    public DateTime? LastDataGtrDate { get; set; }
 
-        /// <summary>
-        /// Коэф-т использования демпфера
-        /// </summary>
-        public double TorqueKUsage { get; set; }
+    /// <summary>
+    /// Дата полседнего получения данных от СКПБ
+    /// </summary>
+    public DateTime? LastDataDpcsDate { get; set; }
 
-        /// <summary>
-        /// <para>Дата начала первой фактической операции</para>
-        /// <para>Используется как дата начала бурения</para>
-        /// </summary>
-        public DateTimeOffset? FirstFactOperationDateStart { get; set; }
+    /// <summary>
+    /// Дата полседнего получения данных от станции контроля параметров цементирования (СКЦ)
+    /// </summary>
+    public DateTime? LastDataCpmsDate { get; set; }
 
-        /// <summary>
-        /// <para>Дата окончания последней прогнозируемой операции</para>
-        /// <para>Если скважина завершена, то дата окончания последней фактической операции</para>
-        /// <para>Используется как прогноз окончания бурения</para>
-        /// </summary>
-        public DateTimeOffset? LastPredictOperationDateEnd { get; set; }
-
-        /// <summary>
-        /// Рейсовая скорость проходки, последнего рейса
-        /// </summary>
-        public PlanFactDto<double?> RaceSpeed { get; set; } = null!;
-
-        /// <summary>
-        /// Механическая скорость проходки, последней операции бурения
-        /// </summary>
-        public PlanFactDto<double?> ROP { get; set; } = null!;
-
-        /// <summary>
-        /// Нагрузка на долота, Т 
-        /// </summary>
-        public PlanFactDto<double?> AxialLoad { get; set; } = null!;
-
-        /// <summary>
-        /// Обороты ротора
-        /// </summary>
-        public PlanFactDto<double?> TopDriveSpeed { get; set; } = null!;
-
-        /// <summary>
-        /// Момент ротора кн/м
-        /// </summary>
-        public PlanFactDto<double?> TopDriveTorque { get; set; } = null!;
-
-        /// <summary>
-        /// Перепад давления
-        /// </summary>
-        public PlanFactDto<double?> Pressure { get; set; } = null!;
-        
-        /// <summary>
-        /// Действующее задание давления, атм
-        /// </summary>
-        public double? PressureSp { get; set; }
-
-        /// <summary>
-        /// Плановая и текущая глубина
-        /// </summary>
-        public PlanFactDto<double?> WellDepth { get; set; } = null!;
-
-        /// <summary>
-        /// Отставание от ГГД, дни
-        /// </summary>
-        public double? TvdLagDays { get; set; }
-        
-        /// <summary>
-        /// Кол-во дней бурения по ГГД
-        /// </summary>
-        public double? TvdDrillingDays { get; set; }
-    }
+    /// <summary>
+    /// Компании
+    /// </summary>
+    public IEnumerable<CompanyDto> Companies { get; set; } = Enumerable.Empty<CompanyDto>();
+}
+
+/// <summary>
+/// Инфо о скважине для отображения на карте
+/// </summary>
+public class WellMapInfoDto: MapPointBaseDto
+{
+    /// <summary>
+    /// 0 - неизвестно,
+    /// 1 - в работе,
+    /// 2 - завершена
+    /// </summary>
+    public int IdState { get; set; }
+    
+    /// <summary>
+    /// Название текущей секции
+    /// </summary>
+    public string? Section { get; set; }
+
+    /// <summary>
+    /// Коэф-т использования автоподачи долота (суммарный ротор + слайд)
+    /// </summary>
+    public double SaubUsage { get; set; }
+
+    /// <summary>
+    /// Коэф-т использования осциллятора
+    /// </summary>
+    public double SpinUsage { get; set; }
+
+    /// <summary>
+    /// Коэф-т использования демпфера
+    /// </summary>
+    public double TorqueKUsage { get; set; }
+
+    /// <summary>
+    /// <para>Дата начала первой фактической операции</para>
+    /// <para>Используется как дата начала бурения</para>
+    /// </summary>
+    public DateTimeOffset? FirstFactOperationDateStart { get; set; }
+
+    /// <summary>
+    /// <para>Дата окончания последней прогнозируемой операции</para>
+    /// <para>Если скважина завершена, то дата окончания последней фактической операции</para>
+    /// <para>Используется как прогноз окончания бурения</para>
+    /// </summary>
+    public DateTimeOffset? LastPredictOperationDateEnd { get; set; }
+
+    /// <summary>
+    /// Рейсовая скорость проходки, последнего рейса
+    /// </summary>
+    public PlanFactDto<double?> RaceSpeed { get; set; } = null!;
+
+    /// <summary>
+    /// Механическая скорость проходки, последней операции бурения
+    /// </summary>
+    public PlanFactDto<double?> ROP { get; set; } = null!;
+
+    /// <summary>
+    /// Нагрузка на долота, Т 
+    /// </summary>
+    public PlanFactDto<double?> AxialLoad { get; set; } = null!;
+
+    /// <summary>
+    /// Обороты ротора
+    /// </summary>
+    public PlanFactDto<double?> TopDriveSpeed { get; set; } = null!;
+
+    /// <summary>
+    /// Момент ротора кн/м
+    /// </summary>
+    public PlanFactDto<double?> TopDriveTorque { get; set; } = null!;
+
+    /// <summary>
+    /// Перепад давления
+    /// </summary>
+    public PlanFactDto<double?> Pressure { get; set; } = null!;
+    
+    /// <summary>
+    /// Действующее задание давления, атм
+    /// </summary>
+    public double? PressureSp { get; set; }
+
+    /// <summary>
+    /// Плановая и текущая глубина
+    /// </summary>
+    public PlanFactDto<double?> WellDepth { get; set; } = null!;
+
+    /// <summary>
+    /// Отставание от ГГД, дни
+    /// </summary>
+    public double? TvdLagDays { get; set; }
+    
+    /// <summary>
+    /// Кол-во дней бурения по ГГД
+    /// </summary>
+    public double? TvdDrillingDays { get; set; }
 }
diff --git a/AsbCloudApp/Data/WellOperation/WellOperationCategoryDto.cs b/AsbCloudApp/Data/WellOperation/WellOperationCategoryDto.cs
index 46e7dbe5..176d8596 100644
--- a/AsbCloudApp/Data/WellOperation/WellOperationCategoryDto.cs
+++ b/AsbCloudApp/Data/WellOperation/WellOperationCategoryDto.cs
@@ -1,38 +1,37 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.WellOperation
+namespace AsbCloudApp.Data.WellOperation;
+
+/// <summary>
+/// DTO категория операции
+/// </summary>
+public class WellOperationCategoryDto : IId
 {
+    /// <inheritdoc/>
+    [Required]
+    public int Id { get; set; }
+
     /// <summary>
-    /// DTO категория операции
+    /// название 
     /// </summary>
-    public class WellOperationCategoryDto : IId
-    {
-        /// <inheritdoc/>
-        [Required]
-        public int Id { get; set; }
+    [Required]
+    [StringLength(512)]
+    public string Name { get; set; } = null!;
 
-        /// <summary>
-        /// название 
-        /// </summary>
-        [Required]
-        [StringLength(512)]
-        public string Name { get; set; } = null!;
+    /// <summary>
+    /// Идентификатор родительской категории 
+    /// </summary>
+    public int? IdParent { get; set; }
 
-        /// <summary>
-        /// Идентификатор родительской категории 
-        /// </summary>
-        public int? IdParent { get; set; }
+    /// <summary>
+    /// Название ключевого показателя операции
+    /// </summary>
+    [StringLength(32)]
+    public string? KeyValueName { get; set; }
 
-        /// <summary>
-        /// Название ключевого показателя операции
-        /// </summary>
-        [StringLength(32)]
-        public string? KeyValueName { get; set; }
-
-        /// <summary>
-        /// Единицы измерения ключевого показателя операции
-        /// </summary>
-        [StringLength(16)]
-        public string? KeyValueUnits { get; set; }
-    }
+    /// <summary>
+    /// Единицы измерения ключевого показателя операции
+    /// </summary>
+    [StringLength(16)]
+    public string? KeyValueUnits { get; set; }
 }
diff --git a/AsbCloudApp/Exceptions/ArgumentInvalidException.cs b/AsbCloudApp/Exceptions/ArgumentInvalidException.cs
index 93c37fa7..d0f3a316 100644
--- a/AsbCloudApp/Exceptions/ArgumentInvalidException.cs
+++ b/AsbCloudApp/Exceptions/ArgumentInvalidException.cs
@@ -2,41 +2,40 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AsbCloudApp.Exceptions
+namespace AsbCloudApp.Exceptions;
+
+/// <summary>
+/// Argument validation fail Exception 
+/// </summary>
+public class ArgumentInvalidException : Exception
 {
     /// <summary>
-    /// Argument validation fail Exception 
+    /// словарь с ошибками, где ключ - имя аргумента, а значение - массив из одного сообщения
     /// </summary>
-    public class ArgumentInvalidException : Exception
+    public IDictionary<string, string[]> ErrorState { get; } = null!;
+
+    // TODO: swap arguments, inherit from ArgumentException
+    /// <summary>
+    /// конструктор
+    /// </summary>
+    /// <param name="paramName"></param>
+    /// <param name="message"></param>
+    public ArgumentInvalidException(string paramName, string message)
+        : base(message)
     {
-        /// <summary>
-        /// словарь с ошибками, где ключ - имя аргумента, а значение - массив из одного сообщения
-        /// </summary>
-        public IDictionary<string, string[]> ErrorState { get; } = null!;
+        ErrorState = new Dictionary<string, string[]>() {
+            { paramName, new[]{ message } }
+        };
+    }
 
-        // TODO: swap arguments, inherit from ArgumentException
-        /// <summary>
-        /// конструктор
-        /// </summary>
-        /// <param name="paramName"></param>
-        /// <param name="message"></param>
-        public ArgumentInvalidException(string paramName, string message)
-            : base(message)
-        {
-            ErrorState = new Dictionary<string, string[]>() {
-                { paramName, new[]{ message } }
-            };
-        }
-
-        /// <summary>
-        /// конструктор
-        /// </summary>
-        /// <param name="paramsNames"></param>
-        /// <param name="message"></param>
-        public ArgumentInvalidException(string[] paramsNames, string message)
-            : base(message)
-        {
-            ErrorState = paramsNames.ToDictionary(paramName => paramName, item => new[] { message });
-        }
+    /// <summary>
+    /// конструктор
+    /// </summary>
+    /// <param name="paramsNames"></param>
+    /// <param name="message"></param>
+    public ArgumentInvalidException(string[] paramsNames, string message)
+        : base(message)
+    {
+        ErrorState = paramsNames.ToDictionary(paramName => paramName, item => new[] { message });
     }
 }
diff --git a/AsbCloudApp/Exceptions/ForbidException.cs b/AsbCloudApp/Exceptions/ForbidException.cs
index daad3d49..79dda311 100644
--- a/AsbCloudApp/Exceptions/ForbidException.cs
+++ b/AsbCloudApp/Exceptions/ForbidException.cs
@@ -1,23 +1,22 @@
 using System;
 
-namespace AsbCloudApp.Exceptions
+namespace AsbCloudApp.Exceptions;
+
+/// <summary>
+/// Access denied exception
+/// </summary>
+public class ForbidException : Exception
 {
     /// <summary>
     /// Access denied exception
     /// </summary>
-    public class ForbidException : Exception
-    {
-        /// <summary>
-        /// Access denied exception
-        /// </summary>
-        public ForbidException()
-            : base() { }
+    public ForbidException()
+        : base() { }
 
-        /// <summary>
-        /// Access denied exception
-        /// </summary>
-        public ForbidException(string message)
-            : base(message) { }
+    /// <summary>
+    /// Access denied exception
+    /// </summary>
+    public ForbidException(string message)
+        : base(message) { }
 
-    }
 }
diff --git a/AsbCloudApp/Extensions/ChangeLogExtensions.cs b/AsbCloudApp/Extensions/ChangeLogExtensions.cs
index 32b636ed..a9a82135 100644
--- a/AsbCloudApp/Extensions/ChangeLogExtensions.cs
+++ b/AsbCloudApp/Extensions/ChangeLogExtensions.cs
@@ -6,28 +6,27 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Extensions
+namespace AsbCloudApp.Extensions;
+
+/// <summary>
+/// Расширения для поиска в истории
+/// </summary>
+public static class ChangeLogExtensions
 {
     /// <summary>
-    /// Расширения для поиска в истории
+    /// Действительные на момент времени значения
     /// </summary>
-    public static class ChangeLogExtensions
+    /// <typeparam name="T"></typeparam>
+    /// <param name="items"></param>
+    /// <param name="moment"></param>
+    /// <returns></returns>
+    public static IEnumerable<ChangeLogDto<T>> WhereActualAtMoment<T>(this IEnumerable<ChangeLogDto<T>> items, DateTimeOffset moment)
+        where T : IId
     {
-        /// <summary>
-        /// Действительные на момент времени значения
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="items"></param>
-        /// <param name="moment"></param>
-        /// <returns></returns>
-        public static IEnumerable<ChangeLogDto<T>> WhereActualAtMoment<T>(this IEnumerable<ChangeLogDto<T>> items, DateTimeOffset moment)
-            where T : IId
-        {
-            var actualItems = items
-                .Where(item => item.Creation <= moment)
-                .Where(item => item.Obsolete is null || item.Obsolete >= moment);
+        var actualItems = items
+            .Where(item => item.Creation <= moment)
+            .Where(item => item.Obsolete is null || item.Obsolete >= moment);
 
-            return actualItems;
-        }
+        return actualItems;
     }
 }
diff --git a/AsbCloudApp/Repositories/IDataSaubStatRepository.cs b/AsbCloudApp/Repositories/IDataSaubStatRepository.cs
index b25675c7..d419ad82 100644
--- a/AsbCloudApp/Repositories/IDataSaubStatRepository.cs
+++ b/AsbCloudApp/Repositories/IDataSaubStatRepository.cs
@@ -5,37 +5,36 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// Репозиторий работы с данными из таблицы t_data_daub_stat
+/// </summary>
+public interface IDataSaubStatRepository : ITelemetryDataEditorService
 {
     /// <summary>
-    /// Репозиторий работы с данными из таблицы t_data_daub_stat
+    /// Получение записей по ключу телеметрии
     /// </summary>
-    public interface IDataSaubStatRepository : ITelemetryDataEditorService
-    {
-        /// <summary>
-        /// Получение записей по ключу телеметрии
-        /// </summary>
-        /// <param name="idTelemetry">ключ телеметрии</param>
-        /// <param name="geDate">начальная дата</param>
-        /// <param name="leDate">конечная дата</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<DataSaubStatDto>> GetAsync(int idTelemetry, DateTimeOffset geDate, DateTimeOffset leDate, CancellationToken token);
+    /// <param name="idTelemetry">ключ телеметрии</param>
+    /// <param name="geDate">начальная дата</param>
+    /// <param name="leDate">конечная дата</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<DataSaubStatDto>> GetAsync(int idTelemetry, DateTimeOffset geDate, DateTimeOffset leDate, CancellationToken token);
 
-        /// <summary>
-        /// Получение последних по дате окончания бурения записей в разрезе телеметрий
-        /// </summary>
-        /// <param name="idTelemetries">ключи телеметрий</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<DataSaubStatDto>> GetLastsAsync(int[] idTelemetries, CancellationToken token);
+    /// <summary>
+    /// Получение последних по дате окончания бурения записей в разрезе телеметрий
+    /// </summary>
+    /// <param name="idTelemetries">ключи телеметрий</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<DataSaubStatDto>> GetLastsAsync(int[] idTelemetries, CancellationToken token);
 
-        /// <summary>
-        /// Вставка записей статистики
-        /// </summary>
-        /// <param name="dataSaubStats"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> InsertRangeAsync(IEnumerable<DataSaubStatDto> dataSaubStats, CancellationToken token);
-    }
+    /// <summary>
+    /// Вставка записей статистики
+    /// </summary>
+    /// <param name="dataSaubStats"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> InsertRangeAsync(IEnumerable<DataSaubStatDto> dataSaubStats, CancellationToken token);
 }
diff --git a/AsbCloudApp/Repositories/IDepositRepository.cs b/AsbCloudApp/Repositories/IDepositRepository.cs
index 4185c9e3..dc1f3833 100644
--- a/AsbCloudApp/Repositories/IDepositRepository.cs
+++ b/AsbCloudApp/Repositories/IDepositRepository.cs
@@ -3,31 +3,30 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// Сервис информации о кустах
+/// </summary>
+public interface IDepositRepository
 {
     /// <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);
+    /// <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="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="depositId"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<ClusterDto>> GetClustersAsync(int idCompany,
+        int depositId, CancellationToken token);
 
-    }
 }
diff --git a/AsbCloudApp/Repositories/IDrillTestRepository.cs b/AsbCloudApp/Repositories/IDrillTestRepository.cs
index d7b5d1b7..20fc28b6 100644
--- a/AsbCloudApp/Repositories/IDrillTestRepository.cs
+++ b/AsbCloudApp/Repositories/IDrillTestRepository.cs
@@ -5,38 +5,37 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// репозиторий по работе с данными drill_test
+/// </summary>
+public interface IDrillTestRepository : ITelemetryDataEditorService
 {
     /// <summary>
-    /// репозиторий по работе с данными drill_test
+    /// Получить данные drill_test в соответствии с параметрами запроса
     /// </summary>
-    public interface IDrillTestRepository : ITelemetryDataEditorService
-    {
-        /// <summary>
-        /// Получить данные drill_test в соответствии с параметрами запроса
-        /// </summary>
-        /// <param name="idTelemetry">ключ телеметрии</param>
-        /// <param name="request">запрос</param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task<IEnumerable<DrillTestDto>> GetAllAsync(int idTelemetry, FileReportRequest request, CancellationToken cancellationToken);
+    /// <param name="idTelemetry">ключ телеметрии</param>
+    /// <param name="request">запрос</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<IEnumerable<DrillTestDto>> GetAllAsync(int idTelemetry, FileReportRequest request, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Получить запись drill_test
-        /// </summary>
-        /// <param name="idTelemetry">ключ телеметрии</param>
-        /// <param name="id">ключ записи drill_test</param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task<DrillTestDto> GetAsync(int idTelemetry, int id, CancellationToken cancellationToken);
+    /// <summary>
+    /// Получить запись drill_test
+    /// </summary>
+    /// <param name="idTelemetry">ключ телеметрии</param>
+    /// <param name="id">ключ записи drill_test</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<DrillTestDto> GetAsync(int idTelemetry, int id, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Сохранить данные drill_test
-        /// </summary>
-        /// <param name="idTelemetry">ключ телеметрии</param>
-        /// <param name="dtos">записи drill test</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> SaveDataAsync(int idTelemetry, IEnumerable<DrillTestBaseDto> dtos, CancellationToken token);
-    }
+    /// <summary>
+    /// Сохранить данные drill_test
+    /// </summary>
+    /// <param name="idTelemetry">ключ телеметрии</param>
+    /// <param name="dtos">записи drill test</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> SaveDataAsync(int idTelemetry, IEnumerable<DrillTestBaseDto> dtos, CancellationToken token);
 }
diff --git a/AsbCloudApp/Repositories/IFaqRepository.cs b/AsbCloudApp/Repositories/IFaqRepository.cs
index f4079159..0df1b1e9 100644
--- a/AsbCloudApp/Repositories/IFaqRepository.cs
+++ b/AsbCloudApp/Repositories/IFaqRepository.cs
@@ -5,61 +5,60 @@ using System.Threading;
 using AsbCloudApp.Requests;
 using AsbCloudApp.Services;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// репозиторий по работе с faq-вопросами
+/// </summary>
+public interface IFaqRepository 
 {
     /// <summary>
-    /// репозиторий по работе с faq-вопросами
+    /// Получить список вопросов
     /// </summary>
-    public interface IFaqRepository 
-    {
-        /// <summary>
-        /// Получить список вопросов
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<FaqDto>> GetFilteredAsync(FaqRequest request, CancellationToken token);
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<FaqDto>> GetFilteredAsync(FaqRequest request, CancellationToken token);
 
-        /// <summary>
-        /// Добавить вопрос
-        /// </summary>
-        /// <param name="faqDto"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> InsertAsync(FaqDto faqDto, CancellationToken token);
+    /// <summary>
+    /// Добавить вопрос
+    /// </summary>
+    /// <param name="faqDto"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> InsertAsync(FaqDto faqDto, CancellationToken token);
 
-        /// <summary>
-        /// Обновить существующий вопрос
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> UpdateAsync(FaqDto dto, CancellationToken token);
+    /// <summary>
+    /// Обновить существующий вопрос
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> UpdateAsync(FaqDto dto, CancellationToken token);
 
-        /// <summary>
-        /// Объединить 2 вопроса в 1
-        /// </summary>
-        /// <param name="sourceId1">ключ первого вопроса, подлежащего объединению</param>
-        /// <param name="sourceId2">ключ второго вопроса, подлежащего объединению</param>        
-        /// <param name="mergeQuestions">Флаг, объединять текст вопросов или нет</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> MergeAsync(int sourceId1, int sourceId2, bool mergeQuestions, CancellationToken token);
+    /// <summary>
+    /// Объединить 2 вопроса в 1
+    /// </summary>
+    /// <param name="sourceId1">ключ первого вопроса, подлежащего объединению</param>
+    /// <param name="sourceId2">ключ второго вопроса, подлежащего объединению</param>        
+    /// <param name="mergeQuestions">Флаг, объединять текст вопросов или нет</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> MergeAsync(int sourceId1, int sourceId2, bool mergeQuestions, CancellationToken token);
 
-        /// <summary>
-        /// Пометить вопрос по id как удаленный
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> MarkAsDeletedAsync(int id, CancellationToken token);
+    /// <summary>
+    /// Пометить вопрос по id как удаленный
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> MarkAsDeletedAsync(int id, CancellationToken token);
 
-        /// <summary>
-        /// Удалить вопрос по ключу
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> DeleteAsync(int id, CancellationToken token);
-    }
+    /// <summary>
+    /// Удалить вопрос по ключу
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> DeleteAsync(int id, CancellationToken token);
 }
diff --git a/AsbCloudApp/Repositories/IFileRepository.cs b/AsbCloudApp/Repositories/IFileRepository.cs
index 7ed4d574..c75ad977 100644
--- a/AsbCloudApp/Repositories/IFileRepository.cs
+++ b/AsbCloudApp/Repositories/IFileRepository.cs
@@ -5,77 +5,76 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// Сервис доступа к файлам
+/// </summary>
+public interface IFileRepository : ICrudRepository<FileInfoDto>
 {
     /// <summary>
-    /// Сервис доступа к файлам
+    /// Получение файлов по скважине
     /// </summary>
-    public interface IFileRepository : ICrudRepository<FileInfoDto>
-    {
-        /// <summary>
-        /// Получение файлов по скважине
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<FileInfoDto>> GetInfosAsync(FileRequest request, CancellationToken token);
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<FileInfoDto>> GetInfosAsync(FileRequest request, CancellationToken token);
 
-        /// <summary>
-        /// Получить список файлов в контейнере
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<PaginationContainer<FileInfoDto>> GetInfosPaginatedAsync(FileRequest request, CancellationToken token = default);
+    /// <summary>
+    /// Получить список файлов в контейнере
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<PaginationContainer<FileInfoDto>> GetInfosPaginatedAsync(FileRequest request, CancellationToken token = default);
 
-        /// <summary>
-        /// Пометить файл как удаленный
-        /// </summary>
-        /// <param name="idFile"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> MarkAsDeletedAsync(int idFile, CancellationToken token = default);
+    /// <summary>
+    /// Пометить файл как удаленный
+    /// </summary>
+    /// <param name="idFile"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> MarkAsDeletedAsync(int idFile, CancellationToken token = default);
 
-        /// <summary>
-        /// удалить файлы
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<FileInfoDto>> DeleteAsync(IEnumerable<int> ids, CancellationToken token);
+    /// <summary>
+    /// удалить файлы
+    /// </summary>
+    /// <param name="ids"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<FileInfoDto>> DeleteAsync(IEnumerable<int> ids, CancellationToken token);
 
-        /// <summary>
-        /// получить инфо о файле по метке
-        /// </summary>
-        /// <param name="idMark"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<FileInfoDto> GetByMarkId(int idMark, CancellationToken token);
+    /// <summary>
+    /// получить инфо о файле по метке
+    /// </summary>
+    /// <param name="idMark"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<FileInfoDto> GetByMarkId(int idMark, CancellationToken token);
 
-        /// <summary>
-        /// добавить метку на файл
-        /// </summary>
-        /// <param name="fileMarkDto"></param>
-        /// <param name="idUser"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> CreateFileMarkAsync(FileMarkDto fileMarkDto, int idUser, CancellationToken token);
+    /// <summary>
+    /// добавить метку на файл
+    /// </summary>
+    /// <param name="fileMarkDto"></param>
+    /// <param name="idUser"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> CreateFileMarkAsync(FileMarkDto fileMarkDto, int idUser, CancellationToken token);
 
-        /// <summary>
-        /// Инфо о файлах
-        /// </summary>
-        /// <param name="idsFile"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<FileInfoDto>> GetInfoByIdsAsync(IEnumerable<int> idsFile, CancellationToken token);
+    /// <summary>
+    /// Инфо о файлах
+    /// </summary>
+    /// <param name="idsFile"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<FileInfoDto>> GetInfoByIdsAsync(IEnumerable<int> idsFile, CancellationToken token);
 
-        /// <summary>
-        /// пометить метки файлов как удаленные
-        /// </summary>
-        /// <param name="idsMarks"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> MarkFileMarkAsDeletedAsync(IEnumerable<int> idsMarks, CancellationToken token);
+    /// <summary>
+    /// пометить метки файлов как удаленные
+    /// </summary>
+    /// <param name="idsMarks"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> MarkFileMarkAsDeletedAsync(IEnumerable<int> idsMarks, CancellationToken token);
 
-    }
 }
diff --git a/AsbCloudApp/Repositories/IFileStorageRepository.cs b/AsbCloudApp/Repositories/IFileStorageRepository.cs
index 22635e52..99e0d86a 100644
--- a/AsbCloudApp/Repositories/IFileStorageRepository.cs
+++ b/AsbCloudApp/Repositories/IFileStorageRepository.cs
@@ -4,107 +4,106 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// Репозиторий хранения фалов
+/// </summary>
+public interface IFileStorageRepository
 {
+
     /// <summary>
-    /// Репозиторий хранения фалов
+    /// Получение длинны фала и проверка его наличия, если отсутствует падает исключение
     /// </summary>
-    public interface IFileStorageRepository
-    {
+    /// <param name="srcFilePath"></param>
+    /// <returns></returns>
+    long GetFileLength(string srcFilePath);
 
-        /// <summary>
-        /// Получение длинны фала и проверка его наличия, если отсутствует падает исключение
-        /// </summary>
-        /// <param name="srcFilePath"></param>
-        /// <returns></returns>
-        long GetFileLength(string srcFilePath);
+    /// <summary>
+    /// Перемещение файла
+    /// </summary>
+    /// <param name="srcFilePath"></param>
+    /// <param name="filePath"></param>
+    void MoveFile(string srcFilePath, string filePath);
 
-        /// <summary>
-        /// Перемещение файла
-        /// </summary>
-        /// <param name="srcFilePath"></param>
-        /// <param name="filePath"></param>
-        void MoveFile(string srcFilePath, string filePath);
+    /// <summary>
+    /// Копирование файла
+    /// </summary>
+    /// <param name="filePathRec"></param>
+    /// <param name="fileStreamSrc"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task SaveFileAsync(string filePathRec, Stream fileStreamSrc, CancellationToken token);
 
-        /// <summary>
-        /// Копирование файла
-        /// </summary>
-        /// <param name="filePathRec"></param>
-        /// <param name="fileStreamSrc"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task SaveFileAsync(string filePathRec, Stream fileStreamSrc, CancellationToken token);
+    /// <summary>
+    /// Удаление пачки файлов
+    /// </summary>
+    /// <param name="filesName"></param>
+    void DeleteFiles(IEnumerable<string> filesName);
 
-        /// <summary>
-        /// Удаление пачки файлов
-        /// </summary>
-        /// <param name="filesName"></param>
-        void DeleteFiles(IEnumerable<string> filesName);
+    /// <summary>
+    /// Удаление одного файла
+    /// </summary>
+    /// <param name="fileName"></param>
+    void DeleteFile(string fileName);
 
-        /// <summary>
-        /// Удаление одного файла
-        /// </summary>
-        /// <param name="fileName"></param>
-        void DeleteFile(string fileName);
+    /// <summary>
+    /// Удаление директории
+    /// </summary>
+    /// <param name="path"></param>
+    /// <param name="isRecursive"></param>
+    void DeleteDirectory(string path, bool isRecursive);
 
-        /// <summary>
-        /// Удаление директории
-        /// </summary>
-        /// <param name="path"></param>
-        /// <param name="isRecursive"></param>
-        void DeleteDirectory(string path, bool isRecursive);
+    /// <summary>
+    /// Удаление всех файлов с диска о которых нет информации в базе
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idsFiles"></param>
+    int DeleteFilesNotInList(int idWell, IEnumerable<int> idsFiles);
 
-        /// <summary>
-        /// Удаление всех файлов с диска о которых нет информации в базе
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idsFiles"></param>
-        int DeleteFilesNotInList(int idWell, IEnumerable<int> idsFiles);
+    /// <summary>
+    /// Вывод списка всех файлов из базы, для которых нет файла на диске
+    /// </summary>
+    /// <param name="files"></param>
+    /// <returns></returns>
+    IEnumerable<FileInfoDto> GetListFilesNotDisc(IEnumerable<FileInfoDto> files);
 
-        /// <summary>
-        /// Вывод списка всех файлов из базы, для которых нет файла на диске
-        /// </summary>
-        /// <param name="files"></param>
-        /// <returns></returns>
-        IEnumerable<FileInfoDto> GetListFilesNotDisc(IEnumerable<FileInfoDto> files);
+    /// <summary>
+    /// Создание пути для сохранения файла связанного со скважиной
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idCategory"></param>
+    /// <param name="fileFullName"></param>
+    /// <param name="fileId"></param>
+    /// <returns></returns>
+    string MakeFilePath(int idWell, int idCategory, string fileFullName, int fileId);
+    
+    /// <summary>
+    /// Создание пути для сохранения файла
+    /// </summary>
+    /// <param name="path1"></param>
+    /// <param name="path2"></param>
+    /// <param name="path3"></param>
+    /// <returns></returns>
+    string MakeFilePath(string path1, string path2, string path3);
 
-        /// <summary>
-        /// Создание пути для сохранения файла связанного со скважиной
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idCategory"></param>
-        /// <param name="fileFullName"></param>
-        /// <param name="fileId"></param>
-        /// <returns></returns>
-        string MakeFilePath(int idWell, int idCategory, string fileFullName, int fileId);
-        
-        /// <summary>
-        /// Создание пути для сохранения файла
-        /// </summary>
-        /// <param name="path1"></param>
-        /// <param name="path2"></param>
-        /// <param name="path3"></param>
-        /// <returns></returns>
-        string MakeFilePath(string path1, string path2, string path3);
-
-        /// <summary>
-        /// Получение пути к файлу связанного со скважиной
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idCategory"></param>
-        /// <param name="idFile"></param>
-        /// <param name="dotExtenstion"></param>
-        /// <returns></returns>
-        string GetFilePath(int idWell, int idCategory, int idFile, string dotExtenstion);
-        
-        /// <summary>
-        /// Получение пути файла лежащего на диске
-        /// </summary>
-        /// <param name="path1"></param>
-        /// <param name="path2"></param>
-        /// <param name="idFile"></param>
-        /// <param name="dotExtenstion"></param>
-        /// <returns></returns>
-        string GetFilePath(string path1, string path2, int idFile, string dotExtenstion);
-    }
+    /// <summary>
+    /// Получение пути к файлу связанного со скважиной
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idCategory"></param>
+    /// <param name="idFile"></param>
+    /// <param name="dotExtenstion"></param>
+    /// <returns></returns>
+    string GetFilePath(int idWell, int idCategory, int idFile, string dotExtenstion);
+    
+    /// <summary>
+    /// Получение пути файла лежащего на диске
+    /// </summary>
+    /// <param name="path1"></param>
+    /// <param name="path2"></param>
+    /// <param name="idFile"></param>
+    /// <param name="dotExtenstion"></param>
+    /// <returns></returns>
+    string GetFilePath(string path1, string path2, int idFile, string dotExtenstion);
 }
diff --git a/AsbCloudApp/Repositories/IGtrRepository.cs b/AsbCloudApp/Repositories/IGtrRepository.cs
index fcda4be2..64db4bf0 100644
--- a/AsbCloudApp/Repositories/IGtrRepository.cs
+++ b/AsbCloudApp/Repositories/IGtrRepository.cs
@@ -7,70 +7,69 @@ using AsbCloudApp.Requests;
 using AsbCloudApp.Data;
 using AsbCloudApp.Services;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// данные ГТИ
+/// </summary>
+public interface IGtrRepository : ITelemetryDataEditorService
 {
     /// <summary>
-    /// данные ГТИ
+    /// добавить данные (для панели бурильщика)
     /// </summary>
-    public interface IGtrRepository : ITelemetryDataEditorService
-    {
-        /// <summary>
-        /// добавить данные (для панели бурильщика)
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <param name="dtos"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task SaveDataAsync(int idTelemetry, IEnumerable<WitsRecordDto> dtos, CancellationToken token);
-        
-        /// <summary>
-        /// получить данные ГТИ
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<GtrWitsDto>> GetAsync(int idWell, GtrRequest request, CancellationToken token);
+    /// <param name="idTelemetry"></param>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task SaveDataAsync(int idTelemetry, IEnumerable<WitsRecordDto> dtos, CancellationToken token);
+    
+    /// <summary>
+    /// получить данные ГТИ
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<GtrWitsDto>> GetAsync(int idWell, GtrRequest request, CancellationToken token);
 
-        /// <summary>
-        /// получить  данные для клиента
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="dateBegin"></param>
-        /// <param name="intervalSec"></param>
-        /// <param name="approxPointsCount">кол-во элементов до которых эти данные прореживаются</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [Obsolete]
-        Task<IEnumerable<WitsRecordDto>> GetAsync(int idWell,
-            DateTime? dateBegin, double intervalSec = 600d,
-            int approxPointsCount = 1024, CancellationToken token = default);
+    /// <summary>
+    /// получить  данные для клиента
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="dateBegin"></param>
+    /// <param name="intervalSec"></param>
+    /// <param name="approxPointsCount">кол-во элементов до которых эти данные прореживаются</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [Obsolete]
+    Task<IEnumerable<WitsRecordDto>> GetAsync(int idWell,
+        DateTime? dateBegin, double intervalSec = 600d,
+        int approxPointsCount = 1024, CancellationToken token = default);
 
-        /// <summary>
-        /// получение последних данных ГТИ по record id
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idRecord"></param>
-        /// <returns></returns>
-        [Obsolete]
-        IEnumerable<WitsItemRecordDto> GetLastDataByRecordId(int idWell, int idRecord);
+    /// <summary>
+    /// получение последних данных ГТИ по record id
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idRecord"></param>
+    /// <returns></returns>
+    [Obsolete]
+    IEnumerable<WitsItemRecordDto> GetLastDataByRecordId(int idWell, int idRecord);
 
-        /// <summary>
-        /// Последние полученные параметры
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <returns></returns>
-        [Obsolete]
-        IEnumerable<WitsItemRecordDto> GetLastData(int idWell);
+    /// <summary>
+    /// Последние полученные параметры
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <returns></returns>
+    [Obsolete]
+    IEnumerable<WitsItemRecordDto> GetLastData(int idWell);
 
-        /// <summary>
-        /// Доступные даты по скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="geDate"></param>
-        /// <param name="leDate"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<DatesRangeDto?> GetRangeAsync(int idWell, DateTimeOffset? geDate, DateTimeOffset? leDate, CancellationToken token);
-    }
+    /// <summary>
+    /// Доступные даты по скважине
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="geDate"></param>
+    /// <param name="leDate"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<DatesRangeDto?> GetRangeAsync(int idWell, DateTimeOffset? geDate, DateTimeOffset? leDate, CancellationToken token);
 }
diff --git a/AsbCloudApp/Repositories/ILimitingParameterRepository.cs b/AsbCloudApp/Repositories/ILimitingParameterRepository.cs
index dcc2725a..c19ff9c1 100644
--- a/AsbCloudApp/Repositories/ILimitingParameterRepository.cs
+++ b/AsbCloudApp/Repositories/ILimitingParameterRepository.cs
@@ -5,30 +5,29 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// Репозиторий по ограничивающим параметрам с фильтрацией
+/// </summary>
+public interface ILimitingParameterRepository : ITelemetryDataEditorService
 {
     /// <summary>
-    /// Репозиторий по ограничивающим параметрам с фильтрацией
+    /// Получение списка ограничивающих параметров по идентификатору скважины
     /// </summary>
-    public interface ILimitingParameterRepository : ITelemetryDataEditorService
-    {
-        /// <summary>
-        /// Получение списка ограничивающих параметров по идентификатору скважины
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="wellDto"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<LimitingParameterDataDto>> GetLimitingParametersAsync(LimitingParameterRequest request, WellDto wellDto, CancellationToken token);
+    /// <param name="request"></param>
+    /// <param name="wellDto"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<LimitingParameterDataDto>> GetLimitingParametersAsync(LimitingParameterRequest request, WellDto wellDto, CancellationToken token);
 
-        /// <summary>
-        /// Получение списка ограничивающих параметров по идентификатору скважины
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="idTelemetry"></param>
-        /// <param name="timezoneHours"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<LimitingParameterDataDto>> GetLimitingParametersAsync(LimitingParameterRequest request, int idTelemetry, double timezoneHours, CancellationToken token);
-    }
+    /// <summary>
+    /// Получение списка ограничивающих параметров по идентификатору скважины
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="idTelemetry"></param>
+    /// <param name="timezoneHours"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<LimitingParameterDataDto>> GetLimitingParametersAsync(LimitingParameterRequest request, int idTelemetry, double timezoneHours, CancellationToken token);
 }
diff --git a/AsbCloudApp/Repositories/ITelemetryDataCache.cs b/AsbCloudApp/Repositories/ITelemetryDataCache.cs
index 0e4d83b1..a044c0a3 100644
--- a/AsbCloudApp/Repositories/ITelemetryDataCache.cs
+++ b/AsbCloudApp/Repositories/ITelemetryDataCache.cs
@@ -4,80 +4,79 @@ using AsbCloudInfrastructure.Services.SAUB;
 using System;
 using System.Collections.Generic;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// Хранилище кеша
+/// </summary>
+/// <typeparam name="TDto"></typeparam>
+public interface ITelemetryDataCache<TDto> where TDto : ITelemetryData
 {
     /// <summary>
-    /// Хранилище кеша
+    /// добавить в кеш чанк записей по телеметрии
     /// </summary>
-    /// <typeparam name="TDto"></typeparam>
-    public interface ITelemetryDataCache<TDto> where TDto : ITelemetryData
-    {
-        /// <summary>
-        /// добавить в кеш чанк записей по телеметрии
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <param name="range"></param>
-        void AddRange(int idTelemetry, IEnumerable<TDto> range);
+    /// <param name="idTelemetry"></param>
+    /// <param name="range"></param>
+    void AddRange(int idTelemetry, IEnumerable<TDto> range);
 
-        /// <summary>
-        /// вернуть последнюю запись
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <returns></returns>
-        TDto? GetLastOrDefault(int idTelemetry);
+    /// <summary>
+    /// вернуть последнюю запись
+    /// </summary>
+    /// <param name="idTelemetry"></param>
+    /// <returns></returns>
+    TDto? GetLastOrDefault(int idTelemetry);
 
-        /// <summary>
-        /// Получить кешированые записи
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <param name="dateBegin"></param>
-        /// <param name="intervalSec"></param>
-        /// <param name="approxPointsCount">приблизительное кол-во возвращаемых записей после их прореживания</param>
-        /// <returns></returns>
-        IEnumerable<TDto>? GetOrDefault(int idTelemetry, DateTime dateBegin, double intervalSec = 600, int approxPointsCount = 1024);
+    /// <summary>
+    /// Получить кешированые записи
+    /// </summary>
+    /// <param name="idTelemetry"></param>
+    /// <param name="dateBegin"></param>
+    /// <param name="intervalSec"></param>
+    /// <param name="approxPointsCount">приблизительное кол-во возвращаемых записей после их прореживания</param>
+    /// <returns></returns>
+    IEnumerable<TDto>? GetOrDefault(int idTelemetry, DateTime dateBegin, double intervalSec = 600, int approxPointsCount = 1024);
 
-        /// <summary>
-        /// Получить кешированые записи
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        IEnumerable<TDto>? GetOrDefault(int idTelemetry, TelemetryDataRequest request);
+    /// <summary>
+    /// Получить кешированые записи
+    /// </summary>
+    /// <param name="idTelemetry"></param>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    IEnumerable<TDto>? GetOrDefault(int idTelemetry, TelemetryDataRequest request);
 
-        /// <summary>
-        /// Диапазон дат находящийся в кеше
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <returns></returns>
-        DatesRangeDto? GetOrDefaultCachedDataDateRange(int idTelemetry);
+    /// <summary>
+    /// Диапазон дат находящийся в кеше
+    /// </summary>
+    /// <param name="idTelemetry"></param>
+    /// <returns></returns>
+    DatesRangeDto? GetOrDefaultCachedDataDateRange(int idTelemetry);
 
-        /// <summary>
-        /// Получить диапазон дат телеметрии.
-        /// Дата первой записи телеметрии храниться отдельно и запоняется при инициализации
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <returns></returns>
-        DatesRangeDto? GetOrDefaultWellDataDateRange(int idTelemetry);
+    /// <summary>
+    /// Получить диапазон дат телеметрии.
+    /// Дата первой записи телеметрии храниться отдельно и запоняется при инициализации
+    /// </summary>
+    /// <param name="idTelemetry"></param>
+    /// <returns></returns>
+    DatesRangeDto? GetOrDefaultWellDataDateRange(int idTelemetry);
 
-        /// <summary>
-        /// Получение первой и последней записи телеметрии.
-        /// Первая запись телеметрии храниться отдельно и запоняется при инициализации
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <returns></returns>
-        (TDto First, TDto Last)? GetOrDefaultFirstLast(int idTelemetry);
+    /// <summary>
+    /// Получение первой и последней записи телеметрии.
+    /// Первая запись телеметрии храниться отдельно и запоняется при инициализации
+    /// </summary>
+    /// <param name="idTelemetry"></param>
+    /// <returns></returns>
+    (TDto First, TDto Last)? GetOrDefaultFirstLast(int idTelemetry);
 
-        /// <summary>
-        /// статистика хранимой телеметрии по всем кешированым
-        /// </summary>
-        /// <returns></returns>
-        IEnumerable<TelemetryDataStatDto> GetStat();
+    /// <summary>
+    /// статистика хранимой телеметрии по всем кешированым
+    /// </summary>
+    /// <returns></returns>
+    IEnumerable<TelemetryDataStatDto> GetStat();
 
-        /// <summary>
-        /// Получить ключи телеметрии по параметрам запроса
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        IEnumerable<int> GetIds(TelemetryDataRequest request);
-    }
+    /// <summary>
+    /// Получить ключи телеметрии по параметрам запроса
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    IEnumerable<int> GetIds(TelemetryDataRequest request);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Repositories/ITelemetryWirelineRunOutRepository.cs b/AsbCloudApp/Repositories/ITelemetryWirelineRunOutRepository.cs
index 3166a301..f038d977 100644
--- a/AsbCloudApp/Repositories/ITelemetryWirelineRunOutRepository.cs
+++ b/AsbCloudApp/Repositories/ITelemetryWirelineRunOutRepository.cs
@@ -4,36 +4,35 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// Наработка талевого каната
+/// </summary>
+public interface ITelemetryWirelineRunOutRepository
 {
     /// <summary>
-    /// Наработка талевого каната
+    /// Принимает данные от панели
     /// </summary>
-    public interface ITelemetryWirelineRunOutRepository
-    {
-        /// <summary>
-        /// Принимает данные от панели
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="dto"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> AddOrUpdateAsync(string uid, TelemetryWirelineRunOutBaseDto dto, CancellationToken token);
+    /// <param name="uid"></param>
+    /// <param name="dto"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> AddOrUpdateAsync(string uid, TelemetryWirelineRunOutBaseDto dto, CancellationToken token);
 
-        /// <summary>
-        /// Выдает данные по скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<TelemetryWirelineRunOutDto?> GetOrDefaultAsync(int idWell, CancellationToken token);
+    /// <summary>
+    /// Выдает данные по скважине
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<TelemetryWirelineRunOutDto?> GetOrDefaultAsync(int idWell, CancellationToken token);
 
-        /// <summary>
-        /// Возвращает данные по всем скважинам
-        /// </summary>
-        /// <param name="idCompany"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<TelemetryWirelineRunOutDto>> GetAllAsync(int idCompany, CancellationToken token);
-    }
+    /// <summary>
+    /// Возвращает данные по всем скважинам
+    /// </summary>
+    /// <param name="idCompany"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<TelemetryWirelineRunOutDto>> GetAllAsync(int idCompany, CancellationToken token);
 }
diff --git a/AsbCloudApp/Repositories/ITrajectoryEditableRepository.cs b/AsbCloudApp/Repositories/ITrajectoryEditableRepository.cs
index ff438112..d65b1100 100644
--- a/AsbCloudApp/Repositories/ITrajectoryEditableRepository.cs
+++ b/AsbCloudApp/Repositories/ITrajectoryEditableRepository.cs
@@ -3,54 +3,53 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// CRUD-репозиторий для работы с траекторией из клиента (плановой и фактической)
+/// </summary>
+/// <returns></returns>
+//TrajectoryGeoPlanDto
+public interface ITrajectoryEditableRepository<T> : ITrajectoryRepository<T> where T : TrajectoryGeoDto
 {
     /// <summary>
-    /// CRUD-репозиторий для работы с траекторией из клиента (плановой и фактической)
-    /// </summary>
+    /// Добавить строки с координатами по одной скважине. Если в коллекции координаты для разных скважин получаем exception.
+    /// </summary>        
+    /// <param name="trajectoryRows"></param>
+    /// <param name="token"></param>
+    /// <returns>количество записанных строк или exception с описанием</returns>
+    Task<int> AddRangeAsync(IEnumerable<T> trajectoryRows, CancellationToken token);
+
+    /// <summary>
+    /// Добавить одну строку с координатами
+    /// </summary>        
+    /// <param name="trajectoryRow"></param>
+    /// <param name="token"></param>
     /// <returns></returns>
-    //TrajectoryGeoPlanDto
-    public interface ITrajectoryEditableRepository<T> : ITrajectoryRepository<T> where T : TrajectoryGeoDto
-    {
-        /// <summary>
-        /// Добавить строки с координатами по одной скважине. Если в коллекции координаты для разных скважин получаем exception.
-        /// </summary>        
-        /// <param name="trajectoryRows"></param>
-        /// <param name="token"></param>
-        /// <returns>количество записанных строк или exception с описанием</returns>
-        Task<int> AddRangeAsync(IEnumerable<T> trajectoryRows, CancellationToken token);
+    Task<int> AddAsync(T trajectoryRow, CancellationToken token);
 
-        /// <summary>
-        /// Добавить одну строку с координатами
-        /// </summary>        
-        /// <param name="trajectoryRow"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> AddAsync(T trajectoryRow, CancellationToken token);
+    /// <summary>
+    /// Обновить строку с координатами
+    /// </summary>
+    /// <param name="row"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> UpdateAsync(T row,
+        CancellationToken token);
 
-        /// <summary>
-        /// Обновить строку с координатами
-        /// </summary>
-        /// <param name="row"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> UpdateAsync(T row,
-            CancellationToken token);
+    /// <summary>
+    /// Удалить строки с координатами
+    /// </summary>
+    /// <param name="ids"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token);
 
-        /// <summary>
-        /// Удалить строки с координатами
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token);
-
-        /// <summary>
-        /// Удалить всю траекторию по ИД скважины
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> DeleteByIdWellAsync(int idWell, CancellationToken token);
-    }
+    /// <summary>
+    /// Удалить всю траекторию по ИД скважины
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> DeleteByIdWellAsync(int idWell, CancellationToken token);
 }
diff --git a/AsbCloudApp/Repositories/ITrajectoryNnbRepository.cs b/AsbCloudApp/Repositories/ITrajectoryNnbRepository.cs
index 2d3d89e0..a0abefdc 100644
--- a/AsbCloudApp/Repositories/ITrajectoryNnbRepository.cs
+++ b/AsbCloudApp/Repositories/ITrajectoryNnbRepository.cs
@@ -4,20 +4,19 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// репозиторий для работы с траекторией из ннб (фактической)
+/// </summary>
+/// <returns></returns>
+public interface ITrajectoryNnbRepository : ITrajectoryRepository<TrajectoryGeoFactDto>
 {
     /// <summary>
-    /// репозиторий для работы с траекторией из ннб (фактической)
+    /// получение списка траекторий по параметрам запроса
     /// </summary>
+    /// <param name="trajectoryRequest">параметры запроса</param>
+    /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    public interface ITrajectoryNnbRepository : ITrajectoryRepository<TrajectoryGeoFactDto>
-    {
-        /// <summary>
-        /// получение списка траекторий по параметрам запроса
-        /// </summary>
-        /// <param name="trajectoryRequest">параметры запроса</param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task<IEnumerable<TrajectoryGeoFactDto>> GetByRequestAsync(TrajectoryRequest trajectoryRequest, CancellationToken cancellationToken);
-    }
+    Task<IEnumerable<TrajectoryGeoFactDto>> GetByRequestAsync(TrajectoryRequest trajectoryRequest, CancellationToken cancellationToken);
 }
diff --git a/AsbCloudApp/Repositories/ITrajectoryRepository.cs b/AsbCloudApp/Repositories/ITrajectoryRepository.cs
index 0c51ec85..7e8048a7 100644
--- a/AsbCloudApp/Repositories/ITrajectoryRepository.cs
+++ b/AsbCloudApp/Repositories/ITrajectoryRepository.cs
@@ -3,20 +3,19 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// Репозиторий по работе с траекторией
+/// </summary>
+public interface ITrajectoryRepository<T>
+    where T : TrajectoryGeoDto
 {
     /// <summary>
-    /// Репозиторий по работе с траекторией
+    /// Получить все добавленные по скважине координаты траектории
     /// </summary>
-    public interface ITrajectoryRepository<T>
-        where T : TrajectoryGeoDto
-    {
-        /// <summary>
-        /// Получить все добавленные по скважине координаты траектории
-        /// </summary>
-        /// <param name="idWell">ключ скважины</param>        
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<T>> GetAsync(int idWell, CancellationToken token);
-    }
+    /// <param name="idWell">ключ скважины</param>        
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<T>> GetAsync(int idWell, CancellationToken token);
 }
diff --git a/AsbCloudApp/Repositories/IUserRepository.cs b/AsbCloudApp/Repositories/IUserRepository.cs
index db6a32ea..06e91bf8 100644
--- a/AsbCloudApp/Repositories/IUserRepository.cs
+++ b/AsbCloudApp/Repositories/IUserRepository.cs
@@ -3,34 +3,33 @@ using AsbCloudApp.Data.User;
 using AsbCloudApp.Services;
 using System.Collections.Generic;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// Репозиторий пользователей
+/// </summary>
+public interface IUserRepository : ICrudRepository<UserExtendedDto>
 {
     /// <summary>
-    /// Репозиторий пользователей
+    /// Получить список всех прав пользователя (включая наследование групп)
     /// </summary>
-    public interface IUserRepository : ICrudRepository<UserExtendedDto>
-    {
-        /// <summary>
-        /// Получить список всех прав пользователя (включая наследование групп)
-        /// </summary>
-        /// <param name="idUser"></param>
-        /// <returns></returns>
-        IEnumerable<PermissionDto> GetNestedPermissions(int idUser);
+    /// <param name="idUser"></param>
+    /// <returns></returns>
+    IEnumerable<PermissionDto> GetNestedPermissions(int idUser);
 
-        /// <summary>
-        /// Получить список ролей пользователя (включая наследование)
-        /// </summary>
-        /// <param name="idUser"></param>
-        /// <param name="nestedLevel"></param>
-        /// <returns></returns>
-        IEnumerable<UserRoleDto> GetRolesByIdUser(int idUser, int nestedLevel = 0);
+    /// <summary>
+    /// Получить список ролей пользователя (включая наследование)
+    /// </summary>
+    /// <param name="idUser"></param>
+    /// <param name="nestedLevel"></param>
+    /// <returns></returns>
+    IEnumerable<UserRoleDto> GetRolesByIdUser(int idUser, int nestedLevel = 0);
 
-        /// <summary>
-        /// определяет есть ли у пользователя указанное разрешение
-        /// </summary>
-        /// <param name="idUser"></param>
-        /// <param name="permissionName"></param>
-        /// <returns></returns>
-        public bool HasPermission(int idUser, string permissionName);
-    }
+    /// <summary>
+    /// определяет есть ли у пользователя указанное разрешение
+    /// </summary>
+    /// <param name="idUser"></param>
+    /// <param name="permissionName"></param>
+    /// <returns></returns>
+    public bool HasPermission(int idUser, string permissionName);
 }
diff --git a/AsbCloudApp/Repositories/IUserRoleRepository.cs b/AsbCloudApp/Repositories/IUserRoleRepository.cs
index b2ca7f4f..c1a3be61 100644
--- a/AsbCloudApp/Repositories/IUserRoleRepository.cs
+++ b/AsbCloudApp/Repositories/IUserRoleRepository.cs
@@ -4,35 +4,34 @@ using System.Threading.Tasks;
 using System.Threading;
 using AsbCloudApp.Data.User;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// Разрешения на доступ к данным
+/// </summary>
+public interface IUserRoleRepository : ICrudRepository<UserRoleDto>
 {
     /// <summary>
-    /// Разрешения на доступ к данным
+    /// получить dto по названиям
     /// </summary>
-    public interface IUserRoleRepository : ICrudRepository<UserRoleDto>
-    {
-        /// <summary>
-        /// получить dto по названиям
-        /// </summary>
-        /// <param name="names"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<UserRoleDto>> GetByNamesAsync(IEnumerable<string> names, CancellationToken token = default);
+    /// <param name="names"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<UserRoleDto>> GetByNamesAsync(IEnumerable<string> names, CancellationToken token = default);
 
-        /// <summary>
-        /// получить все вложенные разрешения
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="counter"></param>
-        /// <returns></returns>
-        IEnumerable<UserRoleDto> GetNestedById(int id, int counter = 10);
+    /// <summary>
+    /// получить все вложенные разрешения
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="counter"></param>
+    /// <returns></returns>
+    IEnumerable<UserRoleDto> GetNestedById(int id, int counter = 10);
 
-        /// <summary>
-        /// определяет содержится ли разрешение в одной из указанных ролей
-        /// </summary>
-        /// <param name="rolesIds"></param>
-        /// <param name="permissionName"></param>
-        /// <returns></returns>
-        bool HasPermission(IEnumerable<int> rolesIds, string permissionName);
-    }
+    /// <summary>
+    /// определяет содержится ли разрешение в одной из указанных ролей
+    /// </summary>
+    /// <param name="rolesIds"></param>
+    /// <param name="permissionName"></param>
+    /// <returns></returns>
+    bool HasPermission(IEnumerable<int> rolesIds, string permissionName);
 }
diff --git a/AsbCloudApp/Repositories/IWellCompositeRepository.cs b/AsbCloudApp/Repositories/IWellCompositeRepository.cs
index 1023ba8d..df78979f 100644
--- a/AsbCloudApp/Repositories/IWellCompositeRepository.cs
+++ b/AsbCloudApp/Repositories/IWellCompositeRepository.cs
@@ -4,36 +4,35 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// Репозиторий создания композитной скважины
+/// </summary>
+public interface IWellCompositeRepository
 {
     /// <summary>
-    /// Репозиторий создания композитной скважины
+    /// Получить секции композитной скважины
     /// </summary>
-    public interface IWellCompositeRepository
-    {
-        /// <summary>
-        /// Получить секции композитной скважины
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<WellCompositeDto>> GetAsync(int idWell, CancellationToken token);
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<WellCompositeDto>> GetAsync(int idWell, CancellationToken token);
 
-        /// <summary>
-        /// сохранить секции композитной скважины
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="wellComposites"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> SaveAsync(int idWell, IEnumerable<WellCompositeDto> wellComposites, CancellationToken token);
+    /// <summary>
+    /// сохранить секции композитной скважины
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="wellComposites"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> SaveAsync(int idWell, IEnumerable<WellCompositeDto> wellComposites, CancellationToken token);
 
-        /// <summary>
-        /// Получение РТК-план бурение по композитной скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<ProcessMapPlanBaseDto>> GetCompositeProcessMap(int idWell, CancellationToken token);
-    }
+    /// <summary>
+    /// Получение РТК-план бурение по композитной скважине
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<ProcessMapPlanBaseDto>> GetCompositeProcessMap(int idWell, CancellationToken token);
 }
diff --git a/AsbCloudApp/Repositories/IWellFinalDocumentsRepository.cs b/AsbCloudApp/Repositories/IWellFinalDocumentsRepository.cs
index 252c1e5b..f0e6791e 100644
--- a/AsbCloudApp/Repositories/IWellFinalDocumentsRepository.cs
+++ b/AsbCloudApp/Repositories/IWellFinalDocumentsRepository.cs
@@ -4,47 +4,46 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// Репозиторий "Дело скважины"
+/// </summary>
+public interface IWellFinalDocumentsRepository
 {
     /// <summary>
-    /// Репозиторий "Дело скважины"
+    /// Обновление всех записей по скважине
     /// </summary>
-    public interface IWellFinalDocumentsRepository
-    {
-        /// <summary>
-        /// Обновление всех записей по скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="dtos"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<WellFinalDocumentDBDto>> UpdateRangeAsync(int idWell, IEnumerable<WellFinalDocumentInputDto> dtos, CancellationToken token);
+    /// <param name="idWell"></param>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<WellFinalDocumentDBDto>> UpdateRangeAsync(int idWell, IEnumerable<WellFinalDocumentInputDto> dtos, CancellationToken token);
 
-        /// <summary>
-        /// Получение всех записей
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idUser"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<WellCaseDto> GetByWellIdAsync(int idWell, int idUser, CancellationToken token);
+    /// <summary>
+    /// Получение всех записей
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idUser"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<WellCaseDto> GetByWellIdAsync(int idWell, int idUser, CancellationToken token);
 
-        /// <summary>
-        /// Получение списка ответственных
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<UserDto>> GetAvailableUsersAsync(int idWell, CancellationToken token);
+    /// <summary>
+    /// Получение списка ответственных
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<UserDto>> GetAvailableUsersAsync(int idWell, CancellationToken token);
 
-        /// <summary>
-        /// Возвращаент категорию файла
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idCategory"></param>
-        /// <param name="idUser"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<WellFinalDocumentDBDto> GetCategoryAsync(int idWell, int idCategory, int idUser, CancellationToken token);
-    }
+    /// <summary>
+    /// Возвращаент категорию файла
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idCategory"></param>
+    /// <param name="idUser"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<WellFinalDocumentDBDto> GetCategoryAsync(int idWell, int idCategory, int idUser, CancellationToken token);
 }
diff --git a/AsbCloudApp/Repositories/IWellOperationCategoryRepository.cs b/AsbCloudApp/Repositories/IWellOperationCategoryRepository.cs
index 12d7995e..e152d5ba 100644
--- a/AsbCloudApp/Repositories/IWellOperationCategoryRepository.cs
+++ b/AsbCloudApp/Repositories/IWellOperationCategoryRepository.cs
@@ -1,17 +1,16 @@
 using System.Collections.Generic;
 using AsbCloudApp.Data.WellOperation;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// сервис операций по скважине
+/// </summary>
+public interface IWellOperationCategoryRepository
 {
     /// <summary>
-    /// сервис операций по скважине
+    /// список названий операций
     /// </summary>
-    public interface IWellOperationCategoryRepository
-    {
-        /// <summary>
-        /// список названий операций
-        /// </summary>
-        /// <returns></returns>
-        IEnumerable<WellOperationCategoryDto> Get(bool includeParents, bool includeHidden = true);
-    }
+    /// <returns></returns>
+    IEnumerable<WellOperationCategoryDto> Get(bool includeParents, bool includeHidden = true);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Repositories/IWellOperationRepository.cs b/AsbCloudApp/Repositories/IWellOperationRepository.cs
index b7b433fe..f80ad02d 100644
--- a/AsbCloudApp/Repositories/IWellOperationRepository.cs
+++ b/AsbCloudApp/Repositories/IWellOperationRepository.cs
@@ -5,91 +5,90 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Repositories
+namespace AsbCloudApp.Repositories;
+
+/// <summary>
+/// сервис операций по скважине
+/// </summary>
+public interface IWellOperationRepository
 {
     /// <summary>
-    /// сервис операций по скважине
+    /// Список секций
     /// </summary>
-    public interface IWellOperationRepository
-    {
-        /// <summary>
-        /// Список секций
-        /// </summary>
-        /// <returns></returns>
-        IEnumerable<WellSectionTypeDto> GetSectionTypes();
+    /// <returns></returns>
+    IEnumerable<WellSectionTypeDto> GetSectionTypes();
 
 
-        /// <summary>
-        /// Добавить несколько операций
-        /// </summary>
-        /// <param name="dtos"></param>
-        /// <param name="deleteBeforeInsert"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> InsertRangeAsync(IEnumerable<WellOperationBaseDto> dtos, bool deleteBeforeInsert, CancellationToken token);
+    /// <summary>
+    /// Добавить несколько операций
+    /// </summary>
+    /// <param name="dtos"></param>
+    /// <param name="deleteBeforeInsert"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> InsertRangeAsync(IEnumerable<WellOperationBaseDto> dtos, bool deleteBeforeInsert, CancellationToken token);
 
-        /// <summary>
-        /// Обновить существующую операцию
-        /// </summary>
-        /// <param name="dtos"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> UpdateRangeAsync(IEnumerable<WellOperationBaseDto> dtos, CancellationToken token);
+    /// <summary>
+    /// Обновить существующую операцию
+    /// </summary>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> UpdateRangeAsync(IEnumerable<WellOperationBaseDto> dtos, CancellationToken token);
 
-        /// <summary>
-        /// Удалить операции по id
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token);
+    /// <summary>
+    /// Удалить операции по id
+    /// </summary>
+    /// <param name="ids"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token);
 
-        /// <summary>
-        /// Получить секции скважин из операций ГГД. Секцие поделены на плановые и фактические.
-        /// </summary>
-        /// <param name="idsWells"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<SectionByOperationsDto>> GetSectionsAsync(IEnumerable<int> idsWells, CancellationToken token);
+    /// <summary>
+    /// Получить секции скважин из операций ГГД. Секцие поделены на плановые и фактические.
+    /// </summary>
+    /// <param name="idsWells"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<SectionByOperationsDto>> GetSectionsAsync(IEnumerable<int> idsWells, CancellationToken token);
 
-        /// <summary>
-        /// Получить диапазон дат выполнения операций
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idType"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task<DatesRangeDto?> GetDatesRangeAsync(int idWell, int idType, CancellationToken cancellationToken);
+    /// <summary>
+    /// Получить диапазон дат выполнения операций
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idType"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<DatesRangeDto?> GetDatesRangeAsync(int idWell, int idType, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Возвращает первую и последнюю фактическую операцию
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <returns></returns>
-        (WellOperationBaseDto First, WellOperationBaseDto Last)? GetFirstAndLastFact(int idWell);
+    /// <summary>
+    /// Возвращает первую и последнюю фактическую операцию
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <returns></returns>
+    (WellOperationBaseDto First, WellOperationBaseDto Last)? GetFirstAndLastFact(int idWell);
 
-        /// <summary>
-        /// Получить список операций по запросу 
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<WellOperationBaseDto>> GetAll(WellOperationRequest request, CancellationToken token);
+    /// <summary>
+    /// Получить список операций по запросу 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<WellOperationBaseDto>> GetAll(WellOperationRequest request, CancellationToken token);
 
-        /// <summary>
-        /// Получить список операций по запросу 
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<WellOperationBaseDto>> GetAll(WellOperationRepositoryRequest request, CancellationToken token);
+    /// <summary>
+    /// Получить список операций по запросу 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<WellOperationBaseDto>> GetAll(WellOperationRepositoryRequest request, CancellationToken token);
 
-        /// <summary>
-        /// Получить список операций по ключу скважины 
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<WellOperationBaseDto>> GetAll(int idWell, CancellationToken token);
-    }
+    /// <summary>
+    /// Получить список операций по ключу скважины 
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<WellOperationBaseDto>> GetAll(int idWell, CancellationToken token);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Requests/DataSaubStatRequest.cs b/AsbCloudApp/Requests/DataSaubStatRequest.cs
index 1fe186b5..78f314d6 100644
--- a/AsbCloudApp/Requests/DataSaubStatRequest.cs
+++ b/AsbCloudApp/Requests/DataSaubStatRequest.cs
@@ -1,41 +1,40 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Requests
+namespace AsbCloudApp.Requests;
+
+/// <summary>
+/// Параметры запроса для построения отчёта
+/// </summary>
+public class DataSaubStatRequest
 {
     /// <summary>
-    /// Параметры запроса для построения отчёта
+    /// Изменение уставки факт перепада давления от первого значения в начале интервала
+    /// Не менее 5 атм и не более 50 атм;
     /// </summary>
-    public class DataSaubStatRequest
-    {
-        /// <summary>
-        /// Изменение уставки факт перепада давления от первого значения в начале интервала
-        /// Не менее 5 атм и не более 50 атм;
-        /// </summary>
-        [Range(5, 50, ErrorMessage = "Изменение уставки факт перепада давления не может быть меньше 5 и больше 50 атм")]
-        public double DeltaPressure { get; set; } = 5d;
+    [Range(5, 50, ErrorMessage = "Изменение уставки факт перепада давления не может быть меньше 5 и больше 50 атм")]
+    public double DeltaPressure { get; set; } = 5d;
 
-        /// <summary>
-        /// Изменение уставки факт осевой нагрузки от первого значения в начале интервала
-        /// Не менее 1 т и не более 20 т;
-        /// </summary>
-        [Range(1, 20, ErrorMessage = "Изменение уставки факт осевой нагрузки не может быть меньше 1 и больше 20 т")]
-        public double DeltaAxialLoad { get; set; } = 1d;
+    /// <summary>
+    /// Изменение уставки факт осевой нагрузки от первого значения в начале интервала
+    /// Не менее 1 т и не более 20 т;
+    /// </summary>
+    [Range(1, 20, ErrorMessage = "Изменение уставки факт осевой нагрузки не может быть меньше 1 и больше 20 т")]
+    public double DeltaAxialLoad { get; set; } = 1d;
 
-        /// <summary>
-        /// Изменение уставки момента от первого значения в начале интервала
-        /// Не менее 5 кН*м и не более 20 кН*м.
-        /// </summary>
-        [Range(5, 20, ErrorMessage = "Изменение уставки момента не может быть меньше 5 и больше 20 кН*м")]
-        public double DeltaRotorTorque { get; set; } = 5d;
+    /// <summary>
+    /// Изменение уставки момента от первого значения в начале интервала
+    /// Не менее 5 кН*м и не более 20 кН*м.
+    /// </summary>
+    [Range(5, 20, ErrorMessage = "Изменение уставки момента не может быть меньше 5 и больше 20 кН*м")]
+    public double DeltaRotorTorque { get; set; } = 5d;
 
-        /// <summary>
-        /// Изменение ограничения нагрузки от первого значения в начале интервала
-        /// </summary>
-        public double DeltaAxialLoadSp => 1.0;
+    /// <summary>
+    /// Изменение ограничения нагрузки от первого значения в начале интервала
+    /// </summary>
+    public double DeltaAxialLoadSp => 1.0;
 
-        /// <summary>
-        /// Изменение ограничения момента от первого значения в начале интервала
-        /// </summary>
-        public double DeltaRotorTorqueSp => 5.0;
-    }
+    /// <summary>
+    /// Изменение ограничения момента от первого значения в начале интервала
+    /// </summary>
+    public double DeltaRotorTorqueSp => 5.0;
 }
diff --git a/AsbCloudApp/Requests/FaqRequest.cs b/AsbCloudApp/Requests/FaqRequest.cs
index 3094d12c..18a042f9 100644
--- a/AsbCloudApp/Requests/FaqRequest.cs
+++ b/AsbCloudApp/Requests/FaqRequest.cs
@@ -5,26 +5,25 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Requests
+namespace AsbCloudApp.Requests;
+
+/// <summary>
+/// Параметры запроса для фильтрации faq-вопросов
+/// </summary>
+public class FaqRequest
 {
     /// <summary>
-    /// Параметры запроса для фильтрации faq-вопросов
+    /// Есть ли ответ на вопрос
     /// </summary>
-    public class FaqRequest
-    {
-        /// <summary>
-        /// Есть ли ответ на вопрос
-        /// </summary>
-        public bool HasAnswer { get; set; } = false;
+    public bool HasAnswer { get; set; } = false;
 
-        /// <summary>
-        /// Частый вопрос
-        /// </summary>
-        public bool IsFrequently { get; set; } = false;
+    /// <summary>
+    /// Частый вопрос
+    /// </summary>
+    public bool IsFrequently { get; set; } = false;
 
-        /// <summary>
-        /// Включать ли в выборку удаленные вопросы
-        /// </summary>
-        public bool IncludeDeleted { get;  set; } = false;
-    }
+    /// <summary>
+    /// Включать ли в выборку удаленные вопросы
+    /// </summary>
+    public bool IncludeDeleted { get;  set; } = false;
 }
diff --git a/AsbCloudApp/Requests/FileRequest.cs b/AsbCloudApp/Requests/FileRequest.cs
index d8b05364..d603ad58 100644
--- a/AsbCloudApp/Requests/FileRequest.cs
+++ b/AsbCloudApp/Requests/FileRequest.cs
@@ -1,48 +1,47 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Requests
+namespace AsbCloudApp.Requests;
+
+/// <summary>
+/// Параметры запроса для файлового сервиса
+/// </summary>
+public class FileRequest : RequestBase
 {
     /// <summary>
-    /// Параметры запроса для файлового сервиса
+    /// Идентификатор скважины
     /// </summary>
-    public class FileRequest : RequestBase
-    {
-        /// <summary>
-        /// Идентификатор скважины
-        /// </summary>
-        [Required]
-        public int IdWell { get; set; }
+    [Required]
+    public int IdWell { get; set; }
 
-        /// <summary>
-        /// Идентификатор категории файла
-        /// </summary>
-        [Required]
-        public int? IdCategory { get; set; }
-        
-        /// <summary>
-        /// Наименование компании
-        /// </summary>
-        public string? CompanyNamePart { get; set; }
-        
-        /// <summary>
-        /// Имя файла
-        /// </summary>
-        public string? FileNamePart { get; set; }
-        
-        /// <summary>
-        /// Дата начала периода
-        /// </summary>
-        public DateTimeOffset? Begin { get; set; }
+    /// <summary>
+    /// Идентификатор категории файла
+    /// </summary>
+    [Required]
+    public int? IdCategory { get; set; }
+    
+    /// <summary>
+    /// Наименование компании
+    /// </summary>
+    public string? CompanyNamePart { get; set; }
+    
+    /// <summary>
+    /// Имя файла
+    /// </summary>
+    public string? FileNamePart { get; set; }
+    
+    /// <summary>
+    /// Дата начала периода
+    /// </summary>
+    public DateTimeOffset? Begin { get; set; }
 
-        /// <summary>
-        /// Дата окончания периода
-        /// </summary>
-        public DateTimeOffset? End { get; set; }
+    /// <summary>
+    /// Дата окончания периода
+    /// </summary>
+    public DateTimeOffset? End { get; set; }
 
-        /// <summary>
-        /// Признак удаления
-        /// </summary>
-        public bool? IsDeleted { get; set; }
-    }
+    /// <summary>
+    /// Признак удаления
+    /// </summary>
+    public bool? IsDeleted { get; set; }
 }
diff --git a/AsbCloudApp/Requests/LimitingParameterRequest.cs b/AsbCloudApp/Requests/LimitingParameterRequest.cs
index 6bf0b11d..30e136b8 100644
--- a/AsbCloudApp/Requests/LimitingParameterRequest.cs
+++ b/AsbCloudApp/Requests/LimitingParameterRequest.cs
@@ -1,37 +1,36 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Requests
+namespace AsbCloudApp.Requests;
+
+/// <summary>
+/// Класс с фильтрами для запроса по ограничивающим параметрам
+/// </summary>
+public class LimitingParameterRequest
 {
     /// <summary>
-    /// Класс с фильтрами для запроса по ограничивающим параметрам
+    /// идентификатор скважины
     /// </summary>
-    public class LimitingParameterRequest
-    {
-        /// <summary>
-        /// идентификатор скважины
-        /// </summary>
-        [Required]
-        public int IdWell { get; set; }
+    [Required]
+    public int IdWell { get; set; }
 
-        /// <summary>
-        /// Больше или равно дате
-        /// </summary>
-        public DateTimeOffset? GtDate { get; set; }
+    /// <summary>
+    /// Больше или равно дате
+    /// </summary>
+    public DateTimeOffset? GtDate { get; set; }
 
-        /// <summary>
-        /// Меньше или равно дате
-        /// </summary>
-        public DateTimeOffset? LtDate { get; set; }
+    /// <summary>
+    /// Меньше или равно дате
+    /// </summary>
+    public DateTimeOffset? LtDate { get; set; }
 
-        /// <summary>
-        /// Больше или равно глубины забоя
-        /// </summary>
-        public double? GtDepth { get; set; }
+    /// <summary>
+    /// Больше или равно глубины забоя
+    /// </summary>
+    public double? GtDepth { get; set; }
 
-        /// <summary>
-        /// Меньше или равно глубины забоя
-        /// </summary>
-        public double? LtDepth { get; set; }
-    }
+    /// <summary>
+    /// Меньше или равно глубины забоя
+    /// </summary>
+    public double? LtDepth { get; set; }
 }
diff --git a/AsbCloudApp/Requests/MessageRequest.cs b/AsbCloudApp/Requests/MessageRequest.cs
index db814e82..1e755231 100644
--- a/AsbCloudApp/Requests/MessageRequest.cs
+++ b/AsbCloudApp/Requests/MessageRequest.cs
@@ -1,65 +1,64 @@
 using System;
 using System.Collections.Generic;
 
-namespace AsbCloudApp.Requests
+namespace AsbCloudApp.Requests;
+
+/// <summary>
+/// параметры для запроса списка сообщений
+/// </summary>
+public class MessageRequestBase : RequestBase
 {
     /// <summary>
-    /// параметры для запроса списка сообщений
+    /// категория
     /// </summary>
-    public class MessageRequestBase : RequestBase
-    {
-        /// <summary>
-        /// категория
-        /// </summary>
-        public IEnumerable<int>? Categoryids { get; set; }
+    public IEnumerable<int>? Categoryids { get; set; }
 
 
-        /// <summary>
-        /// начальная дата
-        /// </summary>
-        public DateTimeOffset? Begin { get; set; }
+    /// <summary>
+    /// начальная дата
+    /// </summary>
+    public DateTimeOffset? Begin { get; set; }
 
-        /// <summary>
-        /// конечная дата
-        /// </summary>
-        public DateTimeOffset? End { get; set; }
+    /// <summary>
+    /// конечная дата
+    /// </summary>
+    public DateTimeOffset? End { get; set; }
 
-        /// <summary>
-        /// строка поиска
-        /// </summary>
-        public string? SearchString { get; set; }
+    /// <summary>
+    /// строка поиска
+    /// </summary>
+    public string? SearchString { get; set; }
 
-    }
+}
+
+/// <summary>
+/// параметры для запроса списка сообщений (с id скважины)
+/// </summary>
+public class MessageRequest : MessageRequestBase
+{
+
+    /// <summary>
+    /// id скважины
+    /// </summary>
+    public int IdWell { get; set; }
 
     /// <summary>
     /// параметры для запроса списка сообщений (с id скважины)
     /// </summary>
-    public class MessageRequest : MessageRequestBase
+    /// <param name="request"></param>
+    /// <param name="idWell"></param>
+    public MessageRequest(MessageRequestBase request, int idWell)
     {
+        this.IdWell = idWell;
 
-        /// <summary>
-        /// id скважины
-        /// </summary>
-        public int IdWell { get; set; }
-
-        /// <summary>
-        /// параметры для запроса списка сообщений (с id скважины)
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="idWell"></param>
-        public MessageRequest(MessageRequestBase request, int idWell)
-        {
-            this.IdWell = idWell;
-
-            this.Categoryids = request.Categoryids;
-            this.Begin = request.Begin;
-            this.End = request.End;
-            this.SearchString = request.SearchString;
-
-            this.Skip = request.Skip;
-            this.Take = request.Take;
-            this.SortFields = request.SortFields;
-        }
+        this.Categoryids = request.Categoryids;
+        this.Begin = request.Begin;
+        this.End = request.End;
+        this.SearchString = request.SearchString;
 
+        this.Skip = request.Skip;
+        this.Take = request.Take;
+        this.SortFields = request.SortFields;
     }
+
 }
diff --git a/AsbCloudApp/Requests/OperationStatRequest.cs b/AsbCloudApp/Requests/OperationStatRequest.cs
index c9a384e3..dd9d5ed4 100644
--- a/AsbCloudApp/Requests/OperationStatRequest.cs
+++ b/AsbCloudApp/Requests/OperationStatRequest.cs
@@ -1,34 +1,33 @@
 using System;
 
-namespace AsbCloudApp.Requests
+namespace AsbCloudApp.Requests;
+
+/// <summary>
+/// Параметры фильтра операции
+/// </summary>
+public class OperationStatRequest
 {
+    //TODO: использовать DateOnly. Поправить naming
     /// <summary>
-    /// Параметры фильтра операции
+    /// Дата начала операции в UTC
     /// </summary>
-    public class OperationStatRequest
-    {
-        //TODO: использовать DateOnly. Поправить naming
-        /// <summary>
-        /// Дата начала операции в UTC
-        /// </summary>
-        public DateTime? DateStartUTC { get; set; }
+    public DateTime? DateStartUTC { get; set; }
 
-        //TODO: использовать DateOnly. Поправить naming
-        /// <summary>
-        /// Дата окончания операции в UTC
-        /// </summary>
-        public DateTime? DateEndUTC { get; set; }
+    //TODO: использовать DateOnly. Поправить naming
+    /// <summary>
+    /// Дата окончания операции в UTC
+    /// </summary>
+    public DateTime? DateEndUTC { get; set; }
 
-        //TODO: поправить naming
-        /// <summary>
-        /// Минимальная продолжительность операции, мин
-        /// </summary>
-        public double? DurationMinutesMin { get; set; }
+    //TODO: поправить naming
+    /// <summary>
+    /// Минимальная продолжительность операции, мин
+    /// </summary>
+    public double? DurationMinutesMin { get; set; }
 
-        //TODO: поправить naming
-        /// <summary>
-        /// Максимальная продолжительность операции, мин
-        /// </summary>
-        public double? DurationMinutesMax { get; set; }
-    }
+    //TODO: поправить naming
+    /// <summary>
+    /// Максимальная продолжительность операции, мин
+    /// </summary>
+    public double? DurationMinutesMax { get; set; }
 }
diff --git a/AsbCloudApp/Requests/RequestBase.cs b/AsbCloudApp/Requests/RequestBase.cs
index 3f045fd5..e187ba8d 100644
--- a/AsbCloudApp/Requests/RequestBase.cs
+++ b/AsbCloudApp/Requests/RequestBase.cs
@@ -1,45 +1,44 @@
 using System.Collections.Generic;
 
-namespace AsbCloudApp.Requests
+namespace AsbCloudApp.Requests;
+
+/// <summary>
+/// Базовые параметры запроса
+/// </summary>
+public class RequestBase
 {
+    /// <summary>
+    /// Параметр пагинации
+    /// </summary>
+    public int? Skip { get; set; }
+
+    /// <summary>
+    /// Параметр пагинации
+    /// </summary>
+    public int? Take { get; set; }
+
+    /// <summary>
+    /// Сортировки:
+    /// Содержат список названий полей сортировки
+    /// Указать направление сортировки можно через пробел "asc" или "desc"
+    /// </summary>
+    public IEnumerable<string>? SortFields { get; set; }
+
     /// <summary>
     /// Базовые параметры запроса
     /// </summary>
-    public class RequestBase
+    public RequestBase()
     {
-        /// <summary>
-        /// Параметр пагинации
-        /// </summary>
-        public int? Skip { get; set; }
+    }
 
-        /// <summary>
-        /// Параметр пагинации
-        /// </summary>
-        public int? Take { get; set; }
-
-        /// <summary>
-        /// Сортировки:
-        /// Содержат список названий полей сортировки
-        /// Указать направление сортировки можно через пробел "asc" или "desc"
-        /// </summary>
-        public IEnumerable<string>? SortFields { get; set; }
-
-        /// <summary>
-        /// Базовые параметры запроса
-        /// </summary>
-        public RequestBase()
-        {
-        }
-
-        /// <summary>
-        /// Базовые параметры запроса. Копирующий конструктор
-        /// </summary>
-        /// <param name="request"></param>
-        public RequestBase(RequestBase request)
-        {
-            Skip = request.Skip;
-            Take = request.Take;
-            SortFields = request.SortFields;
-        }
+    /// <summary>
+    /// Базовые параметры запроса. Копирующий конструктор
+    /// </summary>
+    /// <param name="request"></param>
+    public RequestBase(RequestBase request)
+    {
+        Skip = request.Skip;
+        Take = request.Take;
+        SortFields = request.SortFields;
     }
 }
diff --git a/AsbCloudApp/Requests/SubsystemRequest.cs b/AsbCloudApp/Requests/SubsystemRequest.cs
index f427dcec..4c5705d6 100644
--- a/AsbCloudApp/Requests/SubsystemRequest.cs
+++ b/AsbCloudApp/Requests/SubsystemRequest.cs
@@ -2,71 +2,70 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Requests
+namespace AsbCloudApp.Requests;
+
+/// <summary>
+/// класс с фильтрами для запроса
+/// </summary>
+public class SubsystemRequest: RequestBase, IValidatableObject
 {
+    private static readonly DateTimeOffset validationMinDate = new DateTimeOffset(2020,01,01,0,0,0, TimeSpan.Zero);
+
     /// <summary>
-    /// класс с фильтрами для запроса
+    /// идентификатор скважины
     /// </summary>
-    public class SubsystemRequest: RequestBase, IValidatableObject
+    [Required]
+    public int IdWell { get; set; }
+
+    /// <summary>
+    /// Идентификатор бурильщика
+    /// </summary>
+    public int? IdDriller { get; set; }
+    
+    /// <summary>
+    /// Больше или равно дате
+    /// </summary>
+    public DateTimeOffset? GeDate { get; set; }
+
+    /// <summary>
+    /// Меньше или равно дате
+    /// </summary>
+    public DateTimeOffset? LeDate { get; set; }
+
+    /// <summary>
+    /// Больше или равно глубины забоя
+    /// </summary>
+    public double? GeDepth { get; set; }
+
+    /// <summary>
+    /// Меньше или равно глубины забоя
+    /// </summary>
+    public double? LeDepth { get; set; }
+
+    /// <inheritdoc/>
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
-        private static readonly DateTimeOffset validationMinDate = new DateTimeOffset(2020,01,01,0,0,0, TimeSpan.Zero);
+        if (GeDate.HasValue && GeDate < validationMinDate)
+            yield return new ValidationResult(
+                $"Должно быть больше {validationMinDate:O})",
+                new[] { nameof(GeDate) });
 
-        /// <summary>
-        /// идентификатор скважины
-        /// </summary>
-        [Required]
-        public int IdWell { get; set; }
-
-        /// <summary>
-        /// Идентификатор бурильщика
-        /// </summary>
-        public int? IdDriller { get; set; }
-        
-        /// <summary>
-        /// Больше или равно дате
-        /// </summary>
-        public DateTimeOffset? GeDate { get; set; }
-
-        /// <summary>
-        /// Меньше или равно дате
-        /// </summary>
-        public DateTimeOffset? LeDate { get; set; }
-
-        /// <summary>
-        /// Больше или равно глубины забоя
-        /// </summary>
-        public double? GeDepth { get; set; }
-
-        /// <summary>
-        /// Меньше или равно глубины забоя
-        /// </summary>
-        public double? LeDepth { get; set; }
-
-        /// <inheritdoc/>
-        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+        if (LeDate.HasValue && GeDate.HasValue)
         {
-            if (GeDate.HasValue && GeDate < validationMinDate)
+            if (LeDate < GeDate)
                 yield return new ValidationResult(
-                    $"Должно быть больше {validationMinDate:O})",
-                    new[] { nameof(GeDate) });
-
-            if (LeDate.HasValue && GeDate.HasValue)
-            {
-                if (LeDate < GeDate)
-                    yield return new ValidationResult(
-                        $"{nameof(LeDate)} должно быть больше {nameof(GeDate)}. ({LeDate:O} < {GeDate:O})",
-                        new[] { nameof(LeDate), nameof(GeDate) });
-            }
-
-            if (LeDepth.HasValue && GeDepth.HasValue)
-            {
-                if (LeDepth < GeDepth)
-                    yield return new ValidationResult(
-                        $"{nameof(LeDepth)} должно быть больше {nameof(GeDepth)}. ({LeDepth} < {GeDepth})",
-                        new[] { nameof(LeDepth), nameof(GeDepth) });
-            }
-
-            yield break;
+                    $"{nameof(LeDate)} должно быть больше {nameof(GeDate)}. ({LeDate:O} < {GeDate:O})",
+                    new[] { nameof(LeDate), nameof(GeDate) });
         }
+
+        if (LeDepth.HasValue && GeDepth.HasValue)
+        {
+            if (LeDepth < GeDepth)
+                yield return new ValidationResult(
+                    $"{nameof(LeDepth)} должно быть больше {nameof(GeDepth)}. ({LeDepth} < {GeDepth})",
+                    new[] { nameof(LeDepth), nameof(GeDepth) });
+        }
+
+        yield break;
     }
 }
diff --git a/AsbCloudApp/Requests/WellContactRequest.cs b/AsbCloudApp/Requests/WellContactRequest.cs
index 26fd4f1b..e49917bf 100644
--- a/AsbCloudApp/Requests/WellContactRequest.cs
+++ b/AsbCloudApp/Requests/WellContactRequest.cs
@@ -1,20 +1,19 @@
 using System.Collections.Generic;
 
-namespace AsbCloudApp.Requests
+namespace AsbCloudApp.Requests;
+
+/// <summary>
+/// Запрос на получение контактов
+/// </summary>
+public class WellContactRequest
 {
     /// <summary>
-    /// Запрос на получение контактов
+    /// Идентификаторы скважин
     /// </summary>
-    public class WellContactRequest
-    {
-        /// <summary>
-        /// Идентификаторы скважин
-        /// </summary>
-        public IEnumerable<int> IdsWells { get; set; } = null!;
+    public IEnumerable<int> IdsWells { get; set; } = null!;
 
-        /// <summary>
-        /// Ключ типа контактов
-        /// </summary>
-        public int? ContactTypeId { get; set; }
-    }
+    /// <summary>
+    /// Ключ типа контактов
+    /// </summary>
+    public int? ContactTypeId { get; set; }
 }
diff --git a/AsbCloudApp/Requests/WellRequest.cs b/AsbCloudApp/Requests/WellRequest.cs
index 8be9dee8..c3edb9b0 100644
--- a/AsbCloudApp/Requests/WellRequest.cs
+++ b/AsbCloudApp/Requests/WellRequest.cs
@@ -1,25 +1,24 @@
 using System.Collections.Generic;
 
-namespace AsbCloudApp.Requests
+namespace AsbCloudApp.Requests;
+
+/// <summary>
+/// Запрос на получение скважин
+/// </summary>
+public class WellRequest
 {
     /// <summary>
-    /// Запрос на получение скважин
+    /// id компании
     /// </summary>
-    public class WellRequest
-    {
-        /// <summary>
-        /// id компании
-        /// </summary>
-        public int? IdCompany { get; set; }
+    public int? IdCompany { get; set; }
 
-        /// <summary>
-        /// id состояния
-        /// </summary>
-        public int? IdState { get; set; }
+    /// <summary>
+    /// id состояния
+    /// </summary>
+    public int? IdState { get; set; }
 
-        /// <summary>
-        /// Идентификаторы скважин
-        /// </summary>
-        public IEnumerable<int>? Ids { get; set; }
-    }
+    /// <summary>
+    /// Идентификаторы скважин
+    /// </summary>
+    public IEnumerable<int>? Ids { get; set; }
 }
diff --git a/AsbCloudApp/Services/FileService.cs b/AsbCloudApp/Services/FileService.cs
index 6065d310..3e27e92b 100644
--- a/AsbCloudApp/Services/FileService.cs
+++ b/AsbCloudApp/Services/FileService.cs
@@ -7,295 +7,294 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис доступа к файлам
+/// </summary>
+public class FileService
 {
+    private readonly IFileRepository fileRepository;
+    private readonly IFileStorageRepository fileStorageRepository;
+
     /// <summary>
     /// Сервис доступа к файлам
     /// </summary>
-    public class FileService
+    /// <param name="fileRepository"></param>
+    /// <param name="fileStorageRepository"></param>
+    public FileService(IFileRepository fileRepository, IFileStorageRepository fileStorageRepository)
     {
-        private readonly IFileRepository fileRepository;
-        private readonly IFileStorageRepository fileStorageRepository;
+        this.fileRepository = fileRepository;
+        this.fileStorageRepository = fileStorageRepository;
+    }
 
-        /// <summary>
-        /// Сервис доступа к файлам
-        /// </summary>
-        /// <param name="fileRepository"></param>
-        /// <param name="fileStorageRepository"></param>
-        public FileService(IFileRepository fileRepository, IFileStorageRepository fileStorageRepository)
+    /// <summary>
+    /// переместить файл
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idUser"></param>
+    /// <param name="idCategory"></param>
+    /// <param name="destinationFileName"></param>
+    /// <param name="srcFilePath"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<FileInfoDto?> MoveAsync(int idWell, int? idUser, int idCategory,
+        string destinationFileName, string srcFilePath, CancellationToken token = default)
+    {
+        destinationFileName = Path.GetFileName(destinationFileName);
+        srcFilePath = Path.GetFullPath(srcFilePath);
+        var fileSize = fileStorageRepository.GetFileLength(srcFilePath);
+
+        //save info to db
+        var dto = new FileInfoDto {
+            IdWell = idWell,
+            IdAuthor = idUser,
+            IdCategory = idCategory,
+            Name = destinationFileName,
+            Size = fileSize
+        };
+        var fileId = await fileRepository.InsertAsync(dto, token)
+            .ConfigureAwait(false);
+        
+        string filePath = fileStorageRepository.MakeFilePath(idWell, idCategory, destinationFileName, fileId);
+        fileStorageRepository.MoveFile(srcFilePath, filePath);
+        
+        return await GetOrDefaultAsync(fileId, token);
+    }
+
+    /// <summary>
+    /// Сохранить файл
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idUser"></param>
+    /// <param name="idCategory"></param>
+    /// <param name="fileFullName"></param>
+    /// <param name="fileStream"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<FileInfoDto> SaveAsync(int idWell, int? idUser, int idCategory,
+        string fileFullName, Stream fileStream, CancellationToken token)
+    {
+        //save info to db
+        var dto = new FileInfoDto
         {
-            this.fileRepository = fileRepository;
-            this.fileStorageRepository = fileStorageRepository;
-        }
+            IdWell = idWell,
+            IdAuthor = idUser,
+            IdCategory = idCategory,
+            Name = Path.GetFileName(fileFullName),
+            Size = fileStream.Length
+        };
 
-        /// <summary>
-        /// переместить файл
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idUser"></param>
-        /// <param name="idCategory"></param>
-        /// <param name="destinationFileName"></param>
-        /// <param name="srcFilePath"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public async Task<FileInfoDto?> MoveAsync(int idWell, int? idUser, int idCategory,
-            string destinationFileName, string srcFilePath, CancellationToken token = default)
-        {
-            destinationFileName = Path.GetFileName(destinationFileName);
-            srcFilePath = Path.GetFullPath(srcFilePath);
-            var fileSize = fileStorageRepository.GetFileLength(srcFilePath);
+        var fileId = await fileRepository.InsertAsync(dto, token)
+            .ConfigureAwait(false);
 
-            //save info to db
-            var dto = new FileInfoDto {
-                IdWell = idWell,
-                IdAuthor = idUser,
-                IdCategory = idCategory,
-                Name = destinationFileName,
-                Size = fileSize
-            };
-            var fileId = await fileRepository.InsertAsync(dto, token)
-                .ConfigureAwait(false);
-            
-            string filePath = fileStorageRepository.MakeFilePath(idWell, idCategory, destinationFileName, fileId);
-            fileStorageRepository.MoveFile(srcFilePath, filePath);
-            
-            return await GetOrDefaultAsync(fileId, token);
-        }
+        //save stream to disk
+        string filePath = fileStorageRepository.MakeFilePath(idWell, idCategory, fileFullName, fileId);
+        await fileStorageRepository.SaveFileAsync(filePath, fileStream, token);
 
-        /// <summary>
-        /// Сохранить файл
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idUser"></param>
-        /// <param name="idCategory"></param>
-        /// <param name="fileFullName"></param>
-        /// <param name="fileStream"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public async Task<FileInfoDto> SaveAsync(int idWell, int? idUser, int idCategory,
-            string fileFullName, Stream fileStream, CancellationToken token)
-        {
-            //save info to db
-            var dto = new FileInfoDto
+        return (await GetOrDefaultAsync(fileId, token))!;
+    }
+
+    /// <summary>
+    /// удалить файл
+    /// </summary>
+    /// <param name="idFile"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public Task<int> DeleteAsync(int idFile, CancellationToken token)
+        => DeleteAsync(new int[] { idFile }, token);
+
+    /// <summary>
+    /// удалить файлы
+    /// </summary>
+    /// <param name="ids"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<int> DeleteAsync(IEnumerable<int> ids, CancellationToken token)
+    {
+        if (ids is null || !ids.Any())
+            return 0;
+
+        var files = await fileRepository.DeleteAsync(ids, token).ConfigureAwait(false);
+
+        if (files is null || !files.Any())
+            return 0;
+
+        var filesName = files.Select(x => GetUrl(x.IdWell, x.IdCategory, x.Id, Path.GetExtension(x.Name)));
+        fileStorageRepository.DeleteFiles(filesName);
+
+        return files.Any() ? 1 : 0;
+    }
+
+    /// <summary>
+    /// получить путь для скачивания
+    /// </summary>
+    /// <param name="fileInfo"></param>
+    /// <returns></returns>
+    public string GetUrl(FileInfoDto fileInfo) =>
+        GetUrl(fileInfo.IdWell, fileInfo.IdCategory, fileInfo.Id, Path.GetExtension(fileInfo.Name));
+
+    /// <summary>
+    /// получить путь для скачивания
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idCategory"></param>
+    /// <param name="idFile"></param>
+    /// <param name="dotExtention"></param>
+    /// <returns></returns>
+    public string GetUrl(int idWell, int idCategory, int idFile, string dotExtention) =>
+        fileStorageRepository.GetFilePath(idWell, idCategory, idFile, dotExtention);
+
+    /// <summary>
+    /// пометить метку файла как удаленную
+    /// </summary>
+    /// <param name="idMark"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public Task<int> MarkFileMarkAsDeletedAsync(int idMark,
+        CancellationToken token)
+    => fileRepository.MarkFileMarkAsDeletedAsync(new int[] { idMark }, token);
+
+    /// <summary>
+    /// Инфо о файле
+    /// </summary>
+    /// <param name="idsFile"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<IEnumerable<FileInfoDto>> GetInfoByIdsAsync(IEnumerable<int> idsFile, CancellationToken token)
+    {
+        var result = await fileRepository.GetInfoByIdsAsync(idsFile, token).ConfigureAwait(false);
+        return result;
+    }
+
+    /// <summary>
+    /// Получить файлы определенной категории
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public Task<IEnumerable<FileInfoDto>> GetInfosAsync(FileRequest request, CancellationToken token)
+        => fileRepository.GetInfosAsync(request, token);
+
+    /// <summary>
+    /// Получить список файлов в контейнере
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public Task<PaginationContainer<FileInfoDto>> GetInfosPaginatedAsync(FileRequest request, CancellationToken token)
+        => fileRepository.GetInfosPaginatedAsync(request, token);
+
+    /// <summary>
+    /// Пометить файл как удаленный
+    /// </summary>
+    /// <param name="idFile"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public Task<int> MarkAsDeletedAsync(int idFile, CancellationToken token = default)
+        => fileRepository.MarkAsDeletedAsync(idFile, token);
+
+    /// <summary>
+    /// добавить метку на файл
+    /// </summary>
+    /// <param name="fileMarkDto"></param>
+    /// <param name="idUser"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public Task<int> CreateFileMarkAsync(FileMarkDto fileMarkDto, int idUser, CancellationToken token)
+        => fileRepository.CreateFileMarkAsync(fileMarkDto, idUser, token);
+
+    /// <summary>
+    /// Получить запись по id
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public Task<FileInfoDto?> GetOrDefaultAsync(int id, CancellationToken token)
+        => fileRepository.GetOrDefaultAsync(id, token);
+
+    /// <summary>
+    /// получить инфо о файле по метке
+    /// </summary>
+    /// <param name="idMark"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public Task<FileInfoDto> GetByMarkId(int idMark, CancellationToken token)
+        => fileRepository.GetByMarkId(idMark, token);
+
+    /// <summary>
+    /// получить инфо о файле по метке
+    /// </summary>
+    /// <param name="idsMarks"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public Task<int> MarkFileMarkAsDeletedAsync(IEnumerable<int> idsMarks, CancellationToken token)
+        => fileRepository.MarkFileMarkAsDeletedAsync(idsMarks, token);
+
+    /// <summary>
+    /// Удаление всех файлов по скважине помеченных как удаленные
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<int> DeleteFilesFromDbMarkedDeletionByIdWell(int idWell, CancellationToken token)
+    {
+        var files = await fileRepository.GetInfosAsync(
+            new FileRequest
             {
                 IdWell = idWell,
-                IdAuthor = idUser,
-                IdCategory = idCategory,
-                Name = Path.GetFileName(fileFullName),
-                Size = fileStream.Length
-            };
+                IsDeleted = true
+            },
+            token);
+        var result = await DeleteAsync(files.Select(x => x.Id), token);
+        return result;
+    }
 
-            var fileId = await fileRepository.InsertAsync(dto, token)
-                .ConfigureAwait(false);
+    /// <summary>
+    /// Удаление всех файлов с диска о которых нет информации в базе
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    public async Task<int> DeleteFilesNotExistStorage(int idWell, CancellationToken token)
+    {
+        var files = await fileRepository.GetInfosAsync(
+            new FileRequest
+            {
+                IdWell = idWell
+            },
+            token);
+        var result = await Task.FromResult(fileStorageRepository.DeleteFilesNotInList(idWell, files.Select(x => x.Id)));
+        return result;
+    }
 
-            //save stream to disk
-            string filePath = fileStorageRepository.MakeFilePath(idWell, idCategory, fileFullName, fileId);
-            await fileStorageRepository.SaveFileAsync(filePath, fileStream, token);
+    /// <summary>
+    /// Вывод списка всех файлов из базы, для которых нет файла на диске
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<IEnumerable<FileInfoDto>> GetListFilesNotDisc(int idWell, CancellationToken token)
+    {
+        var files = await fileRepository.GetInfosAsync(
+            new FileRequest
+            {
+                IdWell = idWell
+            },
+            token);
+        var result = fileStorageRepository.GetListFilesNotDisc(files);
+        return result;
+    }
 
-            return (await GetOrDefaultAsync(fileId, token))!;
-        }
+    /// <summary>
+    /// Получить файловый поток по идентификатору файла
+    /// </summary>
+    /// <param name="fileInfo"></param>
+    /// <returns></returns>
+    public Stream GetFileStream(FileInfoDto fileInfo)
+    {
+        var relativePath = GetUrl(fileInfo);
+        var fileStream = new FileStream(Path.GetFullPath(relativePath), FileMode.Open);
 
-        /// <summary>
-        /// удалить файл
-        /// </summary>
-        /// <param name="idFile"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public Task<int> DeleteAsync(int idFile, CancellationToken token)
-            => DeleteAsync(new int[] { idFile }, token);
-
-        /// <summary>
-        /// удалить файлы
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public async Task<int> DeleteAsync(IEnumerable<int> ids, CancellationToken token)
-        {
-            if (ids is null || !ids.Any())
-                return 0;
-
-            var files = await fileRepository.DeleteAsync(ids, token).ConfigureAwait(false);
-
-            if (files is null || !files.Any())
-                return 0;
-
-            var filesName = files.Select(x => GetUrl(x.IdWell, x.IdCategory, x.Id, Path.GetExtension(x.Name)));
-            fileStorageRepository.DeleteFiles(filesName);
-
-            return files.Any() ? 1 : 0;
-        }
-
-        /// <summary>
-        /// получить путь для скачивания
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <returns></returns>
-        public string GetUrl(FileInfoDto fileInfo) =>
-            GetUrl(fileInfo.IdWell, fileInfo.IdCategory, fileInfo.Id, Path.GetExtension(fileInfo.Name));
-
-        /// <summary>
-        /// получить путь для скачивания
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idCategory"></param>
-        /// <param name="idFile"></param>
-        /// <param name="dotExtention"></param>
-        /// <returns></returns>
-        public string GetUrl(int idWell, int idCategory, int idFile, string dotExtention) =>
-            fileStorageRepository.GetFilePath(idWell, idCategory, idFile, dotExtention);
-
-        /// <summary>
-        /// пометить метку файла как удаленную
-        /// </summary>
-        /// <param name="idMark"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public Task<int> MarkFileMarkAsDeletedAsync(int idMark,
-            CancellationToken token)
-        => fileRepository.MarkFileMarkAsDeletedAsync(new int[] { idMark }, token);
-
-        /// <summary>
-        /// Инфо о файле
-        /// </summary>
-        /// <param name="idsFile"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public async Task<IEnumerable<FileInfoDto>> GetInfoByIdsAsync(IEnumerable<int> idsFile, CancellationToken token)
-        {
-            var result = await fileRepository.GetInfoByIdsAsync(idsFile, token).ConfigureAwait(false);
-            return result;
-        }
-
-        /// <summary>
-        /// Получить файлы определенной категории
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public Task<IEnumerable<FileInfoDto>> GetInfosAsync(FileRequest request, CancellationToken token)
-            => fileRepository.GetInfosAsync(request, token);
-
-        /// <summary>
-        /// Получить список файлов в контейнере
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public Task<PaginationContainer<FileInfoDto>> GetInfosPaginatedAsync(FileRequest request, CancellationToken token)
-            => fileRepository.GetInfosPaginatedAsync(request, token);
-
-        /// <summary>
-        /// Пометить файл как удаленный
-        /// </summary>
-        /// <param name="idFile"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public Task<int> MarkAsDeletedAsync(int idFile, CancellationToken token = default)
-            => fileRepository.MarkAsDeletedAsync(idFile, token);
-
-        /// <summary>
-        /// добавить метку на файл
-        /// </summary>
-        /// <param name="fileMarkDto"></param>
-        /// <param name="idUser"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public Task<int> CreateFileMarkAsync(FileMarkDto fileMarkDto, int idUser, CancellationToken token)
-            => fileRepository.CreateFileMarkAsync(fileMarkDto, idUser, token);
-
-        /// <summary>
-        /// Получить запись по id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public Task<FileInfoDto?> GetOrDefaultAsync(int id, CancellationToken token)
-            => fileRepository.GetOrDefaultAsync(id, token);
-
-        /// <summary>
-        /// получить инфо о файле по метке
-        /// </summary>
-        /// <param name="idMark"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public Task<FileInfoDto> GetByMarkId(int idMark, CancellationToken token)
-            => fileRepository.GetByMarkId(idMark, token);
-
-        /// <summary>
-        /// получить инфо о файле по метке
-        /// </summary>
-        /// <param name="idsMarks"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public Task<int> MarkFileMarkAsDeletedAsync(IEnumerable<int> idsMarks, CancellationToken token)
-            => fileRepository.MarkFileMarkAsDeletedAsync(idsMarks, token);
-
-        /// <summary>
-        /// Удаление всех файлов по скважине помеченных как удаленные
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public async Task<int> DeleteFilesFromDbMarkedDeletionByIdWell(int idWell, CancellationToken token)
-        {
-            var files = await fileRepository.GetInfosAsync(
-                new FileRequest
-                {
-                    IdWell = idWell,
-                    IsDeleted = true
-                },
-                token);
-            var result = await DeleteAsync(files.Select(x => x.Id), token);
-            return result;
-        }
-
-        /// <summary>
-        /// Удаление всех файлов с диска о которых нет информации в базе
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        public async Task<int> DeleteFilesNotExistStorage(int idWell, CancellationToken token)
-        {
-            var files = await fileRepository.GetInfosAsync(
-                new FileRequest
-                {
-                    IdWell = idWell
-                },
-                token);
-            var result = await Task.FromResult(fileStorageRepository.DeleteFilesNotInList(idWell, files.Select(x => x.Id)));
-            return result;
-        }
-
-        /// <summary>
-        /// Вывод списка всех файлов из базы, для которых нет файла на диске
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public async Task<IEnumerable<FileInfoDto>> GetListFilesNotDisc(int idWell, CancellationToken token)
-        {
-            var files = await fileRepository.GetInfosAsync(
-                new FileRequest
-                {
-                    IdWell = idWell
-                },
-                token);
-            var result = fileStorageRepository.GetListFilesNotDisc(files);
-            return result;
-        }
-
-        /// <summary>
-        /// Получить файловый поток по идентификатору файла
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <returns></returns>
-        public Stream GetFileStream(FileInfoDto fileInfo)
-        {
-            var relativePath = GetUrl(fileInfo);
-            var fileStream = new FileStream(Path.GetFullPath(relativePath), FileMode.Open);
-
-            return fileStream;
-        }
+        return fileStream;
     }
 }
diff --git a/AsbCloudApp/Services/IAuthService.cs b/AsbCloudApp/Services/IAuthService.cs
index ac470f73..9eb9eac6 100644
--- a/AsbCloudApp/Services/IAuthService.cs
+++ b/AsbCloudApp/Services/IAuthService.cs
@@ -3,53 +3,52 @@ using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис авторизации
+/// </summary>
+public interface IAuthService
 {
     /// <summary>
-    /// Сервис авторизации
+    /// Смена пароля пользователю
     /// </summary>
-    public interface IAuthService
-    {
-        /// <summary>
-        /// Смена пароля пользователю
-        /// </summary>
-        /// <param name="idUser"></param>
-        /// <param name="newPassword"></param>
-        /// <returns></returns>
-        void ChangePassword(int idUser, string newPassword);
+    /// <param name="idUser"></param>
+    /// <param name="newPassword"></param>
+    /// <returns></returns>
+    void ChangePassword(int idUser, string newPassword);
 
-        /// <summary>
-        /// Смена пароля пользователю
-        /// </summary>
-        /// <param name="userLogin"></param>
-        /// <param name="newPassword"></param>
-        /// <returns></returns>
-        void ChangePassword(string userLogin, string newPassword);
+    /// <summary>
+    /// Смена пароля пользователю
+    /// </summary>
+    /// <param name="userLogin"></param>
+    /// <param name="newPassword"></param>
+    /// <returns></returns>
+    void ChangePassword(string userLogin, string newPassword);
 
-        /// <summary>
-        /// Авторизация
-        /// </summary>
-        /// <param name="login"></param>
-        /// <param name="password"></param>
-        /// <param name="token">токен отмены задачи</param>
-        /// <returns></returns>
-        Task<UserTokenDto?> LoginAsync(string login,
-            string password, CancellationToken token = default);
+    /// <summary>
+    /// Авторизация
+    /// </summary>
+    /// <param name="login"></param>
+    /// <param name="password"></param>
+    /// <param name="token">токен отмены задачи</param>
+    /// <returns></returns>
+    Task<UserTokenDto?> LoginAsync(string login,
+        string password, CancellationToken token = default);
 
-        /// <summary>
-        /// Обновление токена авторизации
-        /// </summary>
-        /// <param name="identity"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<UserTokenDto?> RefreshAsync(ClaimsPrincipal identity,
-            CancellationToken token);
+    /// <summary>
+    /// Обновление токена авторизации
+    /// </summary>
+    /// <param name="identity"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<UserTokenDto?> RefreshAsync(ClaimsPrincipal identity,
+        CancellationToken token);
 
-        /// <summary>
-        /// Регистрация нового пользователя
-        /// </summary>
-        /// <param name="userDto"></param>
-        /// <returns></returns>
-        void Register(UserRegistrationDto userDto);
-    }
+    /// <summary>
+    /// Регистрация нового пользователя
+    /// </summary>
+    /// <param name="userDto"></param>
+    /// <returns></returns>
+    void Register(UserRegistrationDto userDto);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/ICrudRepository.cs b/AsbCloudApp/Services/ICrudRepository.cs
index b4ab2459..df581326 100644
--- a/AsbCloudApp/Services/ICrudRepository.cs
+++ b/AsbCloudApp/Services/ICrudRepository.cs
@@ -2,73 +2,72 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис получения, добавления, изменения, удаления данных
+/// </summary>
+/// <typeparam name="TDto"></typeparam>
+public interface ICrudRepository<TDto>
+    where TDto : Data.IId
 {
     /// <summary>
-    /// Сервис получения, добавления, изменения, удаления данных
+    /// Код возврата ошибки: Id не найден в БД.
     /// </summary>
-    /// <typeparam name="TDto"></typeparam>
-    public interface ICrudRepository<TDto>
-        where TDto : Data.IId
-    {
-        /// <summary>
-        /// Код возврата ошибки: Id не найден в БД.
-        /// </summary>
-        public const int ErrorIdNotFound = -1;
+    public const int ErrorIdNotFound = -1;
 
-        /// <summary>
-        /// Получение всех записей
-        /// </summary>
-        /// <param name="token"></param>
-        /// <returns>emptyList if nothing found</returns>
-        Task<IEnumerable<TDto>> GetAllAsync(CancellationToken token);
+    /// <summary>
+    /// Получение всех записей
+    /// </summary>
+    /// <param name="token"></param>
+    /// <returns>emptyList if nothing found</returns>
+    Task<IEnumerable<TDto>> GetAllAsync(CancellationToken token);
 
-        /// <summary>
-        /// Получить запись по id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="token"></param>
-        /// <returns>null if not found</returns>
-        Task<TDto?> GetOrDefaultAsync(int id, CancellationToken token);
+    /// <summary>
+    /// Получить запись по id
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="token"></param>
+    /// <returns>null if not found</returns>
+    Task<TDto?> GetOrDefaultAsync(int id, CancellationToken token);
 
 
-        /// <summary>
-        /// Получить запись по id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns>null if not found</returns>
-        TDto? GetOrDefault(int id);
+    /// <summary>
+    /// Получить запись по id
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns>null if not found</returns>
+    TDto? GetOrDefault(int id);
 
-        /// <summary>
-        /// Добавление новой записи
-        /// </summary>
-        /// <param name="newItem"></param>
-        /// <param name="token"></param>
-        /// <returns>Id новой записи</returns>
-        Task<int> InsertAsync(TDto newItem, CancellationToken token);
+    /// <summary>
+    /// Добавление новой записи
+    /// </summary>
+    /// <param name="newItem"></param>
+    /// <param name="token"></param>
+    /// <returns>Id новой записи</returns>
+    Task<int> InsertAsync(TDto newItem, CancellationToken token);
 
-        /// <summary>
-        /// Добавление нескольких записей
-        /// </summary>
-        /// <param name="newItems"></param>
-        /// <param name="token"></param>
-        /// <returns>количество добавленных</returns>
-        Task<int> InsertRangeAsync(IEnumerable<TDto> newItems, CancellationToken token);
+    /// <summary>
+    /// Добавление нескольких записей
+    /// </summary>
+    /// <param name="newItems"></param>
+    /// <param name="token"></param>
+    /// <returns>количество добавленных</returns>
+    Task<int> InsertRangeAsync(IEnumerable<TDto> newItems, CancellationToken token);
 
-        /// <summary>
-        /// Отредактировать запись
-        /// </summary>
-        /// <param name="item"></param>
-        /// <param name="token"></param>
-        /// <returns>если больше 0 - Id записи, если меньше 0 - код ошибки</returns>
-        Task<int> UpdateAsync(TDto item, CancellationToken token);
+    /// <summary>
+    /// Отредактировать запись
+    /// </summary>
+    /// <param name="item"></param>
+    /// <param name="token"></param>
+    /// <returns>если больше 0 - Id записи, если меньше 0 - код ошибки</returns>
+    Task<int> UpdateAsync(TDto item, CancellationToken token);
 
-        /// <summary>
-        /// Удалить запись
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="token"></param>
-        /// <returns>количество добавленных, если меньше 0 - код ошибки</returns>
-        Task<int> DeleteAsync(int id, CancellationToken token);
-    }
+    /// <summary>
+    /// Удалить запись
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="token"></param>
+    /// <returns>количество добавленных, если меньше 0 - код ошибки</returns>
+    Task<int> DeleteAsync(int id, CancellationToken token);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/IDataSaubStatService.cs b/AsbCloudApp/Services/IDataSaubStatService.cs
index f72d4480..66088d31 100644
--- a/AsbCloudApp/Services/IDataSaubStatService.cs
+++ b/AsbCloudApp/Services/IDataSaubStatService.cs
@@ -2,23 +2,22 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис записи данных в таблицу DataSaubStat, которая используется для построения РТК-отчета
+/// </summary>
+public interface IDataSaubStatService
 {
     /// <summary>
-    /// Сервис записи данных в таблицу DataSaubStat, которая используется для построения РТК-отчета
+    /// Расчет статистики DataSaubStat
     /// </summary>
-    public interface IDataSaubStatService
-    {
-        /// <summary>
-        /// Расчет статистики DataSaubStat
-        /// </summary>
-        /// <param name="lastDaysFilter">
-        /// Количество дней за которые должны были приходить данные, чтобы телеметрия попала в обработку.
-        /// </param>
-        /// <param name="onProgressCallback"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task CreateStatAsync(int lastDaysFilter, Action<string, double?> onProgressCallback, CancellationToken token);
+    /// <param name="lastDaysFilter">
+    /// Количество дней за которые должны были приходить данные, чтобы телеметрия попала в обработку.
+    /// </param>
+    /// <param name="onProgressCallback"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task CreateStatAsync(int lastDaysFilter, Action<string, double?> onProgressCallback, CancellationToken token);
 
-    }
 }
diff --git a/AsbCloudApp/Services/IDrillParamsService.cs b/AsbCloudApp/Services/IDrillParamsService.cs
index c40ecf59..797f4d66 100644
--- a/AsbCloudApp/Services/IDrillParamsService.cs
+++ b/AsbCloudApp/Services/IDrillParamsService.cs
@@ -3,80 +3,79 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// The параметры бурения service.
+/// </summary>
+public interface IDrillParamsService : ICrudRepository<DrillParamsDto>
 {
     /// <summary>
-    /// The параметры бурения service.
+    /// default параметры бурения 
     /// </summary>
-    public interface IDrillParamsService : ICrudRepository<DrillParamsDto>
-    {
-        /// <summary>
-        /// default параметры бурения 
-        /// </summary>
-        /// <param name="idWell">The id well.</param>
-        /// <param name="startDepth">The start depth.</param>
-        /// <param name="endDepth">The end depth.</param>
-        /// <param name="token">The token.</param>
-        /// <returns>A Task.</returns>
-        Task<DrillParamsDto> GetDefaultDrillParamsAsync(int idWell, double startDepth,
-            double endDepth, CancellationToken token = default);
+    /// <param name="idWell">The id well.</param>
+    /// <param name="startDepth">The start depth.</param>
+    /// <param name="endDepth">The end depth.</param>
+    /// <param name="token">The token.</param>
+    /// <returns>A Task.</returns>
+    Task<DrillParamsDto> GetDefaultDrillParamsAsync(int idWell, double startDepth,
+        double endDepth, CancellationToken token = default);
 
-        /// <summary>
-        /// Все за скважину 
-        /// </summary>
-        /// <param name="idWell">The id well.</param>
-        /// <param name="token">The token.</param>
-        /// <returns>A Task.</returns>
-        Task<IEnumerable<DrillParamsDto>> GetAllAsync(int idWell,
-            CancellationToken token = default);
+    /// <summary>
+    /// Все за скважину 
+    /// </summary>
+    /// <param name="idWell">The id well.</param>
+    /// <param name="token">The token.</param>
+    /// <returns>A Task.</returns>
+    Task<IEnumerable<DrillParamsDto>> GetAllAsync(int idWell,
+        CancellationToken token = default);
 
-        /// <summary>
-        /// Все скважину по композитной скважине
-        /// </summary>
-        /// <param name="idWell">The id well.</param>
-        /// <param name="token">The token.</param>
-        /// <returns>A Task.</returns>
-        Task<IEnumerable<DrillParamsDto>> GetCompositeAllAsync(int idWell,
-            CancellationToken token = default);
+    /// <summary>
+    /// Все скважину по композитной скважине
+    /// </summary>
+    /// <param name="idWell">The id well.</param>
+    /// <param name="token">The token.</param>
+    /// <returns>A Task.</returns>
+    Task<IEnumerable<DrillParamsDto>> GetCompositeAllAsync(int idWell,
+        CancellationToken token = default);
 
-        /// <summary>
-        /// Добавить
-        /// </summary>
-        /// <param name="idWell">The id well.</param>
-        /// <param name="dto">The dto.</param>
-        /// <param name="token">The token.</param>
-        /// <returns>A Task.</returns>
-        Task<int> InsertAsync(int idWell, DrillParamsDto dto,
-            CancellationToken token = default);
+    /// <summary>
+    /// Добавить
+    /// </summary>
+    /// <param name="idWell">The id well.</param>
+    /// <param name="dto">The dto.</param>
+    /// <param name="token">The token.</param>
+    /// <returns>A Task.</returns>
+    Task<int> InsertAsync(int idWell, DrillParamsDto dto,
+        CancellationToken token = default);
 
-        /// <summary>
-        /// Добавить несколько
-        /// </summary>
-        /// <param name="idWell">The id well.</param>
-        /// <param name="dtos">The dtos.</param>
-        /// <param name="token">The token.</param>
-        /// <returns>A Task.</returns>
-        Task<int> InsertRangeAsync(int idWell, IEnumerable<DrillParamsDto> dtos,
-            CancellationToken token = default);
+    /// <summary>
+    /// Добавить несколько
+    /// </summary>
+    /// <param name="idWell">The id well.</param>
+    /// <param name="dtos">The dtos.</param>
+    /// <param name="token">The token.</param>
+    /// <returns>A Task.</returns>
+    Task<int> InsertRangeAsync(int idWell, IEnumerable<DrillParamsDto> dtos,
+        CancellationToken token = default);
 
-        /// <summary>
-        /// Редактировать
-        /// </summary>
-        /// <param name="idWell">The id well.</param>
-        /// <param name="dtoId">The dto id.</param>
-        /// <param name="dto">The dto.</param>
-        /// <param name="token">The token.</param>
-        /// <returns>A Task.</returns>
-        Task<int> UpdateAsync(int idWell, int dtoId, DrillParamsDto dto,
-            CancellationToken token = default);
+    /// <summary>
+    /// Редактировать
+    /// </summary>
+    /// <param name="idWell">The id well.</param>
+    /// <param name="dtoId">The dto id.</param>
+    /// <param name="dto">The dto.</param>
+    /// <param name="token">The token.</param>
+    /// <returns>A Task.</returns>
+    Task<int> UpdateAsync(int idWell, int dtoId, DrillParamsDto dto,
+        CancellationToken token = default);
 
-        /// <summary>
-        /// Удалить старые и сохранить новые
-        /// </summary>
-        /// <param name="idWell">The id well.</param>
-        /// <param name="dtos">The dtos.</param>
-        /// <param name="token">The token.</param>
-        /// <returns>A Task.</returns>
-        Task<int> SaveAsync(int idWell, IEnumerable<DrillParamsDto> dtos, CancellationToken token = default);
-    }
+    /// <summary>
+    /// Удалить старые и сохранить новые
+    /// </summary>
+    /// <param name="idWell">The id well.</param>
+    /// <param name="dtos">The dtos.</param>
+    /// <param name="token">The token.</param>
+    /// <returns>A Task.</returns>
+    Task<int> SaveAsync(int idWell, IEnumerable<DrillParamsDto> dtos, CancellationToken token = default);
 }
diff --git a/AsbCloudApp/Services/IDrillTestReportService.cs b/AsbCloudApp/Services/IDrillTestReportService.cs
index f13f0aa2..1773beb0 100644
--- a/AsbCloudApp/Services/IDrillTestReportService.cs
+++ b/AsbCloudApp/Services/IDrillTestReportService.cs
@@ -5,31 +5,30 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// сервис по работе с отчетами drill test
+/// </summary>
+public interface IDrillTestReportService
 {
     /// <summary>
-    /// сервис по работе с отчетами drill test
+    /// Список файлов drill test
     /// </summary>
-    public interface IDrillTestReportService
-    {
-        /// <summary>
-        /// Список файлов drill test
-        /// </summary>
-        /// <param name="idWell">ключ скважины</param>
-        /// <param name="request">параметры запроса</param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task<PaginationContainer<DrillTestReportInfoDto>> GetListAsync(int idWell,
-            FileReportRequest request,
-            CancellationToken cancellationToken);
+    /// <param name="idWell">ключ скважины</param>
+    /// <param name="request">параметры запроса</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<PaginationContainer<DrillTestReportInfoDto>> GetListAsync(int idWell,
+        FileReportRequest request,
+        CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Генерация файла с отчётом
-        /// </summary>
-        /// <param name="idWell">ключ скважины</param>
-        /// <param name="id">ключ drill test записи</param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task<(string fileName, Stream stream)> GenerateAsync(int idWell, int id, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Генерация файла с отчётом
+    /// </summary>
+    /// <param name="idWell">ключ скважины</param>
+    /// <param name="id">ключ drill test записи</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<(string fileName, Stream stream)> GenerateAsync(int idWell, int id, CancellationToken cancellationToken);
 }
diff --git a/AsbCloudApp/Services/IDrillingProgramService.cs b/AsbCloudApp/Services/IDrillingProgramService.cs
index f8742ac5..84f58558 100644
--- a/AsbCloudApp/Services/IDrillingProgramService.cs
+++ b/AsbCloudApp/Services/IDrillingProgramService.cs
@@ -4,111 +4,110 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Программа бурения
+/// </summary>
+public interface IDrillingProgramService
 {
     /// <summary>
-    /// Программа бурения
+    /// Получить пользователей доступных для назначения в публикаторы или акцепторы
     /// </summary>
-    public interface IDrillingProgramService
-    {
-        /// <summary>
-        /// Получить пользователей доступных для назначения в публикаторы или акцепторы
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<UserDto>> GetAvailableUsers(int idWell, CancellationToken token = default);
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<UserDto>> GetAvailableUsers(int idWell, CancellationToken token = default);
 
-        /// <summary>
-        /// Части программы бурения
-        /// </summary>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<FileCategoryDto>> GetCategoriesAsync(CancellationToken token = default);
+    /// <summary>
+    /// Части программы бурения
+    /// </summary>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<FileCategoryDto>> GetCategoriesAsync(CancellationToken token = default);
 
-        /// <summary>
-        /// Состояние программы бурения
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idUser"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<DrillingProgramStateDto> GetStateAsync(int idWell, int idUser,
-            CancellationToken token = default);
+    /// <summary>
+    /// Состояние программы бурения
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idUser"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<DrillingProgramStateDto> GetStateAsync(int idWell, int idUser,
+        CancellationToken token = default);
 
-        /// <summary>
-        /// Загрузить файл
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idFileCategory"></param>
-        /// <param name="idUser"></param>
-        /// <param name="fileFullName"></param>
-        /// <param name="fileStream"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> AddFile(int idWell, int idFileCategory, int idUser, string fileFullName, System.IO.Stream fileStream, CancellationToken token = default);
-        
-        /// <summary>
-        /// Добавить часть программы бурения
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idFileCategories"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> AddPartsAsync(int idWell, IEnumerable<int> idFileCategories, CancellationToken token = default);
+    /// <summary>
+    /// Загрузить файл
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idFileCategory"></param>
+    /// <param name="idUser"></param>
+    /// <param name="fileFullName"></param>
+    /// <param name="fileStream"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> AddFile(int idWell, int idFileCategory, int idUser, string fileFullName, System.IO.Stream fileStream, CancellationToken token = default);
+    
+    /// <summary>
+    /// Добавить часть программы бурения
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idFileCategories"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> AddPartsAsync(int idWell, IEnumerable<int> idFileCategories, CancellationToken token = default);
 
-        /// <summary>
-        /// Удалить часть программы бурения
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idFileCategories"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> RemovePartsAsync(int idWell, IEnumerable<int> idFileCategories, CancellationToken token = default);
-        
-        /// <summary>
-        /// Назначить пользователю роль
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idFileCategory"></param>
-        /// <param name="idUser"></param>
-        /// <param name="idUserRole"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> AddUserAsync(int idWell, int idFileCategory, int idUser, int idUserRole, CancellationToken token = default);
+    /// <summary>
+    /// Удалить часть программы бурения
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idFileCategories"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> RemovePartsAsync(int idWell, IEnumerable<int> idFileCategories, CancellationToken token = default);
+    
+    /// <summary>
+    /// Назначить пользователю роль
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idFileCategory"></param>
+    /// <param name="idUser"></param>
+    /// <param name="idUserRole"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> AddUserAsync(int idWell, int idFileCategory, int idUser, int idUserRole, CancellationToken token = default);
 
-        /// <summary>
-        /// Удалить пользователя
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idFileCategory"></param>
-        /// <param name="idUser"></param>
-        /// <param name="idUserRole"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> RemoveUserAsync(int idWell, int idFileCategory, int idUser, int idUserRole, CancellationToken token = default);
+    /// <summary>
+    /// Удалить пользователя
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idFileCategory"></param>
+    /// <param name="idUser"></param>
+    /// <param name="idUserRole"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> RemoveUserAsync(int idWell, int idFileCategory, int idUser, int idUserRole, CancellationToken token = default);
 
-        /// <summary>
-        /// Добавить или изменить отметку для файла (согласование/отклонение)
-        /// </summary>
-        /// <param name="fileMarkDto"></param>
-        /// <param name="idUser"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> AddOrReplaceFileMarkAsync(FileMarkDto fileMarkDto, int idUser, CancellationToken token);
+    /// <summary>
+    /// Добавить или изменить отметку для файла (согласование/отклонение)
+    /// </summary>
+    /// <param name="fileMarkDto"></param>
+    /// <param name="idUser"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> AddOrReplaceFileMarkAsync(FileMarkDto fileMarkDto, int idUser, CancellationToken token);
 
-        /// <summary>
-        /// Удалить отметку с файла
-        /// </summary>
-        /// <param name="idFileMark"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> MarkAsDeletedFileMarkAsync(int idFileMark, CancellationToken token);
+    /// <summary>
+    /// Удалить отметку с файла
+    /// </summary>
+    /// <param name="idFileMark"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> MarkAsDeletedFileMarkAsync(int idFileMark, CancellationToken token);
 
-        /// <summary>
-        /// Сбросить ошибку формирования
-        /// </summary>
-        /// <param name="idWell"></param>
-        void ClearError(int idWell);
-    }
+    /// <summary>
+    /// Сбросить ошибку формирования
+    /// </summary>
+    /// <param name="idWell"></param>
+    void ClearError(int idWell);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/IEventService.cs b/AsbCloudApp/Services/IEventService.cs
index 8efb1b2c..a376b649 100644
--- a/AsbCloudApp/Services/IEventService.cs
+++ b/AsbCloudApp/Services/IEventService.cs
@@ -3,21 +3,20 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис сохранения списка сообщений от панелей
+/// </summary>
+public interface IEventService
 {
     /// <summary>
-    /// Сервис сохранения списка сообщений от панелей
+    /// Сохранить. Добавить или заменить.
     /// </summary>
-    public interface IEventService
-    {
-        /// <summary>
-        /// Сохранить. Добавить или заменить.
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="dtos"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task UpsertAsync(string uid, IEnumerable<EventDto> dtos,
-            CancellationToken token = default);
-    }
+    /// <param name="uid"></param>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task UpsertAsync(string uid, IEnumerable<EventDto> dtos,
+        CancellationToken token = default);
 }
diff --git a/AsbCloudApp/Services/IFileCategoryService.cs b/AsbCloudApp/Services/IFileCategoryService.cs
index bc00acea..66e0aa00 100644
--- a/AsbCloudApp/Services/IFileCategoryService.cs
+++ b/AsbCloudApp/Services/IFileCategoryService.cs
@@ -3,25 +3,24 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис "Категории документов (файлов)"
+/// </summary>
+public interface IFileCategoryService
 {
     /// <summary>
-    /// Сервис "Категории документов (файлов)"
+    /// Получить категории файлов
     /// </summary>
-    public interface IFileCategoryService
-    {
-        /// <summary>
-        /// Получить категории файлов
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<FileCategoryDto?> GetOrDefaultAsync(int id, CancellationToken token);
+    /// <param name="id"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<FileCategoryDto?> GetOrDefaultAsync(int id, CancellationToken token);
 
-        /// <summary>
-        /// Получение справочника категорий файлов
-        /// </summary>
-        /// <returns></returns>
-        Task<IEnumerable<FileCategoryDto>> GetWellCaseCategoriesAsync(CancellationToken token);
-    }
+    /// <summary>
+    /// Получение справочника категорий файлов
+    /// </summary>
+    /// <returns></returns>
+    Task<IEnumerable<FileCategoryDto>> GetWellCaseCategoriesAsync(CancellationToken token);
 }
diff --git a/AsbCloudApp/Services/ILimitingParameterService.cs b/AsbCloudApp/Services/ILimitingParameterService.cs
index 1424e392..df32e532 100644
--- a/AsbCloudApp/Services/ILimitingParameterService.cs
+++ b/AsbCloudApp/Services/ILimitingParameterService.cs
@@ -4,25 +4,24 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис по ограничивающим параметрам с фильтрацией
+/// </summary>
+public interface ILimitingParameterService
 {
     /// <summary>
-    /// Сервис по ограничивающим параметрам с фильтрацией
+    /// Получение статистики по ограничивающим параметрам
     /// </summary>
-    public interface ILimitingParameterService
-    {
-        /// <summary>
-        /// Получение статистики по ограничивающим параметрам
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<LimitingParameterDto>> GetStatAsync(LimitingParameterRequest request, CancellationToken token);
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<LimitingParameterDto>> GetStatAsync(LimitingParameterRequest request, CancellationToken token);
 
-        /// <summary>
-        /// Получение списка ограничений
-        /// </summary>
-        /// <returns></returns>
-        Dictionary<int, string> GetLimitingParameteraNames();
-    }
+    /// <summary>
+    /// Получение списка ограничений
+    /// </summary>
+    /// <returns></returns>
+    Dictionary<int, string> GetLimitingParameteraNames();
 }
diff --git a/AsbCloudApp/Services/IMeasureService.cs b/AsbCloudApp/Services/IMeasureService.cs
index e3b89111..70c91dbf 100644
--- a/AsbCloudApp/Services/IMeasureService.cs
+++ b/AsbCloudApp/Services/IMeasureService.cs
@@ -3,72 +3,71 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис хранения результатов лабораторных анализов и измерений
+/// </summary>
+public interface IMeasureService
 {
     /// <summary>
-    /// Сервис хранения результатов лабораторных анализов и измерений
+    /// Категории измерений
     /// </summary>
-    public interface IMeasureService
-    {
-        /// <summary>
-        /// Категории измерений
-        /// </summary>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<Dictionary<int, string>> GetCategoriesAsync(CancellationToken token);
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<Dictionary<int, string>> GetCategoriesAsync(CancellationToken token);
 
-        /// <summary>
-        /// Последние измерения по категории
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idCategory"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<MeasureDto?> GetLastOrDefaultAsync(int idWell, int idCategory, CancellationToken token);
+    /// <summary>
+    /// Последние измерения по категории
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idCategory"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<MeasureDto?> GetLastOrDefaultAsync(int idWell, int idCategory, CancellationToken token);
 
-        /// <summary>
-        /// История измерений по категории
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idCategory"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<MeasureDto>> GetHisoryAsync(int idWell, int? idCategory, CancellationToken token);
-        
-        /// <summary>
-        /// Добавить измерение
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="data"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> InsertAsync(int idWell, MeasureDto data, CancellationToken token);
+    /// <summary>
+    /// История измерений по категории
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idCategory"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<MeasureDto>> GetHisoryAsync(int idWell, int? idCategory, CancellationToken token);
+    
+    /// <summary>
+    /// Добавить измерение
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="data"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> InsertAsync(int idWell, MeasureDto data, CancellationToken token);
 
-        /// <summary>
-        /// Редактировать
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="data"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> UpdateAsync(int idWell, MeasureDto data, CancellationToken token);
+    /// <summary>
+    /// Редактировать
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="data"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> UpdateAsync(int idWell, MeasureDto data, CancellationToken token);
 
-        /// <summary>
-        /// Пометить удаленным
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idData"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> MarkAsDeleteAsync(int idWell, int idData, CancellationToken token);
+    /// <summary>
+    /// Пометить удаленным
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idData"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> MarkAsDeleteAsync(int idWell, int idData, CancellationToken token);
 
-        /// <summary>
-        /// Удалить
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idData"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> DeleteAsync(int idWell, int idData, CancellationToken token);
-    }
+    /// <summary>
+    /// Удалить
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idData"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> DeleteAsync(int idWell, int idData, CancellationToken token);
 }
diff --git a/AsbCloudApp/Services/IMessageService.cs b/AsbCloudApp/Services/IMessageService.cs
index 0a6557ba..5a5f4d17 100644
--- a/AsbCloudApp/Services/IMessageService.cs
+++ b/AsbCloudApp/Services/IMessageService.cs
@@ -5,29 +5,28 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис сообщений панели оператора
+/// </summary>
+public interface IMessageService : ITelemetryDataEditorService
 {
     /// <summary>
-    /// Сервис сообщений панели оператора
+    /// Получить сообщения по параметрам
     /// </summary>
-    public interface IMessageService : ITelemetryDataEditorService
-    {
-        /// <summary>
-        /// Получить сообщения по параметрам
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<PaginationContainer<MessageDto>> GetMessagesAsync(MessageRequest request, CancellationToken token);
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<PaginationContainer<MessageDto>> GetMessagesAsync(MessageRequest request, CancellationToken token);
 
-        /// <summary>
-        /// Метод для сохранения сообщения от панели
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="dtos"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task InsertAsync(string uid, IEnumerable<TelemetryMessageDto> dtos,
-            CancellationToken token);
-    }
+    /// <summary>
+    /// Метод для сохранения сообщения от панели
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task InsertAsync(string uid, IEnumerable<TelemetryMessageDto> dtos,
+        CancellationToken token);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/IOperationsStatService.cs b/AsbCloudApp/Services/IOperationsStatService.cs
index 0861d8b1..d437bf52 100644
--- a/AsbCloudApp/Services/IOperationsStatService.cs
+++ b/AsbCloudApp/Services/IOperationsStatService.cs
@@ -4,44 +4,43 @@ using System.Threading;
 using System.Threading.Tasks;
 using AsbCloudApp.Data.WellOperation;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис расчета статистики по операциям вводимым вручную
+/// </summary>
+public interface IOperationsStatService
 {
     /// <summary>
-    /// Сервис расчета статистики по операциям вводимым вручную
+    /// Получить статистику МСП по кусту в котором находится скважина с IdWell
     /// </summary>
-    public interface IOperationsStatService
-    {
-        /// <summary>
-        /// Получить статистику МСП по кусту в котором находится скважина с IdWell
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<ClusterRopStatDto?> GetOrDefaultRopStatAsync(int idWell, CancellationToken token);
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<ClusterRopStatDto?> GetOrDefaultRopStatAsync(int idWell, CancellationToken token);
 
-        /// <summary>
-        /// Получить статистику по скважинам куста, которые доступны компании
-        /// </summary>
-        /// <param name="idCluster"></param>
-        /// <param name="idCompany"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<StatClusterDto?> GetOrDefaultStatClusterAsync(int idCluster, int idCompany, CancellationToken token);
+    /// <summary>
+    /// Получить статистику по скважинам куста, которые доступны компании
+    /// </summary>
+    /// <param name="idCluster"></param>
+    /// <param name="idCompany"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<StatClusterDto?> GetOrDefaultStatClusterAsync(int idCluster, int idCompany, CancellationToken token);
 
-        /// <summary>
-        /// получить статистику по скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<StatWellDto?> GetOrDefaultWellStatAsync(int idWell, CancellationToken token);
+    /// <summary>
+    /// получить статистику по скважине
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<StatWellDto?> GetOrDefaultWellStatAsync(int idWell, CancellationToken token);
 
-        /// <summary>
-        /// Получить статистику по набору скважин
-        /// </summary>
-        /// <param name="idWells"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<StatWellDto>> GetWellsStatAsync(IEnumerable<int> idWells, CancellationToken token);
-    }
+    /// <summary>
+    /// Получить статистику по набору скважин
+    /// </summary>
+    /// <param name="idWells"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<StatWellDto>> GetWellsStatAsync(IEnumerable<int> idWells, CancellationToken token);
 }
diff --git a/AsbCloudApp/Services/IReduceSamplingService.cs b/AsbCloudApp/Services/IReduceSamplingService.cs
index eb7dacf5..e63072fe 100644
--- a/AsbCloudApp/Services/IReduceSamplingService.cs
+++ b/AsbCloudApp/Services/IReduceSamplingService.cs
@@ -1,41 +1,40 @@
 using AsbCloudApp.Data;
 using System.Collections.Generic;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Делегат обновления состояния задачи
+/// </summary>
+/// <param name="job"></param>
+public delegate void OnJobProgressDelagate(JobDto job);
+
+/// <summary>
+/// Сервис прореживания архива БД.
+/// Удаляет часть телеметрии.
+/// Понижает частоту записей в БД с 1 запись за 1 сек до 1 запись за N сек.
+/// </summary>
+public interface IReduceSamplingService
 {
     /// <summary>
-    /// Делегат обновления состояния задачи
+    /// Получить все задания. Задания удаляются минимум через 10 сек после выполнения, возможно позднее.
     /// </summary>
-    /// <param name="job"></param>
-    public delegate void OnJobProgressDelagate(JobDto job);
+    /// <returns>Enumerable of JobDto or empty</returns>
+    IEnumerable<JobDto> GetJobs();
 
     /// <summary>
-    /// Сервис прореживания архива БД.
-    /// Удаляет часть телеметрии.
-    /// Понижает частоту записей в БД с 1 запись за 1 сек до 1 запись за N сек.
+    /// Получить состояние определенной задачи
     /// </summary>
-    public interface IReduceSamplingService
-    {
-        /// <summary>
-        /// Получить все задания. Задания удаляются минимум через 10 сек после выполнения, возможно позднее.
-        /// </summary>
-        /// <returns>Enumerable of JobDto or empty</returns>
-        IEnumerable<JobDto> GetJobs();
+    /// <param name="idTelemetry"></param>
+    /// <returns></returns>
+    JobDto? GetOrDefaultState(int idTelemetry);
 
-        /// <summary>
-        /// Получить состояние определенной задачи
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <returns></returns>
-        JobDto? GetOrDefaultState(int idTelemetry);
-
-        /// <summary>
-        /// Создать задачу прореживанию архива и добавить её в очередь на выполнение
-        /// </summary>
-        /// <param name="idTelemetry">телеметрия для прореживания</param>
-        /// <param name="onProgress">колбек процесса выполнения</param>
-        /// <param name="jobDto">созданная задача или задача из очереди</param>
-        /// <returns>задача добавлена == true</returns>
-        bool TryEnqueueRediceSamplingJob(int idTelemetry, OnJobProgressDelagate onProgress, out JobDto jobDto);
-    }
+    /// <summary>
+    /// Создать задачу прореживанию архива и добавить её в очередь на выполнение
+    /// </summary>
+    /// <param name="idTelemetry">телеметрия для прореживания</param>
+    /// <param name="onProgress">колбек процесса выполнения</param>
+    /// <param name="jobDto">созданная задача или задача из очереди</param>
+    /// <returns>задача добавлена == true</returns>
+    bool TryEnqueueRediceSamplingJob(int idTelemetry, OnJobProgressDelagate onProgress, out JobDto jobDto);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/IReportService.cs b/AsbCloudApp/Services/IReportService.cs
index 19c0d70b..2e287a91 100644
--- a/AsbCloudApp/Services/IReportService.cs
+++ b/AsbCloudApp/Services/IReportService.cs
@@ -6,70 +6,69 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис рапортов
+/// </summary>
+public interface IReportService
 {
+
     /// <summary>
-    /// Сервис рапортов
+    /// Поставить рапорт в очередь на формирование
     /// </summary>
-    public interface IReportService
-    {
+    /// <param name="idWell"></param>
+    /// <param name="idUser"></param>
+    /// <param name="request"></param>
+    /// <param name="handleReportProgress"></param>
+    /// <returns></returns>
+    string EnqueueCreateReportWork(int idWell, int idUser, ReportParametersRequest request,
+        Action<object, string> handleReportProgress);
 
-        /// <summary>
-        /// Поставить рапорт в очередь на формирование
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idUser"></param>
-        /// <param name="request"></param>
-        /// <param name="handleReportProgress"></param>
-        /// <returns></returns>
-        string EnqueueCreateReportWork(int idWell, int idUser, ReportParametersRequest request,
-            Action<object, string> handleReportProgress);
+    /// <summary>
+    /// Создание отчета
+    /// </summary>
+    /// <param name="workId"></param>
+    /// <param name="idWell"></param>
+    /// <param name="idUser"></param>
+    /// <param name="request"></param>
+    /// <param name="progressHandler"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task CreateReportAsync(string workId, int idWell, int idUser, ReportParametersRequest request, Action<ProgressDto, string> progressHandler, CancellationToken token);
 
-        /// <summary>
-        /// Создание отчета
-        /// </summary>
-        /// <param name="workId"></param>
-        /// <param name="idWell"></param>
-        /// <param name="idUser"></param>
-        /// <param name="request"></param>
-        /// <param name="progressHandler"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task CreateReportAsync(string workId, int idWell, int idUser, ReportParametersRequest request, Action<ProgressDto, string> progressHandler, CancellationToken token);
+    /// <summary>
+    /// Получить предполагаемый список страниц рапорта
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="begin"></param>
+    /// <param name="end"></param>
+    /// <param name="stepSeconds"></param>
+    /// <param name="format"></param>
+    /// <returns></returns>
+    int GetReportPagesCount(int idWell, DateTimeOffset begin, DateTimeOffset end,
+        int stepSeconds, int format);
 
-        /// <summary>
-        /// Получить предполагаемый список страниц рапорта
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="begin"></param>
-        /// <param name="end"></param>
-        /// <param name="stepSeconds"></param>
-        /// <param name="format"></param>
-        /// <returns></returns>
-        int GetReportPagesCount(int idWell, DateTimeOffset begin, DateTimeOffset end,
-            int stepSeconds, int format);
+    /// <summary>
+    /// получить диапазон дат за которые есть данные
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <returns></returns>
+    DatesRangeDto? GetDatesRangeOrDefault(int idWell);
 
-        /// <summary>
-        /// получить диапазон дат за которые есть данные
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <returns></returns>
-        DatesRangeDto? GetDatesRangeOrDefault(int idWell);
+    /// <summary>
+    /// Список готовых рапортов
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<ReportPropertiesDto>> GetAllReportsByWellAsync(int idWell, CancellationToken token);
 
-        /// <summary>
-        /// Список готовых рапортов
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<ReportPropertiesDto>> GetAllReportsByWellAsync(int idWell, CancellationToken token);
-
-        /// <summary>
-        /// Удаление отчетов, если превышен их период хранения
-        /// </summary>
-        /// <param name="lifetime">период хранения отчетов</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> DeleteAllOldReportsAsync(TimeSpan lifetime, CancellationToken token);
-    }
+    /// <summary>
+    /// Удаление отчетов, если превышен их период хранения
+    /// </summary>
+    /// <param name="lifetime">период хранения отчетов</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> DeleteAllOldReportsAsync(TimeSpan lifetime, CancellationToken token);
 }
diff --git a/AsbCloudApp/Services/IRepositoryWellRelated.cs b/AsbCloudApp/Services/IRepositoryWellRelated.cs
index ac98cfd1..829a8db4 100644
--- a/AsbCloudApp/Services/IRepositoryWellRelated.cs
+++ b/AsbCloudApp/Services/IRepositoryWellRelated.cs
@@ -3,30 +3,29 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Репозиторий получения, добавления, изменения, удаления данных<br/>
+/// Для сущностей относящихся к скважине
+/// </summary>
+/// <typeparam name="Tdto"></typeparam>
+public interface IRepositoryWellRelated<Tdto> : ICrudRepository<Tdto>
+    where Tdto : IId, IWellRelated
 {
     /// <summary>
-    /// Репозиторий получения, добавления, изменения, удаления данных<br/>
-    /// Для сущностей относящихся к скважине
+    /// Получение всех записей по скважине
     /// </summary>
-    /// <typeparam name="Tdto"></typeparam>
-    public interface IRepositoryWellRelated<Tdto> : ICrudRepository<Tdto>
-        where Tdto : IId, IWellRelated
-    {
-        /// <summary>
-        /// Получение всех записей по скважине
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="token"></param>
-        /// <returns>emptyList if nothing found</returns>
-        Task<IEnumerable<Tdto>> GetByIdWellAsync(int idWell, CancellationToken token);
+    /// <param name="idWell">id скважины</param>
+    /// <param name="token"></param>
+    /// <returns>emptyList if nothing found</returns>
+    Task<IEnumerable<Tdto>> GetByIdWellAsync(int idWell, CancellationToken token);
 
-        /// <summary>
-        /// Получение всех записей по нескольким скважинам
-        /// </summary>
-        /// <param name="idsWells">id скважин</param>
-        /// <param name="token"></param>
-        /// <returns>emptyList if nothing found</returns>
-        Task<IEnumerable<Tdto>> GetByIdWellAsync(IEnumerable<int> idsWells, CancellationToken token);
-    }
+    /// <summary>
+    /// Получение всех записей по нескольким скважинам
+    /// </summary>
+    /// <param name="idsWells">id скважин</param>
+    /// <param name="token"></param>
+    /// <returns>emptyList if nothing found</returns>
+    Task<IEnumerable<Tdto>> GetByIdWellAsync(IEnumerable<int> idsWells, CancellationToken token);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/IRequestTracker.cs b/AsbCloudApp/Services/IRequestTracker.cs
index efaf6048..3be30f4d 100644
--- a/AsbCloudApp/Services/IRequestTracker.cs
+++ b/AsbCloudApp/Services/IRequestTracker.cs
@@ -2,59 +2,58 @@ using AsbCloudApp.Data;
 using System;
 using System.Collections.Generic;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Отслеживание и сбор статистики по запросам
+/// </summary>
+public interface IRequerstTrackerService
 {
     /// <summary>
-    /// Отслеживание и сбор статистики по запросам
+    /// Регистрирует новый запрос
     /// </summary>
-    public interface IRequerstTrackerService
-    {
-        /// <summary>
-        /// Регистрирует новый запрос
-        /// </summary>
-        /// <param name="requestLog"></param>
-        void RegisterRequest(RequestLogDto requestLog);
+    /// <param name="requestLog"></param>
+    void RegisterRequest(RequestLogDto requestLog);
 
-        /// <summary>
-        /// Регистрирует новый запрос, вызвавший ошибку на сервере
-        /// </summary>
-        /// <param name="requestLog"></param>
-        /// <param name="ex"></param>
-        void RegisterRequestError(RequestLogDto requestLog, Exception ex);
+    /// <summary>
+    /// Регистрирует новый запрос, вызвавший ошибку на сервере
+    /// </summary>
+    /// <param name="requestLog"></param>
+    /// <param name="ex"></param>
+    void RegisterRequestError(RequestLogDto requestLog, Exception ex);
 
-        /// <summary>
-        /// все зарегистрированные запросы
-        /// </summary>
-        /// <param name="take"></param>
-        /// <returns></returns>
-        IEnumerable<RequestLogDto> GetAll(int? take);
+    /// <summary>
+    /// все зарегистрированные запросы
+    /// </summary>
+    /// <param name="take"></param>
+    /// <returns></returns>
+    IEnumerable<RequestLogDto> GetAll(int? take);
 
-        /// <summary>
-        /// запросы которые выполнялись быстро
-        /// </summary>
-        /// <param name="take"></param>
-        /// <returns></returns>
-        IEnumerable<RequestLogDto> GetFast(int? take);
+    /// <summary>
+    /// запросы которые выполнялись быстро
+    /// </summary>
+    /// <param name="take"></param>
+    /// <returns></returns>
+    IEnumerable<RequestLogDto> GetFast(int? take);
 
-        /// <summary>
-        /// запросы, которые выполнялись медленно
-        /// </summary>
-        /// <param name="take"></param>
-        /// <returns></returns>
-        IEnumerable<RequestLogDto> GetSlow(int? take);
+    /// <summary>
+    /// запросы, которые выполнялись медленно
+    /// </summary>
+    /// <param name="take"></param>
+    /// <returns></returns>
+    IEnumerable<RequestLogDto> GetSlow(int? take);
 
-        /// <summary>
-        /// запросы, которые завершились ошибкой
-        /// </summary>
-        /// <param name="take"></param>
-        /// <returns></returns>
-        IEnumerable<RequestLogDto> GetError(int? take);
+    /// <summary>
+    /// запросы, которые завершились ошибкой
+    /// </summary>
+    /// <param name="take"></param>
+    /// <returns></returns>
+    IEnumerable<RequestLogDto> GetError(int? take);
 
-        /// <summary>
-        /// Статистика посещений пользователей
-        /// </summary>
-        /// <param name="take"></param>
-        /// <returns></returns>
-        IEnumerable<RequestLogUserDto> GetUsersStat(int? take);
-    }
+    /// <summary>
+    /// Статистика посещений пользователей
+    /// </summary>
+    /// <param name="take"></param>
+    /// <returns></returns>
+    IEnumerable<RequestLogUserDto> GetUsersStat(int? take);
 }
diff --git a/AsbCloudApp/Services/IScheduleReportService.cs b/AsbCloudApp/Services/IScheduleReportService.cs
index 5c7e535f..b26b2b85 100644
--- a/AsbCloudApp/Services/IScheduleReportService.cs
+++ b/AsbCloudApp/Services/IScheduleReportService.cs
@@ -2,19 +2,18 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис формирования Сетевого графика. 
+/// </summary>
+public interface IScheduleReportService
 {
     /// <summary>
-    /// Сервис формирования Сетевого графика. 
+    /// Сформировать.
     /// </summary>
-    public interface IScheduleReportService
-    {
-        /// <summary>
-        /// Сформировать.
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<Stream> MakeReportAsync(int idWell, CancellationToken token = default);
-    }
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<Stream> MakeReportAsync(int idWell, CancellationToken token = default);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/IScheduleService.cs b/AsbCloudApp/Services/IScheduleService.cs
index 8181ba59..6eafa089 100644
--- a/AsbCloudApp/Services/IScheduleService.cs
+++ b/AsbCloudApp/Services/IScheduleService.cs
@@ -5,37 +5,36 @@ using System.Threading;
 using System.Threading.Tasks;
 using AsbCloudApp.Requests;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Репозиторий расписания смен бурильщика
+/// </summary>
+public interface IScheduleRepository : IRepositoryWellRelated<ScheduleDto>
 {
     /// <summary>
-    /// Репозиторий расписания смен бурильщика
+    /// Получить расписание смен
     /// </summary>
-    public interface IScheduleRepository : IRepositoryWellRelated<ScheduleDto>
-    {
-        /// <summary>
-        /// Получить расписание смен
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="workTime"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<ScheduleDto>> GetAsync(int idWell, DateTimeOffset workTime, CancellationToken token);
-        
-        /// <summary>
-        /// получить бурильщика по idWell и времени
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="workTime"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<DrillerDto?> GetOrDefaultDrillerAsync(int idWell, DateTimeOffset workTime, CancellationToken token);
+    /// <param name="idWell"></param>
+    /// <param name="workTime"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<ScheduleDto>> GetAsync(int idWell, DateTimeOffset workTime, CancellationToken token);
+    
+    /// <summary>
+    /// получить бурильщика по idWell и времени
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="workTime"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<DrillerDto?> GetOrDefaultDrillerAsync(int idWell, DateTimeOffset workTime, CancellationToken token);
 
-        /// <summary>
-        /// Получить расписание смен
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<ScheduleDto>> GetPageAsync(GetStatRequest request, CancellationToken token);
-    }
+    /// <summary>
+    /// Получить расписание смен
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<ScheduleDto>> GetPageAsync(GetStatRequest request, CancellationToken token);
 }
diff --git a/AsbCloudApp/Services/ISetpointsService.cs b/AsbCloudApp/Services/ISetpointsService.cs
index 59936e85..a5db8620 100644
--- a/AsbCloudApp/Services/ISetpointsService.cs
+++ b/AsbCloudApp/Services/ISetpointsService.cs
@@ -3,57 +3,56 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис рекомендаций новых уставок для панели оператора САУБ
+/// </summary>
+public interface ISetpointsService
 {
     /// <summary>
-    /// Сервис рекомендаций новых уставок для панели оператора САУБ
+    /// Добавить новый набор рекомендаций
     /// </summary>
-    public interface ISetpointsService
-    {
-        /// <summary>
-        /// Добавить новый набор рекомендаций
-        /// </summary>
-        /// <param name="setpoints"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> InsertAsync(SetpointsRequestDto setpoints, CancellationToken token);
-        
-        /// <summary>
-        /// Получить наборы уставок на скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<SetpointsRequestDto>> GetAsync(int idWell, CancellationToken token);
+    /// <param name="setpoints"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> InsertAsync(SetpointsRequestDto setpoints, CancellationToken token);
+    
+    /// <summary>
+    /// Получить наборы уставок на скважине
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<SetpointsRequestDto>> GetAsync(int idWell, CancellationToken token);
 
-        /// <summary>
-        /// Скачать новые рекомендации (скачивает панель оператора)
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<SetpointsRequestDto>> GetForPanelAsync(string uid, CancellationToken token);
+    /// <summary>
+    /// Скачать новые рекомендации (скачивает панель оператора)
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<SetpointsRequestDto>> GetForPanelAsync(string uid, CancellationToken token);
 
-        /// <summary>
-        /// Попробовать удалить (успешно, если панель еще не забрала уставки)
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> TryDelete(int id, CancellationToken token);
+    /// <summary>
+    /// Попробовать удалить (успешно, если панель еще не забрала уставки)
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> TryDelete(int id, CancellationToken token);
 
-        /// <summary>
-        /// отредактировать состояние набора рекомендаций
-        /// </summary>
-        /// <param name="setpointsRequestDto"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> UpdateStateAsync(SetpointsRequestDto setpointsRequestDto, CancellationToken token);
+    /// <summary>
+    /// отредактировать состояние набора рекомендаций
+    /// </summary>
+    /// <param name="setpointsRequestDto"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> UpdateStateAsync(SetpointsRequestDto setpointsRequestDto, CancellationToken token);
 
-        /// <summary>
-        /// Список уставок для рекомендаций
-        /// </summary>
-        /// <returns></returns>
-        IEnumerable<SetpointInfoDto> GetSetpointsNames();
-    }
+    /// <summary>
+    /// Список уставок для рекомендаций
+    /// </summary>
+    /// <returns></returns>
+    IEnumerable<SetpointInfoDto> GetSetpointsNames();
 }
diff --git a/AsbCloudApp/Services/ISlipsStatService.cs b/AsbCloudApp/Services/ISlipsStatService.cs
index c2b2aa98..873c44d1 100644
--- a/AsbCloudApp/Services/ISlipsStatService.cs
+++ b/AsbCloudApp/Services/ISlipsStatService.cs
@@ -5,19 +5,18 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис для получения аналитики удержания в клиньях
+/// </summary>
+public interface ISlipsStatService
 {
     /// <summary>
-    /// Сервис для получения аналитики удержания в клиньях
+    /// Получение записей для построения аналитики удержания в клиньях
     /// </summary>
-    public interface ISlipsStatService
-    {
-        /// <summary>
-        /// Получение записей для построения аналитики удержания в клиньях
-        /// </summary>
-        /// <param name="request">параметры запроса</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<SlipsStatDto>> GetAllAsync(OperationStatRequest request, CancellationToken token);
-    }
+    /// <param name="request">параметры запроса</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<SlipsStatDto>> GetAllAsync(OperationStatRequest request, CancellationToken token);
 }
diff --git a/AsbCloudApp/Services/ITelemetryDataService.cs b/AsbCloudApp/Services/ITelemetryDataService.cs
index f9e3c4d7..96ea6e98 100644
--- a/AsbCloudApp/Services/ITelemetryDataService.cs
+++ b/AsbCloudApp/Services/ITelemetryDataService.cs
@@ -5,70 +5,69 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// сервис данных тех. процесса
+/// </summary>
+/// <typeparam name="TDto"></typeparam>
+public interface ITelemetryDataService<TDto> : ITelemetryDataEditorService where TDto : ITelemetryData
 {
+
     /// <summary>
-    /// сервис данных тех. процесса
+    /// получить данные тех. процесса
     /// </summary>
-    /// <typeparam name="TDto"></typeparam>
-    public interface ITelemetryDataService<TDto> : ITelemetryDataEditorService where TDto : ITelemetryData
-    {
+    /// <param name="idWell"></param>
+    /// <param name="dateBegin"></param>
+    /// <param name="intervalSec"></param>
+    /// <param name="approxPointsCount">кол-во элементов до которых эти данные прореживаются</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<TDto>> GetByWellAsync(int idWell,
+        DateTime dateBegin = default, double intervalSec = 600d,
+        int approxPointsCount = 1024, CancellationToken token = default);
 
-        /// <summary>
-        /// получить данные тех. процесса
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="dateBegin"></param>
-        /// <param name="intervalSec"></param>
-        /// <param name="approxPointsCount">кол-во элементов до которых эти данные прореживаются</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<TDto>> GetByWellAsync(int idWell,
-            DateTime dateBegin = default, double intervalSec = 600d,
-            int approxPointsCount = 1024, CancellationToken token = default);
+    /// <summary>
+    /// Получить данные тех. процесса по скважине
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<TDto>> GetByWellAsync(int idWell, TelemetryDataRequest request, CancellationToken token);
 
-        /// <summary>
-        /// Получить данные тех. процесса по скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<TDto>> GetByWellAsync(int idWell, TelemetryDataRequest request, CancellationToken token);
+    /// <summary>
+    /// Получение данных тех. процесса по телеметрии
+    /// </summary>
+    /// <param name="idTelemetry"></param>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<TDto>> GetByTelemetryAsync(int idTelemetry, TelemetryDataRequest request, CancellationToken token);
 
-        /// <summary>
-        /// Получение данных тех. процесса по телеметрии
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<TDto>> GetByTelemetryAsync(int idTelemetry, TelemetryDataRequest request, CancellationToken token);
+    /// <summary>
+    /// Период за который есть данные по скважине в рамках временного интервала
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="geDate"></param>
+    /// <param name="leDate"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<DatesRangeDto?> GetRangeAsync(int idWell, DateTimeOffset geDate, DateTimeOffset? leDate, CancellationToken token);
 
-        /// <summary>
-        /// Период за который есть данные по скважине в рамках временного интервала
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="geDate"></param>
-        /// <param name="leDate"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<DatesRangeDto?> GetRangeAsync(int idWell, DateTimeOffset geDate, DateTimeOffset? leDate, CancellationToken token);
+    /// <summary>
+    /// Период за который есть данные по скважине
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <returns></returns>
+    DatesRangeDto? GetRange(int idWell);
 
-        /// <summary>
-        /// Период за который есть данные по скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <returns></returns>
-        DatesRangeDto? GetRange(int idWell);
-
-        /// <summary>
-        /// добавить/изменить данные тех. процесса (используется панелью)
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="dtos"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> UpdateDataAsync(string uid, IEnumerable<TDto> dtos, CancellationToken token);
-    }
+    /// <summary>
+    /// добавить/изменить данные тех. процесса (используется панелью)
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> UpdateDataAsync(string uid, IEnumerable<TDto> dtos, CancellationToken token);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/ITelemetryService.cs b/AsbCloudApp/Services/ITelemetryService.cs
index 49b28388..3c434700 100644
--- a/AsbCloudApp/Services/ITelemetryService.cs
+++ b/AsbCloudApp/Services/ITelemetryService.cs
@@ -6,77 +6,76 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис телеметрии
+/// </summary>
+public interface ITelemetryService
 {
     /// <summary>
-    /// Сервис телеметрии
+    /// сервис временных зон
     /// </summary>
-    public interface ITelemetryService
-    {
-        /// <summary>
-        /// сервис временных зон
-        /// </summary>
-        ITimezoneService TimeZoneService { get; }
+    ITimezoneService TimeZoneService { get; }
 
-        /// <summary>
-        /// получить idWell по uid телеметрии
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <returns></returns>
-        int? GetIdWellByTelemetryUid(string uid);
+    /// <summary>
+    /// получить idWell по uid телеметрии
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <returns></returns>
+    int? GetIdWellByTelemetryUid(string uid);
 
-        /// <summary>
-        /// Получить id телеметрии. Если её нет в БД, то добавить новую.
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <returns></returns>
-        TelemetryDto GetOrCreateTelemetryByUid(string uid);
+    /// <summary>
+    /// Получить id телеметрии. Если её нет в БД, то добавить новую.
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <returns></returns>
+    TelemetryDto GetOrCreateTelemetryByUid(string uid);
 
-        /// <summary>
-        /// получить временную зону скважины по idTelemetry
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <returns></returns>
-        SimpleTimezoneDto GetTimezone(int idTelemetry);
+    /// <summary>
+    /// получить временную зону скважины по idTelemetry
+    /// </summary>
+    /// <param name="idTelemetry"></param>
+    /// <returns></returns>
+    SimpleTimezoneDto GetTimezone(int idTelemetry);
 
-        /// <summary>
-        /// получить idTelemetry по IdWell
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <returns></returns>
-        TelemetryBaseDto? GetOrDefaultTelemetryByIdWell(int idWell);
+    /// <summary>
+    /// получить idTelemetry по IdWell
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <returns></returns>
+    TelemetryBaseDto? GetOrDefaultTelemetryByIdWell(int idWell);
 
-        /// <summary>
-        /// получить диапазон дат за которые есть данные
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <returns></returns>
-        DatesRangeDto GetDatesRange(int idTelemetry);
+    /// <summary>
+    /// получить диапазон дат за которые есть данные
+    /// </summary>
+    /// <param name="idTelemetry"></param>
+    /// <returns></returns>
+    DatesRangeDto GetDatesRange(int idTelemetry);
 
-        /// <summary>
-        /// обновить данные о телеметрии (используется панелью)
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="info"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task UpdateInfoAsync(string uid, TelemetryInfoDto info, CancellationToken token);
+    /// <summary>
+    /// обновить данные о телеметрии (используется панелью)
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="info"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task UpdateInfoAsync(string uid, TelemetryInfoDto info, CancellationToken token);
 
-        /// <summary>
-        /// Слить данные телеметрии в одну
-        /// </summary>
-        /// <param name="from">старая (исходная)</param>
-        /// <param name="to">новая</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> MergeAsync(int from, int to, CancellationToken token);
+    /// <summary>
+    /// Слить данные телеметрии в одну
+    /// </summary>
+    /// <param name="from">старая (исходная)</param>
+    /// <param name="to">новая</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> MergeAsync(int from, int to, CancellationToken token);
 
-        /// <summary>
-        /// Получить телеметрию по последней дате
-        /// </summary>
-        /// <param name="from"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<Stream> GetTelemetriesInfoByLastData(DateTimeOffset from, CancellationToken token);
-    }
+    /// <summary>
+    /// Получить телеметрию по последней дате
+    /// </summary>
+    /// <param name="from"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<Stream> GetTelemetriesInfoByLastData(DateTimeOffset from, CancellationToken token);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/ITelemetryUserService.cs b/AsbCloudApp/Services/ITelemetryUserService.cs
index 8635f666..721979c8 100644
--- a/AsbCloudApp/Services/ITelemetryUserService.cs
+++ b/AsbCloudApp/Services/ITelemetryUserService.cs
@@ -4,36 +4,35 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// сервис пользователей телеметрии
+/// </summary>
+public interface ITelemetryUserService
 {
     /// <summary>
-    /// сервис пользователей телеметрии
+    /// get user by ids
     /// </summary>
-    public interface ITelemetryUserService
-    {
-        /// <summary>
-        /// get user by ids
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <param name="idUser"></param>
-        /// <returns></returns>
-        TelemetryUserDto? GetOrDefault(int idTelemetry, int idUser);
+    /// <param name="idTelemetry"></param>
+    /// <param name="idUser"></param>
+    /// <returns></returns>
+    TelemetryUserDto? GetOrDefault(int idTelemetry, int idUser);
 
-        /// <summary>
-        /// get users by id telemetry and predicate
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <param name="predicate"></param>
-        /// <returns></returns>
-        IEnumerable<TelemetryUserDto> GetUsers(int idTelemetry, Func<TelemetryUserDto, bool>? predicate = default);
+    /// <summary>
+    /// get users by id telemetry and predicate
+    /// </summary>
+    /// <param name="idTelemetry"></param>
+    /// <param name="predicate"></param>
+    /// <returns></returns>
+    IEnumerable<TelemetryUserDto> GetUsers(int idTelemetry, Func<TelemetryUserDto, bool>? predicate = default);
 
-        /// <summary>
-        /// получает и сохраняет/обновляет список пользователей панели оператора
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="dtos"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task UpsertAsync(string uid, IEnumerable<TelemetryUserDto> dtos, CancellationToken token = default);
-    }
+    /// <summary>
+    /// получает и сохраняет/обновляет список пользователей панели оператора
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task UpsertAsync(string uid, IEnumerable<TelemetryUserDto> dtos, CancellationToken token = default);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/ITimeZoneService.cs b/AsbCloudApp/Services/ITimeZoneService.cs
index 06993884..fd44e2fc 100644
--- a/AsbCloudApp/Services/ITimeZoneService.cs
+++ b/AsbCloudApp/Services/ITimeZoneService.cs
@@ -2,28 +2,27 @@ using AsbCloudApp.Data;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// сервис определения временной зоны
+/// </summary>
+public interface ITimezoneService
 {
     /// <summary>
-    /// сервис определения временной зоны
+    /// по координатам
     /// </summary>
-    public interface ITimezoneService
-    {
-        /// <summary>
-        /// по координатам
-        /// </summary>
-        /// <param name="latitude"></param>
-        /// <param name="longitude"></param>
-        /// <returns></returns>
-        SimpleTimezoneDto? GetOrDefaultByCoordinates(double latitude, double longitude);
+    /// <param name="latitude"></param>
+    /// <param name="longitude"></param>
+    /// <returns></returns>
+    SimpleTimezoneDto? GetOrDefaultByCoordinates(double latitude, double longitude);
 
-        /// <summary>
-        /// по координатам
-        /// </summary>
-        /// <param name="latitude"></param>
-        /// <param name="longitude"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<Data.SimpleTimezoneDto?> GetOrDefaultByCoordinatesAsync(double latitude, double longitude, CancellationToken token);
-    }
+    /// <summary>
+    /// по координатам
+    /// </summary>
+    /// <param name="latitude"></param>
+    /// <param name="longitude"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<Data.SimpleTimezoneDto?> GetOrDefaultByCoordinatesAsync(double latitude, double longitude, CancellationToken token);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/IUserSettingsRepository.cs b/AsbCloudApp/Services/IUserSettingsRepository.cs
index 63605d4b..65efa111 100644
--- a/AsbCloudApp/Services/IUserSettingsRepository.cs
+++ b/AsbCloudApp/Services/IUserSettingsRepository.cs
@@ -1,57 +1,56 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// репозиторий для личных настроек пользователя
+/// </summary>
+public interface IUserSettingsRepository
 {
     /// <summary>
-    /// репозиторий для личных настроек пользователя
+    /// код ошибки: ключ не найден
     /// </summary>
-    public interface IUserSettingsRepository
-    {
-        /// <summary>
-        /// код ошибки: ключ не найден
-        /// </summary>
-        public const int ErrorKeyNotFound = -1;
-        
-        /// <summary>
-        /// код ошибки: ключ уже занят
-        /// </summary>
-        public const int ErrorKeyIsUsed = -2;
+    public const int ErrorKeyNotFound = -1;
+    
+    /// <summary>
+    /// код ошибки: ключ уже занят
+    /// </summary>
+    public const int ErrorKeyIsUsed = -2;
 
-        /// <summary>
-        /// Получить настройки по ключу для пользователя
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="key"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<System.Text.Json.JsonDocument?> GetOrDefaultAsync(int userId, string key, CancellationToken token);
+    /// <summary>
+    /// Получить настройки по ключу для пользователя
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <param name="key"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<System.Text.Json.JsonDocument?> GetOrDefaultAsync(int userId, string key, CancellationToken token);
 
-        /// <summary>
-        /// Добавить или изменить настройки с ключем для пользователя
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> UpsertAsync(int userId, string key, System.Text.Json.JsonDocument value, CancellationToken token);
+    /// <summary>
+    /// Добавить или изменить настройки с ключем для пользователя
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <param name="key"></param>
+    /// <param name="value"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> UpsertAsync(int userId, string key, System.Text.Json.JsonDocument value, CancellationToken token);
 
-        /// <summary>
-        /// Удалить настройки с ключем для пользователя
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="key"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> DeleteAsync(int userId, string key, CancellationToken token);
+    /// <summary>
+    /// Удалить настройки с ключем для пользователя
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <param name="key"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> DeleteAsync(int userId, string key, CancellationToken token);
 
-        /// <summary>
-        /// Удалить ВСЕ настройки пользователя
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> DeleteAsync(int userId, CancellationToken token);
-    }
+    /// <summary>
+    /// Удалить ВСЕ настройки пользователя
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> DeleteAsync(int userId, CancellationToken token);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/IWellCompositeOperationService.cs b/AsbCloudApp/Services/IWellCompositeOperationService.cs
index 98be1494..875be603 100644
--- a/AsbCloudApp/Services/IWellCompositeOperationService.cs
+++ b/AsbCloudApp/Services/IWellCompositeOperationService.cs
@@ -3,19 +3,18 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Интерфейс для вычисления композитной скважины
+/// </summary>
+public interface IWellCompositeOperationService
 {
     /// <summary>
-    /// Интерфейс для вычисления композитной скважины
+    /// Получение данных для построения композитной скважины
     /// </summary>
-    public interface IWellCompositeOperationService
-    {
-        /// <summary>
-        /// Получение данных для построения композитной скважины
-        /// </summary>
-        /// <param name="idsWells"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<WellCompositeOperationDto> GetAsync(IEnumerable<int> idsWells, CancellationToken token);
-    }
+    /// <param name="idsWells"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<WellCompositeOperationDto> GetAsync(IEnumerable<int> idsWells, CancellationToken token);
 }
diff --git a/AsbCloudApp/Services/IWellContactService.cs b/AsbCloudApp/Services/IWellContactService.cs
index cf7124db..e5738139 100644
--- a/AsbCloudApp/Services/IWellContactService.cs
+++ b/AsbCloudApp/Services/IWellContactService.cs
@@ -5,70 +5,69 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис по работе с контактной информацией по скважине
+/// </summary>
+public interface IWellContactService
 {
     /// <summary>
-    /// Сервис по работе с контактной информацией по скважине
+    /// Получение контактов по параметрам запроса
     /// </summary>
-    public interface IWellContactService
-    {
-        /// <summary>
-        /// Получение контактов по параметрам запроса
-        /// </summary>
-        /// <param name="request">ключ скважины</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<ContactDto>> GetAllAsync(WellContactRequest request, CancellationToken token);
+    /// <param name="request">ключ скважины</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<ContactDto>> GetAllAsync(WellContactRequest request, CancellationToken token);
 
-        /// <summary>
-        /// Получение контакта по ключу
-        /// </summary>
-        /// <param name="idWell">ключ скважины</param>
-        /// <param name="id">ключ пользователя</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<ContactDto?> GetAsync(int idWell, int id, CancellationToken token);
+    /// <summary>
+    /// Получение контакта по ключу
+    /// </summary>
+    /// <param name="idWell">ключ скважины</param>
+    /// <param name="id">ключ пользователя</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<ContactDto?> GetAsync(int idWell, int id, CancellationToken token);
 
-        /// <summary>
-        /// Получение типов контактов
-        /// </summary>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<CompanyTypeDto>> GetTypesAsync(CancellationToken token);
+    /// <summary>
+    /// Получение типов контактов
+    /// </summary>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<CompanyTypeDto>> GetTypesAsync(CancellationToken token);
 
-        /// <summary>
-        /// Добавление контакта
-        /// </summary>
-        /// <param name="contactDto"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> InsertAsync(ContactDto contactDto, CancellationToken token);
+    /// <summary>
+    /// Добавление контакта
+    /// </summary>
+    /// <param name="contactDto"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> InsertAsync(ContactDto contactDto, CancellationToken token);
 
-        /// <summary>
-        /// Изменение контакта
-        /// </summary>
-        /// <param name="contactDto"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> UpdateAsync(ContactDto contactDto, CancellationToken token);
+    /// <summary>
+    /// Изменение контакта
+    /// </summary>
+    /// <param name="contactDto"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> UpdateAsync(ContactDto contactDto, CancellationToken token);
 
-        /// <summary>
-        /// Удаление контакта
-        /// </summary>
-        /// <param name="idWell">ключ скважины</param>
-        /// <param name="id">ключ скважины</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> DeleteAsync(int idWell, int id, CancellationToken token);
+    /// <summary>
+    /// Удаление контакта
+    /// </summary>
+    /// <param name="idWell">ключ скважины</param>
+    /// <param name="id">ключ скважины</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> DeleteAsync(int idWell, int id, CancellationToken token);
 
-        /// <summary>
-        /// Скопировать контакты в другую скважину 
-        /// </summary>
-        /// <param name="idWell">ключ скважины, откуда копировать контакты</param>
-        /// <param name="idWellTarget">ключ скважины, куда копировать контакты</param>
-        /// <param name="contactIds"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> CopyAsync(int idWell, int idWellTarget, IEnumerable<int> contactIds, CancellationToken token);
-    }
+    /// <summary>
+    /// Скопировать контакты в другую скважину 
+    /// </summary>
+    /// <param name="idWell">ключ скважины, откуда копировать контакты</param>
+    /// <param name="idWellTarget">ключ скважины, куда копировать контакты</param>
+    /// <param name="contactIds"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> CopyAsync(int idWell, int idWellTarget, IEnumerable<int> contactIds, CancellationToken token);
 }
diff --git a/AsbCloudApp/Services/IWellFinalDocumentsService.cs b/AsbCloudApp/Services/IWellFinalDocumentsService.cs
index 06daee1e..c47f18aa 100644
--- a/AsbCloudApp/Services/IWellFinalDocumentsService.cs
+++ b/AsbCloudApp/Services/IWellFinalDocumentsService.cs
@@ -4,51 +4,50 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис "Дело скважины"
+/// </summary>
+public interface IWellFinalDocumentsService
 {
     /// <summary>
-    /// Сервис "Дело скважины"
+    /// Обновление записей дела скважины
     /// </summary>
-    public interface IWellFinalDocumentsService
-    {
-        /// <summary>
-        /// Обновление записей дела скважины
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="dtos"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> UpdateRangeAsync(int idWell, IEnumerable<WellFinalDocumentInputDto> dtos, CancellationToken token);
+    /// <param name="idWell"></param>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> UpdateRangeAsync(int idWell, IEnumerable<WellFinalDocumentInputDto> dtos, CancellationToken token);
 
-        /// <summary>
-        /// Получение истории файлов
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idCategory"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<WellFinalDocumentsHistoryDto> GetFilesHistoryByIdCategoryAsync(int idWell, int idCategory, CancellationToken token);
+    /// <summary>
+    /// Получение истории файлов
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idCategory"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<WellFinalDocumentsHistoryDto> GetFilesHistoryByIdCategoryAsync(int idWell, int idCategory, CancellationToken token);
 
-        /// <summary>
-        /// Сохранение файла
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idCategory"></param>
-        /// <param name="idUser">пользователь, который сохраняет файл</param>
-        /// <param name="fileStream"></param>
-        /// <param name="fileName"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<int> SaveCategoryFileAsync(int idWell, int idCategory, int idUser, Stream fileStream, string fileName, CancellationToken token);
+    /// <summary>
+    /// Сохранение файла
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idCategory"></param>
+    /// <param name="idUser">пользователь, который сохраняет файл</param>
+    /// <param name="fileStream"></param>
+    /// <param name="fileName"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> SaveCategoryFileAsync(int idWell, int idCategory, int idUser, Stream fileStream, string fileName, CancellationToken token);
 
-        /// <summary>
-        /// Повторно оповестить ответственных за загрузку
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idUser">запрашивающий пользователь, для проверки его прав и текста сообщения</param>
-        /// <param name="idCategory"></param>
-        /// <param name="token"></param>
-        /// <returns>count of notified publishers</returns>
-        Task<int> ReNotifyPublishersAsync(int idWell, int idUser, int idCategory, CancellationToken token);
-    }
+    /// <summary>
+    /// Повторно оповестить ответственных за загрузку
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idUser">запрашивающий пользователь, для проверки его прав и текста сообщения</param>
+    /// <param name="idCategory"></param>
+    /// <param name="token"></param>
+    /// <returns>count of notified publishers</returns>
+    Task<int> ReNotifyPublishersAsync(int idWell, int idUser, int idCategory, CancellationToken token);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/IWellOperationService.cs b/AsbCloudApp/Services/IWellOperationService.cs
index ea4b466b..4c956606 100644
--- a/AsbCloudApp/Services/IWellOperationService.cs
+++ b/AsbCloudApp/Services/IWellOperationService.cs
@@ -5,62 +5,59 @@ using System.Threading.Tasks;
 using AsbCloudApp.Data.WellOperation;
 using AsbCloudApp.Requests;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// Сервис по представлению данных по операциям
+/// </summary>
+public interface IWellOperationService
 {
     /// <summary>
-    /// Сервис по представлению данных по операциям
+    /// Получить страницу списка операций
     /// </summary>
-    public interface IWellOperationService
-    {
-        /// <summary>
-        /// Получить страницу списка операций
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<WellOperationDto>> GetAsync(WellOperationRequest request, CancellationToken token);
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<WellOperationDto>> GetAsync(WellOperationRequest request, CancellationToken token);
 
-        /// <summary>
-        /// Получить страницу списка операций
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<PaginationContainer<WellOperationDto>> GetPageAsync(WellOperationRequest request, CancellationToken token);
+    /// <summary>
+    /// Получить страницу списка операций
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<PaginationContainer<WellOperationDto>> GetPageAsync(WellOperationRequest request, CancellationToken token);
 
-        /// <summary>
-        /// Получить страницу с операцией
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="id"></param>
-        /// <param name="operationType"></param>
-        /// <param name="take"></param>
-        /// <param name="sortFields"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<PaginationContainer<WellOperationDto>?> GetPageAsync(int idWell,
-            int id,
-            int operationType,
-            int? take,
-            IEnumerable<string>? sortFields,
-            CancellationToken token);
-
-        /// <summary>
-        /// Получить статистику операции по скважине с группировкой по категориям
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<WellGroupOpertionDto>> GetGroupOperationsStatAsync(WellOperationRequest request, CancellationToken token);
-
-        /// <summary>
-        /// Получить данные для графика TVD
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<PlanFactPredictBase<WellOperationDto>>> GetTvdAsync(int idWell, CancellationToken token);
-    }
+    /// <summary>
+    /// Получить страницу с операцией
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="id"></param>
+    /// <param name="operationType"></param>
+    /// <param name="take"></param>
+    /// <param name="sortFields"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<PaginationContainer<WellOperationDto>?> GetPageAsync(int idWell,
+        int id,
+        int operationType,
+        int? take,
+        IEnumerable<string>? sortFields,
+        CancellationToken token);
 
+    /// <summary>
+    /// Получить статистику операции по скважине с группировкой по категориям
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<WellGroupOpertionDto>> GetGroupOperationsStatAsync(WellOperationRequest request, CancellationToken token);
 
+    /// <summary>
+    /// Получить данные для графика TVD
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<PlanFactPredictBase<WellOperationDto>>> GetTvdAsync(int idWell, CancellationToken token);
 }
diff --git a/AsbCloudApp/Services/IWellService.cs b/AsbCloudApp/Services/IWellService.cs
index 2decf61b..21bc7f7f 100644
--- a/AsbCloudApp/Services/IWellService.cs
+++ b/AsbCloudApp/Services/IWellService.cs
@@ -5,104 +5,103 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// сервис скважин
+/// </summary>
+public interface IWellService : ICrudRepository<WellDto>
 {
     /// <summary>
-    /// сервис скважин
+    /// сервис телеметрии
     /// </summary>
-    public interface IWellService : ICrudRepository<WellDto>
-    {
-        /// <summary>
-        /// сервис телеметрии
-        /// </summary>
-        ITelemetryService TelemetryService { get; }
+    ITelemetryService TelemetryService { get; }
 
-        /// <summary>
-        /// Список скважин доступных компании
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<WellDto>> GetAsync(WellRequest request, CancellationToken token);
+    /// <summary>
+    /// Список скважин доступных компании
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<WellDto>> GetAsync(WellRequest request, CancellationToken token);
 
-        /// <summary>
-        /// Статистика по скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<WellMapInfoWithTelemetryStat?> GetOrDefaultStatAsync(int idWell, CancellationToken token);
+    /// <summary>
+    /// Статистика по скважине
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<WellMapInfoWithTelemetryStat?> GetOrDefaultStatAsync(int idWell, CancellationToken token);
 
-        /// <summary>
-        /// проверяет доступ к скважине для компании
-        /// </summary>
-        /// <param name="idCompany"></param>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<bool> IsCompanyInvolvedInWellAsync(int idCompany, int idWell, CancellationToken token);
+    /// <summary>
+    /// проверяет доступ к скважине для компании
+    /// </summary>
+    /// <param name="idCompany"></param>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<bool> IsCompanyInvolvedInWellAsync(int idCompany, int idWell, CancellationToken token);
 
-        //TODO: remove that
-        /// <summary>
-        /// получить название скважины по id
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<string> GetWellCaptionByIdAsync(int idWell, CancellationToken token);
+    //TODO: remove that
+    /// <summary>
+    /// получить название скважины по id
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<string> GetWellCaptionByIdAsync(int idWell, CancellationToken token);
 
-        /// <summary>
-        /// список компаний участвующих в скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<CompanyDto>> GetCompaniesAsync(int idWell, CancellationToken token);
+    /// <summary>
+    /// список компаний участвующих в скважине
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<CompanyDto>> GetCompaniesAsync(int idWell, CancellationToken token);
 
-        //TODO: remove that
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="state"></param>
-        /// <returns></returns>
-        string GetStateText(int state);
+    //TODO: remove that
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="state"></param>
+    /// <returns></returns>
+    string GetStateText(int state);
 
-        /// <summary>
-        /// дата получения последних данных от панели
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <returns></returns>
-        DateTimeOffset GetLastTelemetryDate(int idWell);
+    /// <summary>
+    /// дата получения последних данных от панели
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <returns></returns>
+    DateTimeOffset GetLastTelemetryDate(int idWell);
 
-        //TODO: выяснить и удалить отсюда
-        /// <summary>
-        /// получение списка скважин куста в котором находится указанная скважина
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<int>> GetClusterWellsIdsAsync(int idWell, CancellationToken token);
+    //TODO: выяснить и удалить отсюда
+    /// <summary>
+    /// получение списка скважин куста в котором находится указанная скважина
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<int>> GetClusterWellsIdsAsync(int idWell, CancellationToken token);
 
-        /// <summary>
-        /// часовой пояс скважины
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <returns></returns>
-        SimpleTimezoneDto GetTimezone(int idWell);
+    /// <summary>
+    /// часовой пояс скважины
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <returns></returns>
+    SimpleTimezoneDto GetTimezone(int idWell);
 
-        /// <summary>
-        /// диапазон дат с данными телеметрии
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <returns></returns>
-        DatesRangeDto GetDatesRange(int idWell);
+    /// <summary>
+    /// диапазон дат с данными телеметрии
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <returns></returns>
+    DatesRangeDto GetDatesRange(int idWell);
 
-        /// <summary>
-        /// ВРЕМЕННЫЙ метод
-        /// </summary>
-        /// <param name="idCompany"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<DepositBranchDto>> GetWellTreeAsync(int idCompany, CancellationToken token);
-    }
+    /// <summary>
+    /// ВРЕМЕННЫЙ метод
+    /// </summary>
+    /// <param name="idCompany"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<DepositBranchDto>> GetWellTreeAsync(int idCompany, CancellationToken token);
 }
diff --git a/AsbCloudApp/Services/IWitsRepository.cs b/AsbCloudApp/Services/IWitsRepository.cs
index e6b409c1..ec2f99b3 100644
--- a/AsbCloudApp/Services/IWitsRepository.cs
+++ b/AsbCloudApp/Services/IWitsRepository.cs
@@ -5,46 +5,45 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Services;
+
+/// <summary>
+/// The wits record repository.
+/// </summary>
+public interface IWitsRecordRepository<TDto> : ITelemetryDataEditorService
+    where TDto : ITelemetryData
 {
     /// <summary>
-    /// The wits record repository.
+    /// Добавить новые данные
     /// </summary>
-    public interface IWitsRecordRepository<TDto> : ITelemetryDataEditorService
-        where TDto : ITelemetryData
-    {
-        /// <summary>
-        /// Добавить новые данные
-        /// </summary>
-        /// <param name="idTelemetry">The id telemetry.</param>
-        /// <param name="dtos">The dtos.</param>
-        /// <param name="token">The token.</param>
-        /// <returns>A Task.</returns>
-        Task SaveDataAsync(int idTelemetry, IEnumerable<TDto> dtos, CancellationToken token);
+    /// <param name="idTelemetry">The id telemetry.</param>
+    /// <param name="dtos">The dtos.</param>
+    /// <param name="token">The token.</param>
+    /// <returns>A Task.</returns>
+    Task SaveDataAsync(int idTelemetry, IEnumerable<TDto> dtos, CancellationToken token);
 
-        /// <summary>
-        /// Получить данные по телеметрии за период
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <param name="begin"></param>
-        /// <param name="end"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<TDto>> GetAsync(int idTelemetry, DateTime begin, DateTime end, CancellationToken token);
-        
-        /// <summary>
-        /// получить массив из одной записи самой поздней по дате
-        /// </summary>
-        /// <param name="idTelemetry">The id telemetry.</param>
-        /// <returns>A Task.</returns>
-        TDto? GetLastOrDefault(int idTelemetry);
-        
-        /// <summary>
-        /// получить статистику по всему архиву: дата самой ранней записи, самой поздней и общее количество
-        /// </summary>
-        /// <param name="idTelemetry">The id telemetry.</param>
-        /// <param name="token">The token.</param>
-        /// <returns>A Task.</returns>
-        Task<(DateTime begin, DateTime end, int count)?> GetStatAsync(int idTelemetry, CancellationToken token);
-    }
+    /// <summary>
+    /// Получить данные по телеметрии за период
+    /// </summary>
+    /// <param name="idTelemetry"></param>
+    /// <param name="begin"></param>
+    /// <param name="end"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<TDto>> GetAsync(int idTelemetry, DateTime begin, DateTime end, CancellationToken token);
+    
+    /// <summary>
+    /// получить массив из одной записи самой поздней по дате
+    /// </summary>
+    /// <param name="idTelemetry">The id telemetry.</param>
+    /// <returns>A Task.</returns>
+    TDto? GetLastOrDefault(int idTelemetry);
+    
+    /// <summary>
+    /// получить статистику по всему архиву: дата самой ранней записи, самой поздней и общее количество
+    /// </summary>
+    /// <param name="idTelemetry">The id telemetry.</param>
+    /// <param name="token">The token.</param>
+    /// <returns>A Task.</returns>
+    Task<(DateTime begin, DateTime end, int count)?> GetStatAsync(int idTelemetry, CancellationToken token);
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/ProcessMaps/WellDrilling/IProcessMapReportDrillingExportService.cs b/AsbCloudApp/Services/ProcessMaps/WellDrilling/IProcessMapReportDrillingExportService.cs
index d0d0fc32..b1d3a149 100644
--- a/AsbCloudApp/Services/ProcessMaps/WellDrilling/IProcessMapReportDrillingExportService.cs
+++ b/AsbCloudApp/Services/ProcessMaps/WellDrilling/IProcessMapReportDrillingExportService.cs
@@ -7,20 +7,19 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services.ProcessMaps.WellDrilling
+namespace AsbCloudApp.Services.ProcessMaps.WellDrilling;
+
+/// <summary>
+/// Сервис экспорт РТК
+/// </summary>
+public interface IProcessMapReportDrillingExportService
 {
     /// <summary>
-    /// Сервис экспорт РТК
+    /// Сформировать файл с данными
     /// </summary>
-    public interface IProcessMapReportDrillingExportService
-    {
-        /// <summary>
-        /// Сформировать файл с данными
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="request">параметры запроса</param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task<(string Name, Stream File)?> ExportAsync(int idWell, DataSaubStatRequest request, CancellationToken cancellationToken);
-    }
+    /// <param name="idWell"></param>
+    /// <param name="request">параметры запроса</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<(string Name, Stream File)?> ExportAsync(int idWell, DataSaubStatRequest request, CancellationToken cancellationToken);
 }
diff --git a/AsbCloudInfrastructure/AssemblyExtensions.cs b/AsbCloudInfrastructure/AssemblyExtensions.cs
index 79ff0695..3fbdf43b 100644
--- a/AsbCloudInfrastructure/AssemblyExtensions.cs
+++ b/AsbCloudInfrastructure/AssemblyExtensions.cs
@@ -3,27 +3,26 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 
-namespace AsbCloudInfrastructure
+namespace AsbCloudInfrastructure;
+
+public static class AssemblyExtensions
 {
-   public static class AssemblyExtensions
-   {
-      public static Stream GetTemplateCopyStream(this Assembly assembly, string templateName)
-      {
-         var resourceName = assembly
-            .GetManifestResourceNames()
-            .FirstOrDefault(n => n.EndsWith(templateName));
+  public static Stream GetTemplateCopyStream(this Assembly assembly, string templateName)
+  {
+     var resourceName = assembly
+        .GetManifestResourceNames()
+        .FirstOrDefault(n => n.EndsWith(templateName));
 
-         if (string.IsNullOrWhiteSpace(resourceName))
-            throw new ArgumentNullException(nameof(resourceName));
+     if (string.IsNullOrWhiteSpace(resourceName))
+        throw new ArgumentNullException(nameof(resourceName));
 
-         using var stream = Assembly.GetExecutingAssembly()
-            .GetManifestResourceStream(resourceName);
+     using var stream = Assembly.GetExecutingAssembly()
+        .GetManifestResourceStream(resourceName);
 
-         var memoryStream = new MemoryStream();
-         stream?.CopyTo(memoryStream);
-         memoryStream.Position = 0;
+     var memoryStream = new MemoryStream();
+     stream?.CopyTo(memoryStream);
+     memoryStream.Position = 0;
 
 			return memoryStream;
 		}
-	}
-}
\ No newline at end of file
+	}
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Background/PeriodicWorks/WorkDataSaubStat.cs b/AsbCloudInfrastructure/Background/PeriodicWorks/WorkDataSaubStat.cs
index 6a2f92de..444672ad 100644
--- a/AsbCloudInfrastructure/Background/PeriodicWorks/WorkDataSaubStat.cs
+++ b/AsbCloudInfrastructure/Background/PeriodicWorks/WorkDataSaubStat.cs
@@ -13,27 +13,26 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Background.PeriodicWorks
+namespace AsbCloudInfrastructure.Background.PeriodicWorks;
+
+/// <summary>
+/// задача по добавлению данных в таблицу DataSaubStat, которая используется для построения РТК-отчета
+/// </summary>
+internal class WorkDataSaubStat : Work
 {
-    /// <summary>
-    /// задача по добавлению данных в таблицу DataSaubStat, которая используется для построения РТК-отчета
-    /// </summary>
-    internal class WorkDataSaubStat : Work
+    private int Gap = 60;
+
+    public WorkDataSaubStat() : base("Generate DataSaubStat entries and save them into Db")
     {
-        private int Gap = 60;
-
-        public WorkDataSaubStat() : base("Generate DataSaubStat entries and save them into Db")
-        {
-            Timeout = TimeSpan.FromMinutes(10);
-        }
-
-        protected override async Task Action(string id, IServiceProvider services, Action<string, double?> onProgressCallback, CancellationToken token)
-        {
-            var dataSaubStatService = services.GetRequiredService<IDataSaubStatService>();
-
-            if (dataSaubStatService != null )
-                await dataSaubStatService.CreateStatAsync(Gap, onProgressCallback, token);
-
-        }        
+        Timeout = TimeSpan.FromMinutes(10);
     }
+
+    protected override async Task Action(string id, IServiceProvider services, Action<string, double?> onProgressCallback, CancellationToken token)
+    {
+        var dataSaubStatService = services.GetRequiredService<IDataSaubStatService>();
+
+        if (dataSaubStatService != null )
+            await dataSaubStatService.CreateStatAsync(Gap, onProgressCallback, token);
+
+    }        
 }
diff --git a/AsbCloudInfrastructure/Background/PeriodicWorks/WorkToDeleteOldReports.cs b/AsbCloudInfrastructure/Background/PeriodicWorks/WorkToDeleteOldReports.cs
index 5a91dedd..7a6a6922 100644
--- a/AsbCloudInfrastructure/Background/PeriodicWorks/WorkToDeleteOldReports.cs
+++ b/AsbCloudInfrastructure/Background/PeriodicWorks/WorkToDeleteOldReports.cs
@@ -4,31 +4,30 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Background.PeriodicWorks
-{
-    /// <summary>
-    /// Задача по удалению загруженных отчетов
-    /// </summary>
-    public class WorkToDeleteOldReports : Work
-    {
-        public WorkToDeleteOldReports()
-            : base("work to delete reports older than 30 days")
-        {
-            Timeout = TimeSpan.FromMinutes(10);
-        }
+namespace AsbCloudInfrastructure.Background.PeriodicWorks;
 
-        /// <summary>
-        /// Удаление отчетов, загруженных ранее 30 дней от текущей даты
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="services"></param>
-        /// <param name="onProgressCallback"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        protected override async Task Action(string id, IServiceProvider services, Action<string, double?> onProgressCallback, CancellationToken token)
-        {
-            var reportService = services.GetRequiredService<IReportService>();
-            await reportService.DeleteAllOldReportsAsync(TimeSpan.FromDays(30), token);
-        }
+/// <summary>
+/// Задача по удалению загруженных отчетов
+/// </summary>
+public class WorkToDeleteOldReports : Work
+{
+    public WorkToDeleteOldReports()
+        : base("work to delete reports older than 30 days")
+    {
+        Timeout = TimeSpan.FromMinutes(10);
+    }
+
+    /// <summary>
+    /// Удаление отчетов, загруженных ранее 30 дней от текущей даты
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="services"></param>
+    /// <param name="onProgressCallback"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    protected override async Task Action(string id, IServiceProvider services, Action<string, double?> onProgressCallback, CancellationToken token)
+    {
+        var reportService = services.GetRequiredService<IReportService>();
+        await reportService.DeleteAllOldReportsAsync(TimeSpan.FromDays(30), token);
     }
 }
diff --git a/AsbCloudInfrastructure/Background/WorkToSendEmail.cs b/AsbCloudInfrastructure/Background/WorkToSendEmail.cs
index d4b20ceb..7ed51928 100644
--- a/AsbCloudInfrastructure/Background/WorkToSendEmail.cs
+++ b/AsbCloudInfrastructure/Background/WorkToSendEmail.cs
@@ -6,39 +6,38 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Background
+namespace AsbCloudInfrastructure.Background;
+
+/// <summary>
+/// Класс для отправки email
+/// </summary>
+internal class WorkToSendEmail : Work
 {
-    /// <summary>
-    /// Класс для отправки email
-    /// </summary>
-    internal class WorkToSendEmail : Work
+    private NotificationDto notification;
+
+    public WorkToSendEmail(NotificationDto notification) : base(MakeWorkId(notification))
     {
-        private NotificationDto notification;
+        this.notification = notification;
+    }
 
-        public WorkToSendEmail(NotificationDto notification) : base(MakeWorkId(notification))
-        {
-            this.notification = notification;
-        }
+    protected override async Task Action(string id, IServiceProvider services, Action<string, double?> onProgressCallback, CancellationToken token)
+    {
+        var notificationService = services.GetRequiredService<INotificationTransportService>();
+        var notificationRepository = services.GetRequiredService<INotificationRepository>();
 
-        protected override async Task Action(string id, IServiceProvider services, Action<string, double?> onProgressCallback, CancellationToken token)
-        {
-            var notificationService = services.GetRequiredService<INotificationTransportService>();
-            var notificationRepository = services.GetRequiredService<INotificationRepository>();
+        await notificationService.SendAsync(notification, token);
 
-            await notificationService.SendAsync(notification, token);
+        notification.SentDate = DateTimeOffset.UtcNow;
+        await notificationRepository.UpdateAsync(notification, token);
 
-            notification.SentDate = DateTimeOffset.UtcNow;
-            await notificationRepository.UpdateAsync(notification, token);
-
-        }
+    }
 
 
-        private static string MakeWorkId(NotificationDto notification)
-        {
-            var hash = notification.IdUser.GetHashCode();
-            hash ^= notification.Title.GetHashCode();
-            hash ^= notification.Message.GetHashCode();
-            return hash.ToString("x");
-        }
+    private static string MakeWorkId(NotificationDto notification)
+    {
+        var hash = notification.IdUser.GetHashCode();
+        hash ^= notification.Title.GetHashCode();
+        hash ^= notification.Message.GetHashCode();
+        return hash.ToString("x");
     }
 }
diff --git a/AsbCloudInfrastructure/DateTimeExtensions.cs b/AsbCloudInfrastructure/DateTimeExtensions.cs
index 61b1c72c..c9386a55 100644
--- a/AsbCloudInfrastructure/DateTimeExtensions.cs
+++ b/AsbCloudInfrastructure/DateTimeExtensions.cs
@@ -2,84 +2,80 @@
 
 using System;
 
-namespace AsbCloudInfrastructure
+namespace AsbCloudInfrastructure;
+
+public static class DateTimeExtensions
 {
-    public static class DateTimeExtensions
+    /// <summary>
+    /// Приветсти к UTC из времени куста
+    /// </summary>
+    /// <param name="date"></param>
+    /// <param name="remoteTimezoneOffsetHours"></param>
+    /// <returns></returns>
+    public static DateTimeOffset ToUtcDateTimeOffset(this DateTime date, double remoteTimezoneOffsetHours)
     {
-        /// <summary>
-        /// Приветсти к UTC из времени куста
-        /// </summary>
-        /// <param name="date"></param>
-        /// <param name="remoteTimezoneOffsetHours"></param>
-        /// <returns></returns>
-        public static DateTimeOffset ToUtcDateTimeOffset(this DateTime date, double remoteTimezoneOffsetHours)
+        if (date == default)
+            return new DateTimeOffset();
+
+        var dateUtc = date.Kind switch
         {
-            if (date == default)
-                return new DateTimeOffset();
+            DateTimeKind.Local => date.ToUniversalTime(),
+            DateTimeKind.Unspecified => DateTime.SpecifyKind(date.AddHours(-remoteTimezoneOffsetHours), DateTimeKind.Utc),
+            _ => date,
+        };
+        return new DateTimeOffset(dateUtc);
+    }
 
-            var dateUtc = date.Kind switch
-            {
-                DateTimeKind.Local => date.ToUniversalTime(),
-                DateTimeKind.Unspecified => DateTime.SpecifyKind(date.AddHours(-remoteTimezoneOffsetHours), DateTimeKind.Utc),
-                _ => date,
-            };
-            return new DateTimeOffset(dateUtc);
-        }
+    /// <summary>
+    /// Привести ко времени куста из utc
+    /// </summary>
+    /// <param name="date"></param>
+    /// <param name="remoteTimezoneOffsetHours"></param>
+    /// <returns></returns>
+    public static DateTime ToRemoteDateTime(this DateTimeOffset date, double remoteTimezoneOffsetHours)
+    {
+        if (date == default)
+            return new DateTime(0, DateTimeKind.Unspecified);
+        var dateTz = date.ToOffset(TimeSpan.FromHours(remoteTimezoneOffsetHours));
+        return dateTz.DateTime;
+    }
 
-        /// <summary>
-        /// Привести ко времени куста из utc
-        /// </summary>
-        /// <param name="date"></param>
-        /// <param name="remoteTimezoneOffsetHours"></param>
-        /// <returns></returns>
-        public static DateTime ToRemoteDateTime(this DateTimeOffset date, double remoteTimezoneOffsetHours)
+    /// <summary>
+    /// Поиск индекса близкого к value значения в span.
+    /// Элементы в span должны быть отсортированы по возрастанию по полю propertyGetter.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="TProp"></typeparam>
+    /// <param name="span"></param>
+    /// <param name="propertyGetter">метод получения свойства из объекта класса T</param>
+    /// <param name="value">искомое значение</param>
+    /// <param name="maxIterations">максимальное кол-во итераций. Прим.: 
+    /// в span из 4000 записей достаточно 9-ти итераций
+    /// 8_000 => 10 итераций;
+    /// 16_000 => 11;
+    /// ...
+    /// 256_000 => 15;
+    /// При недостаточном кол-ве итераций индекс может оказаться близко, но это будет не ближайшее значение
+    /// </param>
+    /// <returns></returns>
+    public static int BinarySearch<T, TProp>(this Span<T> span, Func<T, TProp> propertyGetter, TProp value, int maxIterations = 16)
+        where TProp : IComparable
+    {
+        if (span.Length < 2 || --maxIterations < 0)
+            return 0;
+
+        var indexOfMiddle = span.Length >> 1;
+
+        var comparison = value.CompareTo(propertyGetter(span[indexOfMiddle]));
+
+        if (comparison > 0)
         {
-            if (date == default)
-                return new DateTime(0, DateTimeKind.Unspecified);
-
-			var dateTz = date.ToOffset(TimeSpan.FromHours(remoteTimezoneOffsetHours));
-
-			var result = DateTime.SpecifyKind(dateTz.DateTime, DateTimeKind.Unspecified);
-            return result;
-        }
-
-        /// <summary>
-        /// Поиск индекса близкого к value значения в span.
-        /// Элементы в span должны быть отсортированы по возрастанию по полю propertyGetter.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="TProp"></typeparam>
-        /// <param name="span"></param>
-        /// <param name="propertyGetter">метод получения свойства из объекта класса T</param>
-        /// <param name="value">искомое значение</param>
-        /// <param name="maxIterations">максимальное кол-во итераций. Прим.: 
-        /// в span из 4000 записей достаточно 9-ти итераций
-        /// 8_000 => 10 итераций;
-        /// 16_000 => 11;
-        /// ...
-        /// 256_000 => 15;
-        /// При недостаточном кол-ве итераций индекс может оказаться близко, но это будет не ближайшее значение
-        /// </param>
-        /// <returns></returns>
-        public static int BinarySearch<T, TProp>(this Span<T> span, Func<T, TProp> propertyGetter, TProp value, int maxIterations = 16)
-            where TProp : IComparable
-        {
-            if (span.Length < 2 || --maxIterations < 0)
-                return 0;
-
-            var indexOfMiddle = span.Length >> 1;
-
-            var comparison = value.CompareTo(propertyGetter(span[indexOfMiddle]));
-
-            if (comparison > 0)
-            {
-                var index = indexOfMiddle + 1 + BinarySearch(span[(indexOfMiddle + 1)..], propertyGetter, value, maxIterations);
-                return index < span.Length ? index : span.Length - 1;
-            }
-            else if (comparison < 0)
-                return BinarySearch(span[..(indexOfMiddle)], propertyGetter, value, maxIterations);
-            else //if (comparison == 0)
-                return indexOfMiddle;
+            var index = indexOfMiddle + 1 + BinarySearch(span[(indexOfMiddle + 1)..], propertyGetter, value, maxIterations);
+            return index < span.Length ? index : span.Length - 1;
         }
+        else if (comparison < 0)
+            return BinarySearch(span[..(indexOfMiddle)], propertyGetter, value, maxIterations);
+        else //if (comparison == 0)
+            return indexOfMiddle;
     }
 }
diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs
index b3943a6c..a6a89ab5 100644
--- a/AsbCloudInfrastructure/DependencyInjection.cs
+++ b/AsbCloudInfrastructure/DependencyInjection.cs
@@ -48,516 +48,515 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 
-namespace AsbCloudInfrastructure
+namespace AsbCloudInfrastructure;
+
+public static class DependencyInjection
 {
-    public static class DependencyInjection
+    public static void MapsterSetup()
     {
-        public static void MapsterSetup()
-        {
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<SetpointsRequestDto, SetpointsRequest>()
-               .Ignore(source => source.Author)
-               .Ignore(source => source.Well);
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<SetpointsRequestDto, SetpointsRequest>()
+           .Ignore(source => source.Author)
+           .Ignore(source => source.Well);
 
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<DetectedOperationDto, DetectedOperation>()
-               .Ignore(source => source.OperationCategory);
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<DetectedOperationDto, DetectedOperation>()
+           .Ignore(source => source.OperationCategory);
 
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<ScheduleDto, Schedule>()
-               .Ignore(source => source.Driller);
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<ScheduleDto, Schedule>()
+           .Ignore(source => source.Driller);
 
 #pragma warning disable CS8603 // Possible null reference return.
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<ProcessMapPlanBaseDto, ProcessMapPlanBase>()
-               .Ignore(dst => dst.Author, dst => dst.Editor);
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<ProcessMapPlanBaseDto, ProcessMapPlanBase>()
+           .Ignore(dst => dst.Author, dst => dst.Editor);
 #pragma warning restore CS8603 // Possible null reference return.
 
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<DateTimeOffset, DateTime>()
-               .MapWith((source) => source.DateTime);
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<DateTimeOffset, DateTime>()
+           .MapWith((source) => source.DateTime);
 
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<DateTime, DateTimeOffset>()
-               .MapWith((source) => source == default ? new DateTime(0, DateTimeKind.Utc) : source);
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<DateTime, DateTimeOffset>()
+           .MapWith((source) => source == default ? new DateTime(0, DateTimeKind.Utc) : source);
 
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<TimeDto, TimeOnly>()
-               .MapWith((source) => source.MakeTimeOnly());
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<TimeDto, TimeOnly>()
+           .MapWith((source) => source.MakeTimeOnly());
 
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<TimeOnly, TimeDto>()
-               .MapWith((source) => new(source));
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<TimeOnly, TimeDto>()
+           .MapWith((source) => new(source));
 
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<TimeOnly, TimeDto>()
-               .MapWith((source) => new(source));
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<TimeOnly, TimeDto>()
+           .MapWith((source) => new(source));
 
 #pragma warning disable CS8603 // Possible null reference return.
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<WellDto, Well>()
-               .Ignore(dst => dst.Cluster,
-                  dst => dst.RelationCompaniesWells,
-                  dst => dst.Telemetry,
-                  dst => dst.WellComposites,
-                  dst => dst.WellCompositeSrcs,
-                  dst => dst.WellOperations,
-                  dst => dst.WellType);
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<WellDto, Well>()
+           .Ignore(dst => dst.Cluster,
+              dst => dst.RelationCompaniesWells,
+              dst => dst.Telemetry,
+              dst => dst.WellComposites,
+              dst => dst.WellCompositeSrcs,
+              dst => dst.WellOperations,
+              dst => dst.WellType);
 #pragma warning restore CS8603 // Possible null reference return.
 
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<ClusterDto, Cluster>()
-               .Ignore(dst => dst.Deposit,
-                  dst => dst.Wells);
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<ClusterDto, Cluster>()
+           .Ignore(dst => dst.Deposit,
+              dst => dst.Wells);
 
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<FileCategoryDto, FileCategory>();
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<FileCategoryDto, FileCategory>();
 
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<WellFinalDocumentDto, WellFinalDocument>();
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<WellFinalDocumentDto, WellFinalDocument>();
 
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<NotificationDto, Notification>()
-               .Ignore(dst => dst.NotificationCategory,
-                  dst => dst.User);
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<NotificationDto, Notification>()
+           .Ignore(dst => dst.NotificationCategory,
+              dst => dst.User);
 
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<TimeBalanceRecord, TimeBalanceRecordDto>()
-               .Map(dest => dest.DurationHours, src => new PlanFactDto<double?>()
-               {
-                   Plan = src.DurationHoursPlan,
-                   Fact = src.DurationHoursFact
-               });
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<TimeBalanceRecord, TimeBalanceRecordDto>()
+           .Map(dest => dest.DurationHours, src => new PlanFactDto<double?>()
+           {
+               Plan = src.DurationHoursPlan,
+               Fact = src.DurationHoursFact
+           });
 
-            TypeAdapterConfig.GlobalSettings.Default.Config
-               .ForType<TimeBalanceBlock, TimeBalanceBlockDto>()
-               .Map(dest => dest.WellDepth, src => new PlanFactDto<double?>()
-               {
-                   Plan = src.WellDepthPlan
-               });
+        TypeAdapterConfig.GlobalSettings.Default.Config
+           .ForType<TimeBalanceBlock, TimeBalanceBlockDto>()
+           .Map(dest => dest.WellDepth, src => new PlanFactDto<double?>()
+           {
+               Plan = src.WellDepthPlan
+           });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanRotorDto>>.NewConfig()
-                .Include<ProcessMapPlanRotor, ChangeLogDto<ProcessMapPlanRotorDto>>()
-                .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanRotorDto>()
-                {
-                    Item = src.Adapt<ProcessMapPlanRotorDto>()
-                });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanRotorDto>>.NewConfig()
+            .Include<ProcessMapPlanRotor, ChangeLogDto<ProcessMapPlanRotorDto>>()
+            .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanRotorDto>()
+            {
+                Item = src.Adapt<ProcessMapPlanRotorDto>()
+            });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanSlideDto>>.NewConfig()
-                .Include<ProcessMapPlanSlide, ChangeLogDto<ProcessMapPlanSlideDto>>()
-                .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanSlideDto>()
-                {
-                    Item = src.Adapt<ProcessMapPlanSlideDto>()
-                });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanSlideDto>>.NewConfig()
+            .Include<ProcessMapPlanSlide, ChangeLogDto<ProcessMapPlanSlideDto>>()
+            .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanSlideDto>()
+            {
+                Item = src.Adapt<ProcessMapPlanSlideDto>()
+            });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanReamingRotorDto>>.NewConfig()
-                .Include<ProcessMapPlanReamingRotor, ChangeLogDto<ProcessMapPlanReamingRotorDto>>()
-                .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanReamingRotorDto>()
-                {
-                    Item = src.Adapt<ProcessMapPlanReamingRotorDto>()
-                });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanReamingRotorDto>>.NewConfig()
+            .Include<ProcessMapPlanReamingRotor, ChangeLogDto<ProcessMapPlanReamingRotorDto>>()
+            .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanReamingRotorDto>()
+            {
+                Item = src.Adapt<ProcessMapPlanReamingRotorDto>()
+            });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanReamingSlideDto>>.NewConfig()
-                .Include<ProcessMapPlanReamingSlide, ChangeLogDto<ProcessMapPlanReamingSlideDto>>()
-                .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanReamingSlideDto>()
-                {
-                    Item = src.Adapt<ProcessMapPlanReamingSlideDto>()
-                });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanReamingSlideDto>>.NewConfig()
+            .Include<ProcessMapPlanReamingSlide, ChangeLogDto<ProcessMapPlanReamingSlideDto>>()
+            .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanReamingSlideDto>()
+            {
+                Item = src.Adapt<ProcessMapPlanReamingSlideDto>()
+            });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanLoadCapacityDto>>.NewConfig()
-                .Include<ProcessMapPlanLoadCapacity, ChangeLogDto<ProcessMapPlanLoadCapacityDto>>()
-                .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanLoadCapacityDto>()
-                {
-                    Item = src.Adapt<ProcessMapPlanLoadCapacityDto>()
-                });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanLoadCapacityDto>>.NewConfig()
+            .Include<ProcessMapPlanLoadCapacity, ChangeLogDto<ProcessMapPlanLoadCapacityDto>>()
+            .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanLoadCapacityDto>()
+            {
+                Item = src.Adapt<ProcessMapPlanLoadCapacityDto>()
+            });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanRecordingStaticMeasurementDto>>.NewConfig()
-                .Include<ProcessMapPlanRecordingStaticMeasurement, ChangeLogDto<ProcessMapPlanRecordingStaticMeasurementDto>>()
-                .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanRecordingStaticMeasurementDto>()
-                {
-                    Item = src.Adapt<ProcessMapPlanRecordingStaticMeasurementDto>()
-                });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanRecordingStaticMeasurementDto>>.NewConfig()
+            .Include<ProcessMapPlanRecordingStaticMeasurement, ChangeLogDto<ProcessMapPlanRecordingStaticMeasurementDto>>()
+            .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanRecordingStaticMeasurementDto>()
+            {
+                Item = src.Adapt<ProcessMapPlanRecordingStaticMeasurementDto>()
+            });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanPositioningOffTheBottomDto>>.NewConfig()
-                .Include<ProcessMapPlanPositioningOffTheBottom, ChangeLogDto<ProcessMapPlanPositioningOffTheBottomDto>>()
-                .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanPositioningOffTheBottomDto>()
-                {
-                    Item = src.Adapt<ProcessMapPlanPositioningOffTheBottomDto>()
-                });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanPositioningOffTheBottomDto>>.NewConfig()
+            .Include<ProcessMapPlanPositioningOffTheBottom, ChangeLogDto<ProcessMapPlanPositioningOffTheBottomDto>>()
+            .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanPositioningOffTheBottomDto>()
+            {
+                Item = src.Adapt<ProcessMapPlanPositioningOffTheBottomDto>()
+            });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanOscillationAnglesDto>>.NewConfig()
-                .Include<ProcessMapPlanOscillationAngles, ChangeLogDto<ProcessMapPlanOscillationAnglesDto>>()
-                .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanOscillationAnglesDto>()
-                {
-                    Item = src.Adapt<ProcessMapPlanOscillationAnglesDto>()
-                });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanOscillationAnglesDto>>.NewConfig()
+            .Include<ProcessMapPlanOscillationAngles, ChangeLogDto<ProcessMapPlanOscillationAnglesDto>>()
+            .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanOscillationAnglesDto>()
+            {
+                Item = src.Adapt<ProcessMapPlanOscillationAnglesDto>()
+            });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanTFOrientationDto>>.NewConfig()
-                .Include<ProcessMapPlanTFOrientation, ChangeLogDto<ProcessMapPlanTFOrientationDto>>()
-                .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanTFOrientationDto>()
-                {
-                    Item = src.Adapt<ProcessMapPlanTFOrientationDto>()
-                });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanTFOrientationDto>>.NewConfig()
+            .Include<ProcessMapPlanTFOrientation, ChangeLogDto<ProcessMapPlanTFOrientationDto>>()
+            .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanTFOrientationDto>()
+            {
+                Item = src.Adapt<ProcessMapPlanTFOrientationDto>()
+            });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanSwitchingOffThePumpDto>>.NewConfig()
-               .Include<ProcessMapPlanSwitchingOffThePump, ChangeLogDto<ProcessMapPlanSwitchingOffThePumpDto>>()
-               .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanSwitchingOffThePumpDto>()
-               {
-                   Item = src.Adapt<ProcessMapPlanSwitchingOffThePumpDto>()
-               });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanSwitchingOffThePumpDto>>.NewConfig()
+           .Include<ProcessMapPlanSwitchingOffThePump, ChangeLogDto<ProcessMapPlanSwitchingOffThePumpDto>>()
+           .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanSwitchingOffThePumpDto>()
+           {
+               Item = src.Adapt<ProcessMapPlanSwitchingOffThePumpDto>()
+           });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanSwitchingToTheModeDto>>.NewConfig()
-               .Include<ProcessMapPlanSwitchingToTheMode, ChangeLogDto<ProcessMapPlanSwitchingToTheModeDto>>()
-               .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanSwitchingToTheModeDto>()
-               {
-                   Item = src.Adapt<ProcessMapPlanSwitchingToTheModeDto>()
-               });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanSwitchingToTheModeDto>>.NewConfig()
+           .Include<ProcessMapPlanSwitchingToTheMode, ChangeLogDto<ProcessMapPlanSwitchingToTheModeDto>>()
+           .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanSwitchingToTheModeDto>()
+           {
+               Item = src.Adapt<ProcessMapPlanSwitchingToTheModeDto>()
+           });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanDrillTestDto>>.NewConfig()
-               .Include<ProcessMapPlanSwitchingToTheMode, ChangeLogDto<ProcessMapPlanDrillTestDto>>()
-               .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanDrillTestDto>()
-               {
-                   Item = src.Adapt<ProcessMapPlanDrillTestDto>()
-               });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanDrillTestDto>>.NewConfig()
+           .Include<ProcessMapPlanSwitchingToTheMode, ChangeLogDto<ProcessMapPlanDrillTestDto>>()
+           .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanDrillTestDto>()
+           {
+               Item = src.Adapt<ProcessMapPlanDrillTestDto>()
+           });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanShockTestDto>>.NewConfig()
-               .Include<ProcessMapPlanSwitchingToTheMode, ChangeLogDto<ProcessMapPlanShockTestDto>>()
-               .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanShockTestDto>()
-               {
-                   Item = src.Adapt<ProcessMapPlanShockTestDto>()
-               });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanShockTestDto>>.NewConfig()
+           .Include<ProcessMapPlanSwitchingToTheMode, ChangeLogDto<ProcessMapPlanShockTestDto>>()
+           .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanShockTestDto>()
+           {
+               Item = src.Adapt<ProcessMapPlanShockTestDto>()
+           });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanDamperDto>>.NewConfig()
-               .Include<ProcessMapPlanDamper, ChangeLogDto<ProcessMapPlanDamperDto>>()
-               .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanDamperDto>()
-               {
-                   Item = src.Adapt<ProcessMapPlanDamperDto>()
-               });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanDamperDto>>.NewConfig()
+           .Include<ProcessMapPlanDamper, ChangeLogDto<ProcessMapPlanDamperDto>>()
+           .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanDamperDto>()
+           {
+               Item = src.Adapt<ProcessMapPlanDamperDto>()
+           });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanAutoHoldTFDto>>.NewConfig()
-               .Include<ProcessMapPlanAutoHoldTF, ChangeLogDto<ProcessMapPlanAutoHoldTFDto>>()
-               .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanAutoHoldTFDto>()
-               {
-                   Item = src.Adapt<ProcessMapPlanAutoHoldTFDto>()
-               });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanAutoHoldTFDto>>.NewConfig()
+           .Include<ProcessMapPlanAutoHoldTF, ChangeLogDto<ProcessMapPlanAutoHoldTFDto>>()
+           .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanAutoHoldTFDto>()
+           {
+               Item = src.Adapt<ProcessMapPlanAutoHoldTFDto>()
+           });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanOscillationDto>>.NewConfig()
-               .Include<ProcessMapPlanOscillation, ChangeLogDto<ProcessMapPlanOscillationDto>>()
-               .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanOscillationDto>()
-               {
-                   Item = src.Adapt<ProcessMapPlanOscillationDto>()
-               });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanOscillationDto>>.NewConfig()
+           .Include<ProcessMapPlanOscillation, ChangeLogDto<ProcessMapPlanOscillationDto>>()
+           .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanOscillationDto>()
+           {
+               Item = src.Adapt<ProcessMapPlanOscillationDto>()
+           });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanAntiCrashRotationDto>>.NewConfig()
-              .Include<ProcessMapPlanAntiCrashRotation, ChangeLogDto<ProcessMapPlanAntiCrashRotationDto>>()
-              .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanAntiCrashRotationDto>()
-              {
-                  Item = src.Adapt<ProcessMapPlanAntiCrashRotationDto>()
-              });
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanAntiCrashRotationDto>>.NewConfig()
+          .Include<ProcessMapPlanAntiCrashRotation, ChangeLogDto<ProcessMapPlanAntiCrashRotationDto>>()
+          .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanAntiCrashRotationDto>()
+          {
+              Item = src.Adapt<ProcessMapPlanAntiCrashRotationDto>()
+          });
 
-            TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanStaticMeasurementOutputDto>>.NewConfig()
-              .Include<ProcessMapPlanStaticMeasurementOutput, ChangeLogDto<ProcessMapPlanStaticMeasurementOutputDto>>()
-              .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanStaticMeasurementOutputDto>()
-              {
-                  Item = src.Adapt<ProcessMapPlanStaticMeasurementOutputDto>()
-              });
-        }
+        TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanStaticMeasurementOutputDto>>.NewConfig()
+          .Include<ProcessMapPlanStaticMeasurementOutput, ChangeLogDto<ProcessMapPlanStaticMeasurementOutputDto>>()
+          .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanStaticMeasurementOutputDto>()
+          {
+              Item = src.Adapt<ProcessMapPlanStaticMeasurementOutputDto>()
+          });
+    }
 
-        public static IServiceCollection AddInfrastructure(this IServiceCollection services, IConfiguration configuration)
-        {
-            MapsterSetup();
-            string connectionStringName = "DefaultConnection";
+    public static IServiceCollection AddInfrastructure(this IServiceCollection services, IConfiguration configuration)
+    {
+        MapsterSetup();
+        string connectionStringName = "DefaultConnection";
 #if DEBUG
-            connectionStringName = "DebugConnection";
+        connectionStringName = "DebugConnection";
 #endif
-            services.AddDbContext<AsbCloudDbContext>(options =>
-               options.UseNpgsql(configuration.GetConnectionString(connectionStringName)));
+        services.AddDbContext<AsbCloudDbContext>(options =>
+           options.UseNpgsql(configuration.GetConnectionString(connectionStringName)));
 
 
-            services.AddMemoryCache();
-            services.AddScoped<IAsbCloudDbContext>(provider => provider.GetRequiredService<AsbCloudDbContext>());
+        services.AddMemoryCache();
+        services.AddScoped<IAsbCloudDbContext>(provider => provider.GetRequiredService<AsbCloudDbContext>());
 
-            services.AddSingleton(new WitsInfoService());
-            services.AddSingleton<ITelemetryDataCache<TelemetryDataSaubDto>>(provider =>
-               TelemetryDataCache<TelemetryDataSaubDto>.GetInstance<TelemetryDataSaub>(provider));
-            services.AddSingleton<ITelemetryDataCache<TelemetryDataSpinDto>>(provider =>
-               TelemetryDataCache<TelemetryDataSpinDto>.GetInstance<TelemetryDataSpin>(provider));
-            services.AddSingleton<IRequerstTrackerService, RequestTrackerService>();
-            services.AddSingleton<PeriodicBackgroundWorker>();
-            services.AddSingleton<BackgroundWorker>();
-            services.AddSingleton<NotificationBackgroundWorker>();
-            services.AddSingleton<IReduceSamplingService>(provider => ReduceSamplingService.GetInstance(configuration));
+        services.AddSingleton(new WitsInfoService());
+        services.AddSingleton<ITelemetryDataCache<TelemetryDataSaubDto>>(provider =>
+           TelemetryDataCache<TelemetryDataSaubDto>.GetInstance<TelemetryDataSaub>(provider));
+        services.AddSingleton<ITelemetryDataCache<TelemetryDataSpinDto>>(provider =>
+           TelemetryDataCache<TelemetryDataSpinDto>.GetInstance<TelemetryDataSpin>(provider));
+        services.AddSingleton<IRequerstTrackerService, RequestTrackerService>();
+        services.AddSingleton<PeriodicBackgroundWorker>();
+        services.AddSingleton<BackgroundWorker>();
+        services.AddSingleton<NotificationBackgroundWorker>();
+        services.AddSingleton<IReduceSamplingService>(provider => ReduceSamplingService.GetInstance(configuration));
 
-            services.AddTransient<IAuthService, AuthService>();
-            services.AddTransient<IDepositRepository, DepositRepository>();
-            services.AddTransient<IDrillingProgramService, DrillingProgramService>();
-            services.AddTransient<IEventService, EventService>();
-            services.AddTransient<FileService>();
-            services.AddTransient<IMeasureService, MeasureService>();
-            services.AddTransient<IMessageService, MessageService>();
-            services.AddTransient<IOperationsStatService, OperationsStatService>();
-            services.AddTransient<IReportService, ReportService>();
-            services.AddTransient<ISetpointsService, SetpointsService>();
-            services.AddScoped<ITelemetryService, TelemetryService>();
-            services.AddTransient<ITelemetryUserService, TelemetryUserService>();
-            services.AddTransient<ITimezoneService, TimezoneService>();
-            services.AddScoped<IWellService, WellService>();
-            services.AddTransient<IProcessMapReportDrillingExportService, ProcessMapReportDataSaubStatExportService>();
-            services.AddTransient<IWellOperationRepository, WellOperationRepository>();
-            services.AddTransient<IDailyReportService, DailyReportService>();
-            services.AddTransient<IDetectedOperationService, DetectedOperationService>();
-            services.AddTransient<ISubsystemService, SubsystemService>();
-            services.AddTransient<IScheduleRepository, ScheduleRepository>();
-            services.AddTransient<IRepositoryWellRelated<OperationValueDto>, CrudWellRelatedRepositoryBase<OperationValueDto, OperationValue>>();
-            services.AddTransient<IUserSettingsRepository, UserSettingsRepository>();
-            services.AddTransient<IWellFinalDocumentsService, WellFinalDocumentsService>();
-            services.AddTransient<IFileCategoryService, FileCategoryService>();
-            services.AddTransient<ILimitingParameterService, LimitingParameterService>();
-            services.AddTransient<WellInfoService>();
-            services.AddTransient<IHelpPageService, HelpPageService>();
-            services.AddTransient<IScheduleReportService, ScheduleReportService>();
-            services.AddTransient<IDataSaubStatRepository, DataSaubStatRepository>();
-            services.AddTransient<IDataSaubStatService, DataSaubStatService>();
-            services.AddTransient<IWellOperationService, WellOperationService>();
+        services.AddTransient<IAuthService, AuthService>();
+        services.AddTransient<IDepositRepository, DepositRepository>();
+        services.AddTransient<IDrillingProgramService, DrillingProgramService>();
+        services.AddTransient<IEventService, EventService>();
+        services.AddTransient<FileService>();
+        services.AddTransient<IMeasureService, MeasureService>();
+        services.AddTransient<IMessageService, MessageService>();
+        services.AddTransient<IOperationsStatService, OperationsStatService>();
+        services.AddTransient<IReportService, ReportService>();
+        services.AddTransient<ISetpointsService, SetpointsService>();
+        services.AddScoped<ITelemetryService, TelemetryService>();
+        services.AddTransient<ITelemetryUserService, TelemetryUserService>();
+        services.AddTransient<ITimezoneService, TimezoneService>();
+        services.AddScoped<IWellService, WellService>();
+        services.AddTransient<IProcessMapReportDrillingExportService, ProcessMapReportDataSaubStatExportService>();
+        services.AddTransient<IWellOperationRepository, WellOperationRepository>();
+        services.AddTransient<IDailyReportService, DailyReportService>();
+        services.AddTransient<IDetectedOperationService, DetectedOperationService>();
+        services.AddTransient<ISubsystemService, SubsystemService>();
+        services.AddTransient<IScheduleRepository, ScheduleRepository>();
+        services.AddTransient<IRepositoryWellRelated<OperationValueDto>, CrudWellRelatedRepositoryBase<OperationValueDto, OperationValue>>();
+        services.AddTransient<IUserSettingsRepository, UserSettingsRepository>();
+        services.AddTransient<IWellFinalDocumentsService, WellFinalDocumentsService>();
+        services.AddTransient<IFileCategoryService, FileCategoryService>();
+        services.AddTransient<ILimitingParameterService, LimitingParameterService>();
+        services.AddTransient<WellInfoService>();
+        services.AddTransient<IHelpPageService, HelpPageService>();
+        services.AddTransient<IScheduleReportService, ScheduleReportService>();
+        services.AddTransient<IDataSaubStatRepository, DataSaubStatRepository>();
+        services.AddTransient<IDataSaubStatService, DataSaubStatService>();
+        services.AddTransient<IWellOperationService, WellOperationService>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanRotorDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanRotor, ProcessMapPlanRotorDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanRotorDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanRotor, ProcessMapPlanRotorDto>>();
 
-            services.AddTransient<
-               IChangeLogRepository<ProcessMapPlanSlideDto, ProcessMapPlanBaseRequestWithWell>,
-               ProcessMapPlanBaseRepository<ProcessMapPlanSlide, ProcessMapPlanSlideDto>>();
+        services.AddTransient<
+           IChangeLogRepository<ProcessMapPlanSlideDto, ProcessMapPlanBaseRequestWithWell>,
+           ProcessMapPlanBaseRepository<ProcessMapPlanSlide, ProcessMapPlanSlideDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanReamingRotorDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanReamingRotor, ProcessMapPlanReamingRotorDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanReamingRotorDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanReamingRotor, ProcessMapPlanReamingRotorDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanReamingSlideDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanReamingSlide, ProcessMapPlanReamingSlideDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanReamingSlideDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanReamingSlide, ProcessMapPlanReamingSlideDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanLoadCapacityDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanLoadCapacity, ProcessMapPlanLoadCapacityDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanLoadCapacityDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanLoadCapacity, ProcessMapPlanLoadCapacityDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanRecordingStaticMeasurementDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanRecordingStaticMeasurement, ProcessMapPlanRecordingStaticMeasurementDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanRecordingStaticMeasurementDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanRecordingStaticMeasurement, ProcessMapPlanRecordingStaticMeasurementDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanPositioningOffTheBottomDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanPositioningOffTheBottom, ProcessMapPlanPositioningOffTheBottomDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanPositioningOffTheBottomDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanPositioningOffTheBottom, ProcessMapPlanPositioningOffTheBottomDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanOscillationAnglesDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanOscillationAngles, ProcessMapPlanOscillationAnglesDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanOscillationAnglesDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanOscillationAngles, ProcessMapPlanOscillationAnglesDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanTFOrientationDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanTFOrientation, ProcessMapPlanTFOrientationDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanTFOrientationDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanTFOrientation, ProcessMapPlanTFOrientationDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanSwitchingOffThePumpDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanSwitchingOffThePump, ProcessMapPlanSwitchingOffThePumpDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanSwitchingOffThePumpDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanSwitchingOffThePump, ProcessMapPlanSwitchingOffThePumpDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanSwitchingToTheModeDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanSwitchingToTheMode, ProcessMapPlanSwitchingToTheModeDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanSwitchingToTheModeDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanSwitchingToTheMode, ProcessMapPlanSwitchingToTheModeDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanDrillTestDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanDrillTest, ProcessMapPlanDrillTestDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanDrillTestDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanDrillTest, ProcessMapPlanDrillTestDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanShockTestDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanShockTest, ProcessMapPlanShockTestDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanShockTestDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanShockTest, ProcessMapPlanShockTestDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanDamperDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanDamper, ProcessMapPlanDamperDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanDamperDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanDamper, ProcessMapPlanDamperDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanAutoHoldTFDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanAutoHoldTF, ProcessMapPlanAutoHoldTFDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanAutoHoldTFDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanAutoHoldTF, ProcessMapPlanAutoHoldTFDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanOscillationDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanOscillation, ProcessMapPlanOscillationDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanOscillationDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanOscillation, ProcessMapPlanOscillationDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanAntiCrashRotationDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanAntiCrashRotation, ProcessMapPlanAntiCrashRotationDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanAntiCrashRotationDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanAntiCrashRotation, ProcessMapPlanAntiCrashRotationDto>>();
 
-            services.AddTransient<
-                IChangeLogRepository<ProcessMapPlanStaticMeasurementOutputDto, ProcessMapPlanBaseRequestWithWell>,
-                ProcessMapPlanBaseRepository<ProcessMapPlanStaticMeasurementOutput, ProcessMapPlanStaticMeasurementOutputDto>>();
+        services.AddTransient<
+            IChangeLogRepository<ProcessMapPlanStaticMeasurementOutputDto, ProcessMapPlanBaseRequestWithWell>,
+            ProcessMapPlanBaseRepository<ProcessMapPlanStaticMeasurementOutput, ProcessMapPlanStaticMeasurementOutputDto>>();
 
-            services.AddTransient<IProcessMapReportDrillingService, ProcessMapReportDrillingService>();
+        services.AddTransient<IProcessMapReportDrillingService, ProcessMapReportDrillingService>();
 
-            services.AddTransient<TrajectoryService>();
+        services.AddTransient<TrajectoryService>();
 
-            services.AddTransient<IGtrRepository, GtrWitsRepository>();
+        services.AddTransient<IGtrRepository, GtrWitsRepository>();
 
-            services.AddTransient<NotificationService>();
-            services.AddTransient<INotificationRepository, NotificationRepository>();
-            services.AddTransient<ICrudRepository<NotificationCategoryDto>, CrudCacheRepositoryBase<NotificationCategoryDto,
-                NotificationCategory>>();
-            services.AddTransient<IDrillTestRepository, DrillTestRepository>();
-            services.AddTransient<IWellCompositeOperationService, WellCompositeOperationService>();
+        services.AddTransient<NotificationService>();
+        services.AddTransient<INotificationRepository, NotificationRepository>();
+        services.AddTransient<ICrudRepository<NotificationCategoryDto>, CrudCacheRepositoryBase<NotificationCategoryDto,
+            NotificationCategory>>();
+        services.AddTransient<IDrillTestRepository, DrillTestRepository>();
+        services.AddTransient<IWellCompositeOperationService, WellCompositeOperationService>();
 
-            // admin crud services:
-            services.AddTransient<ICrudRepository<TelemetryDto>, CrudCacheRepositoryBase<TelemetryDto, Telemetry>>(s =>
-               new CrudCacheRepositoryBase<TelemetryDto, Telemetry>(
-                  s.GetRequiredService<IAsbCloudDbContext>(),
-                  s.GetRequiredService<IMemoryCache>(),
-                  dbSet => dbSet.Include(t => t.Well))); // может быть включен в сервис TelemetryService
-            services.AddTransient<ICrudRepository<DepositDto>, CrudCacheRepositoryBase<DepositDto, Deposit>>(s =>
-               new CrudCacheRepositoryBase<DepositDto, Deposit>(
-                  s.GetRequiredService<IAsbCloudDbContext>(),
-                  s.GetRequiredService<IMemoryCache>(),
-                  dbSet => dbSet.Include(d => d.Clusters)
-                     .ThenInclude(c => c.Wells)));
-            services.AddTransient<ICrudRepository<CompanyDto>, CrudCacheRepositoryBase<CompanyDto, Company>>(s =>
-               new CrudCacheRepositoryBase<CompanyDto, Company>(
-                  s.GetRequiredService<IAsbCloudDbContext>(),
-                  s.GetRequiredService<IMemoryCache>(),
-                  dbSet => dbSet.Include(c => c.CompanyType)));
+        // admin crud services:
+        services.AddTransient<ICrudRepository<TelemetryDto>, CrudCacheRepositoryBase<TelemetryDto, Telemetry>>(s =>
+           new CrudCacheRepositoryBase<TelemetryDto, Telemetry>(
+              s.GetRequiredService<IAsbCloudDbContext>(),
+              s.GetRequiredService<IMemoryCache>(),
+              dbSet => dbSet.Include(t => t.Well))); // может быть включен в сервис TelemetryService
+        services.AddTransient<ICrudRepository<DepositDto>, CrudCacheRepositoryBase<DepositDto, Deposit>>(s =>
+           new CrudCacheRepositoryBase<DepositDto, Deposit>(
+              s.GetRequiredService<IAsbCloudDbContext>(),
+              s.GetRequiredService<IMemoryCache>(),
+              dbSet => dbSet.Include(d => d.Clusters)
+                 .ThenInclude(c => c.Wells)));
+        services.AddTransient<ICrudRepository<CompanyDto>, CrudCacheRepositoryBase<CompanyDto, Company>>(s =>
+           new CrudCacheRepositoryBase<CompanyDto, Company>(
+              s.GetRequiredService<IAsbCloudDbContext>(),
+              s.GetRequiredService<IMemoryCache>(),
+              dbSet => dbSet.Include(c => c.CompanyType)));
 
-            services.AddTransient<ICrudRepository<CompanyTypeDto>, CrudCacheRepositoryBase<CompanyTypeDto, CompanyType>>();
-            services.AddTransient<ICrudRepository<ClusterDto>, CrudCacheRepositoryBase<ClusterDto, Cluster>>(s =>
-               new CrudCacheRepositoryBase<ClusterDto, Cluster>(
-                  s.GetRequiredService<IAsbCloudDbContext>(),
-                  s.GetRequiredService<IMemoryCache>(),
-                  dbSet => dbSet
-                      .Include(c => c.Wells)
-                      .Include(c => c.Deposit))); // может быть включен в сервис ClusterService
+        services.AddTransient<ICrudRepository<CompanyTypeDto>, CrudCacheRepositoryBase<CompanyTypeDto, CompanyType>>();
+        services.AddTransient<ICrudRepository<ClusterDto>, CrudCacheRepositoryBase<ClusterDto, Cluster>>(s =>
+           new CrudCacheRepositoryBase<ClusterDto, Cluster>(
+              s.GetRequiredService<IAsbCloudDbContext>(),
+              s.GetRequiredService<IMemoryCache>(),
+              dbSet => dbSet
+                  .Include(c => c.Wells)
+                  .Include(c => c.Deposit))); // может быть включен в сервис ClusterService
 
-            services.AddTransient<ICrudRepository<DrillerDto>, CrudCacheRepositoryBase<DrillerDto, Driller>>();
+        services.AddTransient<ICrudRepository<DrillerDto>, CrudCacheRepositoryBase<DrillerDto, Driller>>();
 
-            services.AddTransient<IHelpPageRepository, HelpPageRepository>();
-            services.AddTransient<IFileRepository, FileRepository>();
-            services.AddTransient<IFileStorageRepository, FileStorageRepository>();
+        services.AddTransient<IHelpPageRepository, HelpPageRepository>();
+        services.AddTransient<IFileRepository, FileRepository>();
+        services.AddTransient<IFileStorageRepository, FileStorageRepository>();
 
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanRotorDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanSlideDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanReamingRotorDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanReamingSlideDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanLoadCapacityDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanRecordingStaticMeasurementDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanPositioningOffTheBottomDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOscillationAnglesDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanTFOrientationDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanSwitchingOffThePumpDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanSwitchingToTheModeDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanDrillTestDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanShockTestDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanDamperDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanAutoHoldTFDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOscillationDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanAntiCrashRotationDto>>();
-            services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanStaticMeasurementOutputDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanRotorDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanSlideDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanReamingRotorDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanReamingSlideDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanLoadCapacityDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanRecordingStaticMeasurementDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanPositioningOffTheBottomDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOscillationAnglesDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanTFOrientationDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanSwitchingOffThePumpDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanSwitchingToTheModeDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanDrillTestDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanShockTestDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanDamperDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanAutoHoldTFDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOscillationDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanAntiCrashRotationDto>>();
+        services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanStaticMeasurementOutputDto>>();
 
-            services.AddTransient<IUserRoleRepository, UserRoleRepository>();
-            services.AddTransient<IUserRepository, UserRepository>();
-            services.AddTransient<ILimitingParameterRepository, LimitingParameterRepository>();
-            services.AddTransient<ITelemetryWirelineRunOutRepository, TelemetryWirelineRunOutRepository>();
-            services.AddTransient<IWellFinalDocumentsRepository, WellFinalDocumentsRepository>();
-            services.AddTransient<ITrajectoryEditableRepository<TrajectoryGeoPlanDto>, TrajectoryEditableRepository<TrajectoryPlan, TrajectoryGeoPlanDto>>();
-            services.AddTransient<ITrajectoryEditableRepository<TrajectoryGeoFactDto>, TrajectoryEditableRepository<TrajectoryFact, TrajectoryGeoFactDto>>();
-            services.AddTransient<ITrajectoryNnbRepository, TrajectoryNnbRepository>();
-            services.AddTransient<IFaqRepository, FaqRepository>();
-            services.AddTransient<ISlipsStatService, SlipsStatService>();
-            services.AddTransient<IWellContactService, WellContactService>();
-            services.AddTransient<ICrudRepository<WellSectionTypeDto>, CrudCacheRepositoryBase<WellSectionTypeDto,
-               WellSectionType>>();
+        services.AddTransient<IUserRoleRepository, UserRoleRepository>();
+        services.AddTransient<IUserRepository, UserRepository>();
+        services.AddTransient<ILimitingParameterRepository, LimitingParameterRepository>();
+        services.AddTransient<ITelemetryWirelineRunOutRepository, TelemetryWirelineRunOutRepository>();
+        services.AddTransient<IWellFinalDocumentsRepository, WellFinalDocumentsRepository>();
+        services.AddTransient<ITrajectoryEditableRepository<TrajectoryGeoPlanDto>, TrajectoryEditableRepository<TrajectoryPlan, TrajectoryGeoPlanDto>>();
+        services.AddTransient<ITrajectoryEditableRepository<TrajectoryGeoFactDto>, TrajectoryEditableRepository<TrajectoryFact, TrajectoryGeoFactDto>>();
+        services.AddTransient<ITrajectoryNnbRepository, TrajectoryNnbRepository>();
+        services.AddTransient<IFaqRepository, FaqRepository>();
+        services.AddTransient<ISlipsStatService, SlipsStatService>();
+        services.AddTransient<IWellContactService, WellContactService>();
+        services.AddTransient<ICrudRepository<WellSectionTypeDto>, CrudCacheRepositoryBase<WellSectionTypeDto,
+           WellSectionType>>();
 
-            services.AddTransient<ICrudRepository<SubsystemDto>, CrudCacheRepositoryBase<SubsystemDto, Subsystem>>();
+        services.AddTransient<ICrudRepository<SubsystemDto>, CrudCacheRepositoryBase<SubsystemDto, Subsystem>>();
 
-            services.AddTransient<ICrudRepository<PermissionDto>, CrudCacheRepositoryBase<PermissionDto, Permission>>();
+        services.AddTransient<ICrudRepository<PermissionDto>, CrudCacheRepositoryBase<PermissionDto, Permission>>();
 
-            // TelemetryData services
-            services.AddTransient<ITelemetryDataSaubService, TelemetryDataSaubService>();
-            services.AddTransient<ITelemetryDataService<TelemetryDataSpinDto>, TelemetryDataSpinService>();
+        // TelemetryData services
+        services.AddTransient<ITelemetryDataSaubService, TelemetryDataSaubService>();
+        services.AddTransient<ITelemetryDataService<TelemetryDataSpinDto>, TelemetryDataSpinService>();
 
-            // Wits
-            services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record1Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record1Dto, AsbCloudDb.Model.WITS.Record1>>();
-            services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record7Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record7Dto, AsbCloudDb.Model.WITS.Record7>>();
-            services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record8Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record8Dto, AsbCloudDb.Model.WITS.Record8>>();
-            services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record50Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record50Dto, AsbCloudDb.Model.WITS.Record50>>();
-            services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record60Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record60Dto, AsbCloudDb.Model.WITS.Record60>>();
-            services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record61Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record61Dto, AsbCloudDb.Model.WITS.Record61>>();
+        // Wits
+        services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record1Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record1Dto, AsbCloudDb.Model.WITS.Record1>>();
+        services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record7Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record7Dto, AsbCloudDb.Model.WITS.Record7>>();
+        services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record8Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record8Dto, AsbCloudDb.Model.WITS.Record8>>();
+        services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record50Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record50Dto, AsbCloudDb.Model.WITS.Record50>>();
+        services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record60Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record60Dto, AsbCloudDb.Model.WITS.Record60>>();
+        services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record61Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record61Dto, AsbCloudDb.Model.WITS.Record61>>();
 
-            services.AddTransient<IDrillTestReportService, DrillTestReportService>();
-            services.AddTransient<IReportMakerService<DrillTestReportDataDto>, DrillTestReportMakerService>();
+        services.AddTransient<IDrillTestReportService, DrillTestReportService>();
+        services.AddTransient<IReportMakerService<DrillTestReportDataDto>, DrillTestReportMakerService>();
 
-            services.AddTransient<IManualDirectoryRepository, ManualDirectoryRepository>();
-            services.AddTransient<IManualCatalogService, ManualCatalogService>();
-            services.AddTransient<ICrudRepository<ManualDto>, CrudRepositoryBase<ManualDto, Manual>>();
+        services.AddTransient<IManualDirectoryRepository, ManualDirectoryRepository>();
+        services.AddTransient<IManualCatalogService, ManualCatalogService>();
+        services.AddTransient<ICrudRepository<ManualDto>, CrudRepositoryBase<ManualDto, Manual>>();
 
-            services.AddTransient<IWellboreService, WellboreService>();
+        services.AddTransient<IWellboreService, WellboreService>();
 
-            services.AddTransient<ITelemetryDataEditorService, TelemetryDataEditorService>();
+        services.AddTransient<ITelemetryDataEditorService, TelemetryDataEditorService>();
 
-            services.AddTransient<DetectedOperationExportService>();
+        services.AddTransient<DetectedOperationExportService>();
 
-            services.AddTransient<IDailyReportService, DailyReportService>();
-            services.AddTransient<IDailyReportRepository, DailyReportRepository>();
-            services.AddTransient<IDailyReportExportService, DailyReportExportService>();
+        services.AddTransient<IDailyReportService, DailyReportService>();
+        services.AddTransient<IDailyReportRepository, DailyReportRepository>();
+        services.AddTransient<IDailyReportExportService, DailyReportExportService>();
 
-            services.AddTransient<IRepositoryWellRelated<WellSectionPlanDto>, CrudWellRelatedRepositoryBase<WellSectionPlanDto, WellSectionPlan>>();
+        services.AddTransient<IRepositoryWellRelated<WellSectionPlanDto>, CrudWellRelatedRepositoryBase<WellSectionPlanDto, WellSectionPlan>>();
 
-            services.AddTransient<IWellSectionPlanRepository, WellSectionPlanRepository>();
-            services.AddTransient<IWellOperationCategoryRepository, WellOperationCategoryRepository>();
-            services.AddTransient<IDetectedOperationRepository, DetectedOperationRepository>();
+        services.AddTransient<IWellSectionPlanRepository, WellSectionPlanRepository>();
+        services.AddTransient<IWellOperationCategoryRepository, WellOperationCategoryRepository>();
+        services.AddTransient<IDetectedOperationRepository, DetectedOperationRepository>();
 
-            services.AddTransient<TrajectoryPlanParser>();
-            services.AddTransient<TrajectoryFactManualParser>();
-            services.AddTransient<ProcessMapPlanRotorParser>();
-            services.AddTransient<ProcessMapPlanSlideParser>();
-            services.AddTransient<ProcessMapPlanReamingRotorParser>();
-            services.AddTransient<ProcessMapPlanReamingSlideParser>();
-            services.AddTransient<ProcessMapPlanLoadCapacityParser>();
-            services.AddTransient<ProcessMapPlanRecordingStaticMeasurementParser>();
-            services.AddTransient<ProcessMapPlanPositioningOffTheBottomParser>();
-            services.AddTransient<ProcessMapPlanOscillationAnglesParser>();
-            services.AddTransient<ProcessMapPlanTFOrientationParser>();
-            services.AddTransient<ProcessMapPlanSwitchingOffThePumpParser>();
-            services.AddTransient<ProcessMapPlanSwitchingToTheModeParser>();
-            services.AddTransient<ProcessMapPlanDrillTestParser>();
-            services.AddTransient<ProcessMapPlanShockTestParser>();
-            services.AddTransient<ProcessMapPlanDamperParser>();
-            services.AddTransient<ProcessMapPlanAutoHoldTFParser>();
-            services.AddTransient<ProcessMapPlanOscillationParser>();
-            services.AddTransient<ProcessMapPlanAntiCrashRotationParser>();
-            services.AddTransient<ProcessMapPlanStaticMeasurementOutputParser>();
+        services.AddTransient<TrajectoryPlanParser>();
+        services.AddTransient<TrajectoryFactManualParser>();
+        services.AddTransient<ProcessMapPlanRotorParser>();
+        services.AddTransient<ProcessMapPlanSlideParser>();
+        services.AddTransient<ProcessMapPlanReamingRotorParser>();
+        services.AddTransient<ProcessMapPlanReamingSlideParser>();
+        services.AddTransient<ProcessMapPlanLoadCapacityParser>();
+        services.AddTransient<ProcessMapPlanRecordingStaticMeasurementParser>();
+        services.AddTransient<ProcessMapPlanPositioningOffTheBottomParser>();
+        services.AddTransient<ProcessMapPlanOscillationAnglesParser>();
+        services.AddTransient<ProcessMapPlanTFOrientationParser>();
+        services.AddTransient<ProcessMapPlanSwitchingOffThePumpParser>();
+        services.AddTransient<ProcessMapPlanSwitchingToTheModeParser>();
+        services.AddTransient<ProcessMapPlanDrillTestParser>();
+        services.AddTransient<ProcessMapPlanShockTestParser>();
+        services.AddTransient<ProcessMapPlanDamperParser>();
+        services.AddTransient<ProcessMapPlanAutoHoldTFParser>();
+        services.AddTransient<ProcessMapPlanOscillationParser>();
+        services.AddTransient<ProcessMapPlanAntiCrashRotationParser>();
+        services.AddTransient<ProcessMapPlanStaticMeasurementOutputParser>();
 
-            services.AddTransient<TrajectoryPlanExportService>();
-            services.AddTransient<TrajectoryFactManualExportService>();
-            services.AddTransient<TrajectoryFactNnbExportService>();
+        services.AddTransient<TrajectoryPlanExportService>();
+        services.AddTransient<TrajectoryFactManualExportService>();
+        services.AddTransient<TrajectoryFactNnbExportService>();
 
-            services.AddTransient<ProcessMapPlanRotorExportService>();
-            services.AddTransient<ProcessMapPlanSlideExportService>();
-            services.AddTransient<ProcessMapPlanReamingRotorExportService>();
-            services.AddTransient<ProcessMapPlanReamingSlideExportService>();
-            services.AddTransient<ProcessMapPlanLoadCapacityExportService>();
-            services.AddTransient<ProcessMapPlanRecordingStaticMeasurementExportService>();
-            services.AddTransient<ProcessMapPlanPositioningOffTheBottomExportService>();
-            services.AddTransient<ProcessMapPlanOscillationAnglesExportService>();
-            services.AddTransient<ProcessMapPlanTFOrientationExportService>();
-            services.AddTransient<ProcessMapPlanSwitchingOffThePumpExportService>();
-            services.AddTransient<ProcessMapPlanSwitchingToTheModeExportService>();
-            services.AddTransient<ProcessMapPlanDrillTestExportService>();
-            services.AddTransient<ProcessMapPlanShockTestExportService>();
-            services.AddTransient<ProcessMapPlanDamperExportService>();
-            services.AddTransient<ProcessMapPlanAutoHoldTFExportService>();
-            services.AddTransient<ProcessMapPlanOscillationExportService>();
-            services.AddTransient<ProcessMapPlanAntiCrashRotationExportService>();
-            services.AddTransient<ProcessMapPlanStaticMeasurementOutputExportService>();
+        services.AddTransient<ProcessMapPlanRotorExportService>();
+        services.AddTransient<ProcessMapPlanSlideExportService>();
+        services.AddTransient<ProcessMapPlanReamingRotorExportService>();
+        services.AddTransient<ProcessMapPlanReamingSlideExportService>();
+        services.AddTransient<ProcessMapPlanLoadCapacityExportService>();
+        services.AddTransient<ProcessMapPlanRecordingStaticMeasurementExportService>();
+        services.AddTransient<ProcessMapPlanPositioningOffTheBottomExportService>();
+        services.AddTransient<ProcessMapPlanOscillationAnglesExportService>();
+        services.AddTransient<ProcessMapPlanTFOrientationExportService>();
+        services.AddTransient<ProcessMapPlanSwitchingOffThePumpExportService>();
+        services.AddTransient<ProcessMapPlanSwitchingToTheModeExportService>();
+        services.AddTransient<ProcessMapPlanDrillTestExportService>();
+        services.AddTransient<ProcessMapPlanShockTestExportService>();
+        services.AddTransient<ProcessMapPlanDamperExportService>();
+        services.AddTransient<ProcessMapPlanAutoHoldTFExportService>();
+        services.AddTransient<ProcessMapPlanOscillationExportService>();
+        services.AddTransient<ProcessMapPlanAntiCrashRotationExportService>();
+        services.AddTransient<ProcessMapPlanStaticMeasurementOutputExportService>();
 
-            services.AddTransient<WellOperationParserFactory>();
-            services.AddTransient<WellOperationExportServiceFactory>();
+        services.AddTransient<WellOperationParserFactory>();
+        services.AddTransient<WellOperationExportServiceFactory>();
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/AsbCloudInfrastructure/LinqExtensions.cs b/AsbCloudInfrastructure/LinqExtensions.cs
index 061cc60a..eb54693e 100644
--- a/AsbCloudInfrastructure/LinqExtensions.cs
+++ b/AsbCloudInfrastructure/LinqExtensions.cs
@@ -4,36 +4,35 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AsbCloudInfrastructure
+namespace AsbCloudInfrastructure;
+
+public static class LinqExtensions
 {
-    public static class LinqExtensions
+    public static TProp? MaxOrDefault<TObj, TProp>(this IEnumerable<TObj> enumerable, Func<TObj, TProp> getter)
+        where TProp : struct
     {
-        public static TProp? MaxOrDefault<TObj, TProp>(this IEnumerable<TObj> enumerable, Func<TObj, TProp> getter)
-            where TProp : struct
-        {
-            var value = MaxByOrDefault(enumerable, getter);
-            if (value is null)
-                return null;
-            return getter(value);
-        }
+        var value = MaxByOrDefault(enumerable, getter);
+        if (value is null)
+            return null;
+        return getter(value);
+    }
 
-        public static TObj? MaxByOrDefault<TObj, TProp>(this IEnumerable<TObj> enumerable, Func<TObj, TProp> getter)
-        {
-            return enumerable.OrderByDescending(getter).FirstOrDefault();
-        }
+    public static TObj? MaxByOrDefault<TObj, TProp>(this IEnumerable<TObj> enumerable, Func<TObj, TProp> getter)
+    {
+        return enumerable.OrderByDescending(getter).FirstOrDefault();
+    }
 
-        public static TProp? MinOrDefault<TObj, TProp>(this IEnumerable<TObj> enumerable, Func<TObj, TProp> getter)
-            where TProp : struct
-        {
-            var value = MinByOrDefault(enumerable, getter);            
-            if (value is null)
-                return null;
-            return getter(value);
-        }
+    public static TProp? MinOrDefault<TObj, TProp>(this IEnumerable<TObj> enumerable, Func<TObj, TProp> getter)
+        where TProp : struct
+    {
+        var value = MinByOrDefault(enumerable, getter);            
+        if (value is null)
+            return null;
+        return getter(value);
+    }
 
-        public static TObj? MinByOrDefault<TObj, TProp>(this IEnumerable<TObj> enumerable, Func<TObj, TProp> getter)
-        {
-            return enumerable.OrderBy(getter).FirstOrDefault();
-        }
+    public static TObj? MinByOrDefault<TObj, TProp>(this IEnumerable<TObj> enumerable, Func<TObj, TProp> getter)
+    {
+        return enumerable.OrderBy(getter).FirstOrDefault();
     }
 }
diff --git a/AsbCloudInfrastructure/MemoryCacheExtentions.cs b/AsbCloudInfrastructure/MemoryCacheExtentions.cs
index a8d89010..1abde63d 100644
--- a/AsbCloudInfrastructure/MemoryCacheExtentions.cs
+++ b/AsbCloudInfrastructure/MemoryCacheExtentions.cs
@@ -6,106 +6,105 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure
+namespace AsbCloudInfrastructure;
+
+
+public static class MemoryCacheExtentions
 {
+    private static readonly TimeSpan CacheOlescence = TimeSpan.FromMinutes(5);
 
-    public static class MemoryCacheExtentions
+    /// <summary>
+    /// Создать кеш на основе асинхронного запроса к БД.
+    /// Ключ кеша - полное имя типа T.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="memoryCache"></param>
+    /// <param name="query"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public static Task<IEnumerable<T>> GetOrCreateBasicAsync<T>(this IMemoryCache memoryCache, IQueryable<T> query, CancellationToken token)
+        where T : class
     {
-        private static readonly TimeSpan CacheOlescence = TimeSpan.FromMinutes(5);
-
-        /// <summary>
-        /// Создать кеш на основе асинхронного запроса к БД.
-        /// Ключ кеша - полное имя типа T.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="memoryCache"></param>
-        /// <param name="query"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public static Task<IEnumerable<T>> GetOrCreateBasicAsync<T>(this IMemoryCache memoryCache, IQueryable<T> query, CancellationToken token)
-            where T : class
+        var getter = async (CancellationToken token) =>
         {
-            var getter = async (CancellationToken token) =>
-            {
-                var entities = await query
-                    .AsNoTracking()
-                    .ToArrayAsync(token);
-                return entities.AsEnumerable();
-            };
-            return memoryCache.GetOrCreateBasicAsync(getter, token);
-        }
-
-        /// <summary>
-        /// Создать кеш на основе результата выполнения произвольной асинхронной функции.
-        /// Ключ кеша - полное имя типа T.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="memoryCache"></param>
-        /// <param name="getterAsync"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        public static Task<IEnumerable<T>> GetOrCreateBasicAsync<T>(this IMemoryCache memoryCache, Func<CancellationToken, Task<IEnumerable<T>>> getterAsync, CancellationToken token)
-        {
-            var key = typeof(T).FullName!;
-            var cache = memoryCache.GetOrCreateAsync(key, async (cacheEntry) =>
-            {
-                cacheEntry.AbsoluteExpirationRelativeToNow = CacheOlescence;
-                cacheEntry.SlidingExpiration = CacheOlescence;
-                var entities = await getterAsync(token);
-                return entities;
-            });
-            return cache!;
-        }
-
-        /// <summary>
-        /// Создать кеш на основе запроса к БД.
-        /// Ключ кеша - полное имя типа T.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="memoryCache"></param>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        public static IEnumerable<T> GetOrCreateBasic<T>(this IMemoryCache memoryCache, IQueryable<T> query)
-            where T : class
-        {
-            var getter = () => query
+            var entities = await query
                 .AsNoTracking()
-                .ToArray();
-            return memoryCache.GetOrCreateBasic(getter);
-        }
+                .ToArrayAsync(token);
+            return entities.AsEnumerable();
+        };
+        return memoryCache.GetOrCreateBasicAsync(getter, token);
+    }
 
-        /// <summary>
-        /// Создать кеш на основе результата выполнения произвольной функции.
-        /// Ключ кеша - полное имя типа T.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="memoryCache"></param>
-        /// <param name="getter"></param>
-        /// <returns></returns>
-        public static IEnumerable<T> GetOrCreateBasic<T>(this IMemoryCache memoryCache, Func<IEnumerable<T>> getter)
+    /// <summary>
+    /// Создать кеш на основе результата выполнения произвольной асинхронной функции.
+    /// Ключ кеша - полное имя типа T.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="memoryCache"></param>
+    /// <param name="getterAsync"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public static Task<IEnumerable<T>> GetOrCreateBasicAsync<T>(this IMemoryCache memoryCache, Func<CancellationToken, Task<IEnumerable<T>>> getterAsync, CancellationToken token)
+    {
+        var key = typeof(T).FullName!;
+        var cache = memoryCache.GetOrCreateAsync(key, async (cacheEntry) =>
         {
-            var key = typeof(T).FullName!;
-            var cache = memoryCache.GetOrCreate(key, cacheEntry =>
-            {
-                cacheEntry.AbsoluteExpirationRelativeToNow = CacheOlescence;
-                cacheEntry.SlidingExpiration = CacheOlescence;
-                return getter();
-            });
-            return cache!;
-        }
+            cacheEntry.AbsoluteExpirationRelativeToNow = CacheOlescence;
+            cacheEntry.SlidingExpiration = CacheOlescence;
+            var entities = await getterAsync(token);
+            return entities;
+        });
+        return cache!;
+    }
 
-        /// <summary>
-        /// Сбросить кеш.
-        /// Ключ кеша - полное имя типа T.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="memoryCache"></param>
-        public static void DropBasic<T>(this IMemoryCache memoryCache)
-            where T : class
+    /// <summary>
+    /// Создать кеш на основе запроса к БД.
+    /// Ключ кеша - полное имя типа T.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="memoryCache"></param>
+    /// <param name="query"></param>
+    /// <returns></returns>
+    public static IEnumerable<T> GetOrCreateBasic<T>(this IMemoryCache memoryCache, IQueryable<T> query)
+        where T : class
+    {
+        var getter = () => query
+            .AsNoTracking()
+            .ToArray();
+        return memoryCache.GetOrCreateBasic(getter);
+    }
+
+    /// <summary>
+    /// Создать кеш на основе результата выполнения произвольной функции.
+    /// Ключ кеша - полное имя типа T.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="memoryCache"></param>
+    /// <param name="getter"></param>
+    /// <returns></returns>
+    public static IEnumerable<T> GetOrCreateBasic<T>(this IMemoryCache memoryCache, Func<IEnumerable<T>> getter)
+    {
+        var key = typeof(T).FullName!;
+        var cache = memoryCache.GetOrCreate(key, cacheEntry =>
         {
-            var key = typeof(T).FullName!;
+            cacheEntry.AbsoluteExpirationRelativeToNow = CacheOlescence;
+            cacheEntry.SlidingExpiration = CacheOlescence;
+            return getter();
+        });
+        return cache!;
+    }
 
-            memoryCache.Remove(key);
-        }
+    /// <summary>
+    /// Сбросить кеш.
+    /// Ключ кеша - полное имя типа T.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="memoryCache"></param>
+    public static void DropBasic<T>(this IMemoryCache memoryCache)
+        where T : class
+    {
+        var key = typeof(T).FullName!;
+
+        memoryCache.Remove(key);
     }
 }
diff --git a/AsbCloudInfrastructure/PredicateBuilder.cs b/AsbCloudInfrastructure/PredicateBuilder.cs
index 423dec6f..a658e973 100644
--- a/AsbCloudInfrastructure/PredicateBuilder.cs
+++ b/AsbCloudInfrastructure/PredicateBuilder.cs
@@ -3,77 +3,76 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 
-namespace AsbCloudInfrastructure
+namespace AsbCloudInfrastructure;
+
+
+/// <summary>
+/// stolen from https://github.com/lotosbin/BinbinPredicateBuilder
+/// </summary>
+public static class PredicateBuilder
 {
+    /// <summary>
+    ///     Combines the first predicate with the second using the logical "and".
+    /// </summary>
+    public static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> first, Expression<Func<T, bool>> second)
+    {
+        return first.Compose(second, Expression.AndAlso);
+    }
 
     /// <summary>
-    /// stolen from https://github.com/lotosbin/BinbinPredicateBuilder
+    ///     Combines the first predicate with the second using the logical "or".
     /// </summary>
-    public static class PredicateBuilder
+    public static Expression<Func<T, bool>> Or<T>(this Expression<Func<T, bool>> first, Expression<Func<T, bool>> second)
     {
-        /// <summary>
-        ///     Combines the first predicate with the second using the logical "and".
-        /// </summary>
-        public static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> first, Expression<Func<T, bool>> second)
+        return first.Compose(second, Expression.OrElse);
+    }
+
+    /// <summary>
+    ///     Negates the predicate.
+    /// </summary>
+    public static Expression<Func<T, bool>> Not<T>(this Expression<Func<T, bool>> expression)
+    {
+        var negated = Expression.Not(expression.Body);
+        return Expression.Lambda<Func<T, bool>>(negated, expression.Parameters);
+    }
+
+    private static Expression<T> Compose<T>(this Expression<T> first, Expression<T> second, Func<Expression, Expression, Expression> merge)
+    {
+        var map = first.Parameters
+            .Select((f, i) => new { f, s = second.Parameters[i] })
+            .ToDictionary(p => p.s, p => p.f);
+
+        var tryReplaceParametr = (Expression node) => 
         {
-            return first.Compose(second, Expression.AndAlso);
+            if (node is ParameterExpression parameter)
+                if (map.TryGetValue(parameter, out ParameterExpression? replacement))
+                    return replacement;
+            return node;
+        };
+
+        var secondBody = ParameterRebinder.ReplaceParameters(map, second.Body);
+        return Expression.Lambda<T>(merge(first.Body, secondBody), first.Parameters);
+    }
+
+    class ParameterRebinder : ExpressionVisitor
+    {
+        private readonly Dictionary<ParameterExpression, ParameterExpression> map;
+
+        private ParameterRebinder(Dictionary<ParameterExpression, ParameterExpression> map)
+        {
+            this.map = map;
         }
 
-        /// <summary>
-        ///     Combines the first predicate with the second using the logical "or".
-        /// </summary>
-        public static Expression<Func<T, bool>> Or<T>(this Expression<Func<T, bool>> first, Expression<Func<T, bool>> second)
+        public static Expression ReplaceParameters(Dictionary<ParameterExpression, ParameterExpression> map, Expression exp)
         {
-            return first.Compose(second, Expression.OrElse);
+            return new ParameterRebinder(map).Visit(exp);
         }
 
-        /// <summary>
-        ///     Negates the predicate.
-        /// </summary>
-        public static Expression<Func<T, bool>> Not<T>(this Expression<Func<T, bool>> expression)
+        protected override Expression VisitParameter(ParameterExpression parametr)
         {
-            var negated = Expression.Not(expression.Body);
-            return Expression.Lambda<Func<T, bool>>(negated, expression.Parameters);
-        }
-
-        private static Expression<T> Compose<T>(this Expression<T> first, Expression<T> second, Func<Expression, Expression, Expression> merge)
-        {
-            var map = first.Parameters
-                .Select((f, i) => new { f, s = second.Parameters[i] })
-                .ToDictionary(p => p.s, p => p.f);
-
-            var tryReplaceParametr = (Expression node) => 
-            {
-                if (node is ParameterExpression parameter)
-                    if (map.TryGetValue(parameter, out ParameterExpression? replacement))
-                        return replacement;
-                return node;
-            };
-
-            var secondBody = ParameterRebinder.ReplaceParameters(map, second.Body);
-            return Expression.Lambda<T>(merge(first.Body, secondBody), first.Parameters);
-        }
-
-        class ParameterRebinder : ExpressionVisitor
-        {
-            private readonly Dictionary<ParameterExpression, ParameterExpression> map;
-
-            private ParameterRebinder(Dictionary<ParameterExpression, ParameterExpression> map)
-            {
-                this.map = map;
-            }
-
-            public static Expression ReplaceParameters(Dictionary<ParameterExpression, ParameterExpression> map, Expression exp)
-            {
-                return new ParameterRebinder(map).Visit(exp);
-            }
-
-            protected override Expression VisitParameter(ParameterExpression parametr)
-            {
-                if (map.TryGetValue(parametr, out ParameterExpression? replacement))
-                    parametr = replacement;
-                return parametr;
-            }
+            if (map.TryGetValue(parametr, out ParameterExpression? replacement))
+                parametr = replacement;
+            return parametr;
         }
     }
 }
diff --git a/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs b/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs
index 8c4333a6..eadb5093 100644
--- a/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs
+++ b/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs
@@ -6,180 +6,178 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AsbCloudInfrastructure
+namespace AsbCloudInfrastructure;
+
+public class ReportDataSourcePgCloud : IReportDataSource
 {
-    public class ReportDataSourcePgCloud : IReportDataSource
+    private const string DefaultTimezoneId = "Asia/Yekaterinburg";
+    private readonly IAsbCloudDbContext context;
+
+    private readonly int? idTelemetry;
+    private readonly WellInfoReport info;
+
+    private readonly Dictionary<int, TelemetryEvent> events;
+    private readonly Dictionary<int, TelemetryUser> users;
+    private readonly double timezoneOffset;
+    private readonly Dictionary<int, string> categories = new Dictionary<int, string>
     {
-        private const string DefaultTimezoneId = "Asia/Yekaterinburg";
-        private readonly IAsbCloudDbContext context;
+        {1, "Авария"},
+        {2, "Предупреждение"},
+        {3, "Информация"},
+    };
 
-        private readonly int? idTelemetry;
-        private readonly WellInfoReport info;
+    public ReportDataSourcePgCloud(IAsbCloudDbContext context, int idWell)
+    {
+        this.context = context;
 
-        private readonly Dictionary<int, TelemetryEvent> events;
-        private readonly Dictionary<int, TelemetryUser> users;
-        private readonly double timezoneOffset;
-        private readonly Dictionary<int, string> categories = new Dictionary<int, string>
+        var well = context.Wells
+            .Include(w => w.Cluster)
+            .ThenInclude(c => c.Deposit)
+            .Include(w => w.RelationCompaniesWells)
+            .ThenInclude(r => r.Company)
+            .Include(w => w.Telemetry)
+            .FirstOrDefault(w => w.Id == idWell)
+            ?? throw new ArgumentInvalidException(nameof(idWell), "idWell doesn`t exist");
+
+        idTelemetry = well?.IdTelemetry 
+            ?? throw new ArgumentInvalidException(nameof(idWell), $"Well {idWell} doesn't contain telemetry");
+
+        events = context.TelemetryEvents
+         .Where(e => e.IdTelemetry == idTelemetry)
+         .ToDictionary(e => e.IdEvent, e => e);
+
+        users = context.TelemetryUsers
+            .Where(u => u.IdTelemetry == idTelemetry)
+            .ToDictionary(u => u.IdUser, u => u);
+
+        timezoneOffset = well!.Telemetry?.Info?.TimeZoneOffsetTotalHours ?? well.Timezone?.Hours ?? 5.0;
+
+        info = new WellInfoReport
         {
-            {1, "Авария"},
-            {2, "Предупреждение"},
-            {3, "Информация"},
+            Deposit = well.Cluster?.Deposit?.Caption,
+            Cluster = well.Cluster?.Caption,
+            Well = well.Caption,
+            Customer = well.RelationCompaniesWells.FirstOrDefault(c => c.Company.IdCompanyType == 1)?.Company.Caption,
+            DrillingStartDate = well.Telemetry?.Info?.DrillingStartDate.ToRemoteDateTime(timezoneOffset) ?? default,
+            TimeZoneId = well.Telemetry?.Info?.TimeZoneId ?? well.Timezone?.TimezoneId ?? DefaultTimezoneId,
+            TimeZoneOffsetTotalHours = timezoneOffset,
         };
+    }
 
-        public ReportDataSourcePgCloud(IAsbCloudDbContext context, int idWell)
-        {
-            this.context = context;
-
-            var well = context.Wells
-                .Include(w => w.Cluster)
-                .ThenInclude(c => c.Deposit)
-                .Include(w => w.RelationCompaniesWells)
-                .ThenInclude(r => r.Company)
-                .Include(w => w.Telemetry)
-                .FirstOrDefault(w => w.Id == idWell)
-                ?? throw new ArgumentInvalidException(nameof(idWell), "idWell doesn`t exist");
-
-            idTelemetry = well?.IdTelemetry 
-                ?? throw new ArgumentInvalidException(nameof(idWell), $"Well {idWell} doesn't contain telemetry");
-
-            events = context.TelemetryEvents
-             .Where(e => e.IdTelemetry == idTelemetry)
-             .ToDictionary(e => e.IdEvent, e => e);
-
-            users = context.TelemetryUsers
-                .Where(u => u.IdTelemetry == idTelemetry)
-                .ToDictionary(u => u.IdUser, u => u);
-
-            timezoneOffset = well!.Telemetry?.Info?.TimeZoneOffsetTotalHours ?? well.Timezone?.Hours ?? 5.0;
-
-            info = new WellInfoReport
-            {
-                Deposit = well.Cluster?.Deposit?.Caption,
-                Cluster = well.Cluster?.Caption,
-                Well = well.Caption,
-                Customer = well.RelationCompaniesWells.FirstOrDefault(c => c.Company.IdCompanyType == 1)?.Company.Caption,
-                DrillingStartDate = well.Telemetry?.Info?.DrillingStartDate.ToRemoteDateTime(timezoneOffset) ?? default,
-                TimeZoneId = well.Telemetry?.Info?.TimeZoneId ?? well.Timezone?.TimezoneId ?? DefaultTimezoneId,
-                TimeZoneOffsetTotalHours = timezoneOffset,
-            };
-        }
-
-        public AnalyzeResult Analyze()
-        {
-            // TODO: Replace by linq methods.
-            var messagesStat = (from item in context.TelemetryMessages
-                                where item.IdTelemetry == idTelemetry
-                                group item.DateTime by item.IdTelemetry into g
-                                select new { min = g.Min(), max = g.Max(), count = g.Count() })
-                    .FirstOrDefault();
-
-            var dataStat = (from item in context.TelemetryDataSaub
+    public AnalyzeResult Analyze()
+    {
+        // TODO: Replace by linq methods.
+        var messagesStat = (from item in context.TelemetryMessages
                             where item.IdTelemetry == idTelemetry
                             group item.DateTime by item.IdTelemetry into g
                             select new { min = g.Min(), max = g.Max(), count = g.Count() })
-                    .FirstOrDefault();
+                .FirstOrDefault();
 
-            var result = new AnalyzeResult
-            {
-                MinDate = dataStat?.min.UtcDateTime ?? messagesStat?.min.UtcDateTime ?? default,
-                MaxDate = dataStat?.max.UtcDateTime ?? messagesStat?.max.UtcDateTime ?? default,
-                MessagesCount = messagesStat?.count ?? 0,
-            };
-
-            return result;
-        }
-
-        public IQueryable<DataSaubReport> GetDataSaubItems(DateTime begin, DateTime end)
-        {
-            var beginUtc = begin.ToUtcDateTimeOffset(timezoneOffset);
-            var endUtc = end.ToUtcDateTimeOffset(timezoneOffset);
-
-            var query = context.TelemetryDataSaub
-                .Where(d => d.IdTelemetry == idTelemetry
-                    && d.DateTime >= beginUtc
-                    && d.DateTime <= endUtc)
-                .OrderBy(d => d.DateTime)
-                .Select(d => new DataSaubReport
-                {
-                    Date = d.DateTime.DateTime.AddHours(timezoneOffset),
-                    Mode = d.Mode,
-                    WellDepth = d.WellDepth,
-                    BitDepth = d.BitDepth,
-                    BlockPosition = d.BlockPosition,
-                    BlockSpeed = d.BlockSpeed,
-                    BlockSpeedSp = d.BlockSpeedSp,
-                    BlockSpeedSpDevelop = d.BlockSpeedSpDevelop,
-                    Pressure = d.Pressure,
-                    PressureSp = d.PressureSp,
-                    AxialLoad = d.AxialLoad,
-                    AxialLoadSp = d.AxialLoadSp,
-                    AxialLoadLimitMax = d.AxialLoadLimitMax,
-                    HookWeight = d.HookWeight,
-                    RotorTorque = d.RotorTorque,
-                    RotorTorqueSp = d.RotorTorqueSp,
-                    RotorSpeed = d.RotorSpeed,
-                    Flow = d.Flow,
-                    PressureSpDevelop = d.PressureSpDevelop,
-                    IdFeedRegulator = d.IdFeedRegulator,
-                    Pump0Flow = d.Pump0Flow,
-                    Pump1Flow = d.Pump1Flow,
-                    Pump2Flow = d.Pump2Flow,
-
-                });
-            return query;
-        }
-
-        public IQueryable<DataSpinReport> GetDataSpinItems(DateTime begin, DateTime end)
-        {
-            var beginUtc = begin.ToUtcDateTimeOffset(timezoneOffset);
-            var endUtc = end.ToUtcDateTimeOffset(timezoneOffset);
-
-            var query = context.TelemetryDataSpin
-                .Where(d => d.IdTelemetry == idTelemetry
-                    && d.DateTime >= beginUtc
-                    && d.DateTime <= endUtc)
-                .OrderBy(d => d.DateTime)
-                .Select(d => new DataSpinReport
-                {
-                    Date = d.DateTime.DateTime.AddHours(timezoneOffset),
-                    Mode = d.Mode,
-                    IsWorkingSpinMaster = (d.State != 0 && d.State != 5 && d.State != 6 && d.State != 7),
-                    IsWorkingTorqueMaster = (d.State == 7 && (d.Mode & 2) > 0),
-                });
-            return query;
-        }
-
-        public IQueryable<MessageReport> GetMessages(DateTime begin, DateTime end)
-        {
-            var beginUtc = begin.ToUtcDateTimeOffset(timezoneOffset);
-            var endUtc = end.ToUtcDateTimeOffset(timezoneOffset);
-
-            var query = from item in context.TelemetryMessages
+        var dataStat = (from item in context.TelemetryDataSaub
                         where item.IdTelemetry == idTelemetry
-                            && item.DateTime >= beginUtc
-                            && item.DateTime <= endUtc
-                        orderby item.DateTime
-                        select new MessageReport
-                        {
-                            Id = item.Id,
-                            Date = item.DateTime.DateTime,
-                            Category = events.GetValueOrDefault(item.IdEvent) == null
-                                 ? $""
-                                 : categories[events[item.IdEvent].IdCategory],
-                            User = item.IdTelemetryUser == null
-                                 ? ""
-                                 : users.GetValueOrDefault((int)item.IdTelemetryUser) == null
-                                     ? $"User id{item.IdTelemetryUser}"
-                                     : users[(int)item.IdTelemetryUser].MakeDisplayName(),
-                            Text = events.GetValueOrDefault(item.IdEvent) == null
-                                ? $"Событие {item.IdEvent} {item.Arg0} {item.Arg1} {item.Arg2} {item.Arg3}"
-                                : events[item.IdEvent].MakeMessageText(item)
-                        };
-            return query;
-        }
+                        group item.DateTime by item.IdTelemetry into g
+                        select new { min = g.Min(), max = g.Max(), count = g.Count() })
+                .FirstOrDefault();
 
-        public WellInfoReport GetWellInfo()
-        => info;
+        var result = new AnalyzeResult
+        {
+            MinDate = dataStat?.min.UtcDateTime ?? messagesStat?.min.UtcDateTime ?? default,
+            MaxDate = dataStat?.max.UtcDateTime ?? messagesStat?.max.UtcDateTime ?? default,
+            MessagesCount = messagesStat?.count ?? 0,
+        };
+
+        return result;
     }
 
+    public IQueryable<DataSaubReport> GetDataSaubItems(DateTime begin, DateTime end)
+    {
+        var beginUtc = begin.ToUtcDateTimeOffset(timezoneOffset);
+        var endUtc = end.ToUtcDateTimeOffset(timezoneOffset);
+
+        var query = context.TelemetryDataSaub
+            .Where(d => d.IdTelemetry == idTelemetry
+                && d.DateTime >= beginUtc
+                && d.DateTime <= endUtc)
+            .OrderBy(d => d.DateTime)
+            .Select(d => new DataSaubReport
+            {
+                Date = d.DateTime.DateTime.AddHours(timezoneOffset),
+                Mode = d.Mode,
+                WellDepth = d.WellDepth,
+                BitDepth = d.BitDepth,
+                BlockPosition = d.BlockPosition,
+                BlockSpeed = d.BlockSpeed,
+                BlockSpeedSp = d.BlockSpeedSp,
+                BlockSpeedSpDevelop = d.BlockSpeedSpDevelop,
+                Pressure = d.Pressure,
+                PressureSp = d.PressureSp,
+                AxialLoad = d.AxialLoad,
+                AxialLoadSp = d.AxialLoadSp,
+                AxialLoadLimitMax = d.AxialLoadLimitMax,
+                HookWeight = d.HookWeight,
+                RotorTorque = d.RotorTorque,
+                RotorTorqueSp = d.RotorTorqueSp,
+                RotorSpeed = d.RotorSpeed,
+                Flow = d.Flow,
+                PressureSpDevelop = d.PressureSpDevelop,
+                IdFeedRegulator = d.IdFeedRegulator,
+                Pump0Flow = d.Pump0Flow,
+                Pump1Flow = d.Pump1Flow,
+                Pump2Flow = d.Pump2Flow,
+
+            });
+        return query;
+    }
+
+    public IQueryable<DataSpinReport> GetDataSpinItems(DateTime begin, DateTime end)
+    {
+        var beginUtc = begin.ToUtcDateTimeOffset(timezoneOffset);
+        var endUtc = end.ToUtcDateTimeOffset(timezoneOffset);
+
+        var query = context.TelemetryDataSpin
+            .Where(d => d.IdTelemetry == idTelemetry
+                && d.DateTime >= beginUtc
+                && d.DateTime <= endUtc)
+            .OrderBy(d => d.DateTime)
+            .Select(d => new DataSpinReport
+            {
+                Date = d.DateTime.DateTime.AddHours(timezoneOffset),
+                Mode = d.Mode,
+                IsWorkingSpinMaster = (d.State != 0 && d.State != 5 && d.State != 6 && d.State != 7),
+                IsWorkingTorqueMaster = (d.State == 7 && (d.Mode & 2) > 0),
+            });
+        return query;
+    }
+
+    public IQueryable<MessageReport> GetMessages(DateTime begin, DateTime end)
+    {
+        var beginUtc = begin.ToUtcDateTimeOffset(timezoneOffset);
+        var endUtc = end.ToUtcDateTimeOffset(timezoneOffset);
+
+        var query = from item in context.TelemetryMessages
+                    where item.IdTelemetry == idTelemetry
+                        && item.DateTime >= beginUtc
+                        && item.DateTime <= endUtc
+                    orderby item.DateTime
+                    select new MessageReport
+                    {
+                        Id = item.Id,
+                        Date = item.DateTime.DateTime,
+                        Category = events.GetValueOrDefault(item.IdEvent) == null
+                             ? $""
+                             : categories[events[item.IdEvent].IdCategory],
+                        User = item.IdTelemetryUser == null
+                             ? ""
+                             : users.GetValueOrDefault((int)item.IdTelemetryUser) == null
+                                 ? $"User id{item.IdTelemetryUser}"
+                                 : users[(int)item.IdTelemetryUser].MakeDisplayName(),
+                        Text = events.GetValueOrDefault(item.IdEvent) == null
+                            ? $"Событие {item.IdEvent} {item.Arg0} {item.Arg1} {item.Arg2} {item.Arg3}"
+                            : events[item.IdEvent].MakeMessageText(item)
+                    };
+        return query;
+    }
+
+    public WellInfoReport GetWellInfo()
+    => info;
 }
diff --git a/AsbCloudInfrastructure/Repository/CacheBase.cs b/AsbCloudInfrastructure/Repository/CacheBase.cs
index 46670658..61948bc2 100644
--- a/AsbCloudInfrastructure/Repository/CacheBase.cs
+++ b/AsbCloudInfrastructure/Repository/CacheBase.cs
@@ -7,58 +7,56 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+public class CacheBase<TEntity> : QueryContainer<TEntity>
+    where TEntity : class, AsbCloudDb.Model.IId
 {
+    protected readonly IMemoryCache memoryCache;
+    protected string CacheTag = typeof(TEntity).Name;
+    protected TimeSpan CacheObsolescence = TimeSpan.FromMinutes(5);
 
-    public class CacheBase<TEntity> : QueryContainer<TEntity>
-        where TEntity : class, AsbCloudDb.Model.IId
+    public CacheBase(IAsbCloudDbContext context, IMemoryCache memoryCache) 
+        : base(context)
     {
-        protected readonly IMemoryCache memoryCache;
-        protected string CacheTag = typeof(TEntity).Name;
-        protected TimeSpan CacheObsolescence = TimeSpan.FromMinutes(5);
-
-        public CacheBase(IAsbCloudDbContext context, IMemoryCache memoryCache) 
-            : base(context)
-        {
-            this.memoryCache = memoryCache;
-        }
-
-        public CacheBase(IAsbCloudDbContext context, IMemoryCache memoryCache, Func<DbSet<TEntity>, IQueryable<TEntity>> makeQuery) 
-            : base(context, makeQuery)
-        {
-            this.memoryCache = memoryCache;
-        }
-
-        protected virtual void DropCache()
-            => memoryCache.Remove(CacheTag);
-
-        protected virtual IEnumerable<TEntity> GetCache()
-        {
-            var cache = memoryCache.GetOrCreate(CacheTag, cacheEntry =>
-            {
-                cacheEntry.AbsoluteExpirationRelativeToNow = CacheObsolescence;
-                cacheEntry.SlidingExpiration = CacheObsolescence;
-
-                var entities = this.GetQuery().ToArray();
-                cacheEntry.Value = entities;
-                return entities;
-            });
-            return cache!;
-        }
-
-        protected virtual async Task<IEnumerable<TEntity>> GetCacheAsync(CancellationToken token)
-        {
-            var cache = await memoryCache.GetOrCreateAsync(CacheTag, async (cacheEntry) =>
-            {
-                cacheEntry.AbsoluteExpirationRelativeToNow = CacheObsolescence;
-                cacheEntry.SlidingExpiration = CacheObsolescence;
-
-                var entities = await GetQuery().AsNoTracking().ToArrayAsync(token);
-                cacheEntry.Value = entities;
-                return entities.AsEnumerable();
-            });
-            return cache!;
-        }
+        this.memoryCache = memoryCache;
     }
 
+    public CacheBase(IAsbCloudDbContext context, IMemoryCache memoryCache, Func<DbSet<TEntity>, IQueryable<TEntity>> makeQuery) 
+        : base(context, makeQuery)
+    {
+        this.memoryCache = memoryCache;
+    }
+
+    protected virtual void DropCache()
+        => memoryCache.Remove(CacheTag);
+
+    protected virtual IEnumerable<TEntity> GetCache()
+    {
+        var cache = memoryCache.GetOrCreate(CacheTag, cacheEntry =>
+        {
+            cacheEntry.AbsoluteExpirationRelativeToNow = CacheObsolescence;
+            cacheEntry.SlidingExpiration = CacheObsolescence;
+
+            var entities = this.GetQuery().ToArray();
+            cacheEntry.Value = entities;
+            return entities;
+        });
+        return cache!;
+    }
+
+    protected virtual async Task<IEnumerable<TEntity>> GetCacheAsync(CancellationToken token)
+    {
+        var cache = await memoryCache.GetOrCreateAsync(CacheTag, async (cacheEntry) =>
+        {
+            cacheEntry.AbsoluteExpirationRelativeToNow = CacheObsolescence;
+            cacheEntry.SlidingExpiration = CacheObsolescence;
+
+            var entities = await GetQuery().AsNoTracking().ToArrayAsync(token);
+            cacheEntry.Value = entities;
+            return entities.AsEnumerable();
+        });
+        return cache!;
+    }
 }
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Repository/CrudCacheRepositoryBase.cs b/AsbCloudInfrastructure/Repository/CrudCacheRepositoryBase.cs
index bfa1c410..698ac306 100644
--- a/AsbCloudInfrastructure/Repository/CrudCacheRepositoryBase.cs
+++ b/AsbCloudInfrastructure/Repository/CrudCacheRepositoryBase.cs
@@ -9,106 +9,104 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+/// <summary>
+/// CRUD сервис с кешем в оперативке
+/// </summary>
+/// <typeparam name="TDto"></typeparam>
+/// <typeparam name="TEntity"></typeparam>
+public class CrudCacheRepositoryBase<TDto, TEntity> : CacheBase<TEntity>, ICrudRepository<TDto>
+    where TDto : AsbCloudApp.Data.IId
+    where TEntity : class, IId
 {
+    protected int KeySelector(TEntity entity) => entity.Id;
+    protected readonly ICrudRepository<TDto> crudServiceBase;
 
-    /// <summary>
-    /// CRUD сервис с кешем в оперативке
-    /// </summary>
-    /// <typeparam name="TDto"></typeparam>
-    /// <typeparam name="TEntity"></typeparam>
-    public class CrudCacheRepositoryBase<TDto, TEntity> : CacheBase<TEntity>, ICrudRepository<TDto>
-        where TDto : AsbCloudApp.Data.IId
-        where TEntity : class, IId
+    public CrudCacheRepositoryBase(IAsbCloudDbContext dbContext, IMemoryCache memoryCache)
+    : base(dbContext, memoryCache)
     {
-        protected int KeySelector(TEntity entity) => entity.Id;
-        protected readonly ICrudRepository<TDto> crudServiceBase;
-
-        public CrudCacheRepositoryBase(IAsbCloudDbContext dbContext, IMemoryCache memoryCache)
-        : base(dbContext, memoryCache)
-        {
-            crudServiceBase = new CrudRepositoryBase<TDto, TEntity>(dbContext);
-        }
-
-        public CrudCacheRepositoryBase(IAsbCloudDbContext dbContext, IMemoryCache memoryCache, Func<DbSet<TEntity>, IQueryable<TEntity>> makeQuery)
-        : base(dbContext, memoryCache, makeQuery) 
-        {
-            crudServiceBase = new CrudRepositoryBase<TDto, TEntity>(dbContext, makeQuery);
-        }
-
-        /// <inheritdoc/>
-        public virtual async Task<int> InsertAsync(TDto newItem, CancellationToken token)
-        {
-            var result = await crudServiceBase.InsertAsync(newItem, token);
-            if (result > 0)
-                DropCache();
-            return result;
-        }
-
-        /// <inheritdoc/>
-        public virtual async Task<int> InsertRangeAsync(IEnumerable<TDto> dtos, CancellationToken token)
-        {
-            var result = await crudServiceBase.InsertRangeAsync(dtos, token);
-            if (result > 0)
-                DropCache();
-            return result;
-        }
-
-        /// <inheritdoc/>
-        public virtual async Task<int> UpdateAsync(TDto dto, CancellationToken token)
-        {
-            var result = await crudServiceBase.UpdateAsync(dto, token);
-            if (result > 0)
-                DropCache();
-            return result;
-        }
-
-        /// <inheritdoc/>
-        public async Task<IEnumerable<TDto>> GetAllAsync(CancellationToken token)
-        {
-            var cache = await GetCacheAsync(token);
-            var dtos = cache.Select(Convert);
-            return dtos;
-        }
-
-        /// <summary>
-        /// Синхронно получить запись по ИД
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public TDto? GetOrDefault(int id)
-        {
-            var cache = GetCache();
-            var cacheItem = cache.FirstOrDefault(d => d.Id == id);
-            if (cacheItem is null)
-                return default;
-            var dto = Convert(cacheItem);
-            return dto;
-        }
-
-        /// <inheritdoc/>
-        public async Task<TDto?> GetOrDefaultAsync(int id, CancellationToken token)
-        {
-            var cache = await GetCacheAsync(token);
-            var cacheItem = cache.FirstOrDefault(d => d.Id == id);
-            if (cacheItem is null)
-                return default;
-            var dto = Convert(cacheItem);
-            return dto;
-        }
-
-        /// <inheritdoc/>
-        public virtual async Task<int> DeleteAsync(int id, CancellationToken token)
-        {
-            var result = await crudServiceBase.DeleteAsync(id, token);
-            if (result > 0)
-                DropCache();
-            return result;
-        }
-
-        protected virtual TDto Convert(TEntity src) => src.Adapt<TDto>();
-
-        protected virtual TEntity Convert(TDto src) => src.Adapt<TEntity>();
+        crudServiceBase = new CrudRepositoryBase<TDto, TEntity>(dbContext);
     }
 
+    public CrudCacheRepositoryBase(IAsbCloudDbContext dbContext, IMemoryCache memoryCache, Func<DbSet<TEntity>, IQueryable<TEntity>> makeQuery)
+    : base(dbContext, memoryCache, makeQuery) 
+    {
+        crudServiceBase = new CrudRepositoryBase<TDto, TEntity>(dbContext, makeQuery);
+    }
+
+    /// <inheritdoc/>
+    public virtual async Task<int> InsertAsync(TDto newItem, CancellationToken token)
+    {
+        var result = await crudServiceBase.InsertAsync(newItem, token);
+        if (result > 0)
+            DropCache();
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public virtual async Task<int> InsertRangeAsync(IEnumerable<TDto> dtos, CancellationToken token)
+    {
+        var result = await crudServiceBase.InsertRangeAsync(dtos, token);
+        if (result > 0)
+            DropCache();
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public virtual async Task<int> UpdateAsync(TDto dto, CancellationToken token)
+    {
+        var result = await crudServiceBase.UpdateAsync(dto, token);
+        if (result > 0)
+            DropCache();
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public async Task<IEnumerable<TDto>> GetAllAsync(CancellationToken token)
+    {
+        var cache = await GetCacheAsync(token);
+        var dtos = cache.Select(Convert);
+        return dtos;
+    }
+
+    /// <summary>
+    /// Синхронно получить запись по ИД
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public TDto? GetOrDefault(int id)
+    {
+        var cache = GetCache();
+        var cacheItem = cache.FirstOrDefault(d => d.Id == id);
+        if (cacheItem is null)
+            return default;
+        var dto = Convert(cacheItem);
+        return dto;
+    }
+
+    /// <inheritdoc/>
+    public async Task<TDto?> GetOrDefaultAsync(int id, CancellationToken token)
+    {
+        var cache = await GetCacheAsync(token);
+        var cacheItem = cache.FirstOrDefault(d => d.Id == id);
+        if (cacheItem is null)
+            return default;
+        var dto = Convert(cacheItem);
+        return dto;
+    }
+
+    /// <inheritdoc/>
+    public virtual async Task<int> DeleteAsync(int id, CancellationToken token)
+    {
+        var result = await crudServiceBase.DeleteAsync(id, token);
+        if (result > 0)
+            DropCache();
+        return result;
+    }
+
+    protected virtual TDto Convert(TEntity src) => src.Adapt<TDto>();
+
+    protected virtual TEntity Convert(TDto src) => src.Adapt<TEntity>();
 }
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Repository/CrudRepositoryBase.cs b/AsbCloudInfrastructure/Repository/CrudRepositoryBase.cs
index 48fe4c8b..e00e830f 100644
--- a/AsbCloudInfrastructure/Repository/CrudRepositoryBase.cs
+++ b/AsbCloudInfrastructure/Repository/CrudRepositoryBase.cs
@@ -10,180 +10,178 @@ using System.Threading.Tasks;
 using AsbCloudApp.Exceptions;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+/// <summary>
+/// CRUD сервис для работы с БД
+/// </summary>
+/// <typeparam name="TDto"></typeparam>
+/// <typeparam name="TEntity"></typeparam>
+public class CrudRepositoryBase<TDto, TEntity> : QueryContainer<TEntity>, ICrudRepository<TDto>
+    where TDto : AsbCloudApp.Data.IId
+    where TEntity : class, IId
 {
+    public CrudRepositoryBase(IAsbCloudDbContext context)
+        : base(context)
+    { }
 
-    /// <summary>
-    /// CRUD сервис для работы с БД
-    /// </summary>
-    /// <typeparam name="TDto"></typeparam>
-    /// <typeparam name="TEntity"></typeparam>
-    public class CrudRepositoryBase<TDto, TEntity> : QueryContainer<TEntity>, ICrudRepository<TDto>
-        where TDto : AsbCloudApp.Data.IId
-        where TEntity : class, IId
+    public CrudRepositoryBase(IAsbCloudDbContext context, Func<DbSet<TEntity>, IQueryable<TEntity>> makeQuery)
+        : base(context, makeQuery)
+    { }
+
+    /// <inheritdoc/>
+    public virtual async Task<IEnumerable<TDto>> GetAllAsync(CancellationToken token)
     {
-        public CrudRepositoryBase(IAsbCloudDbContext context)
-            : base(context)
-        { }
-
-        public CrudRepositoryBase(IAsbCloudDbContext context, Func<DbSet<TEntity>, IQueryable<TEntity>> makeQuery)
-            : base(context, makeQuery)
-        { }
-
-        /// <inheritdoc/>
-        public virtual async Task<IEnumerable<TDto>> GetAllAsync(CancellationToken token)
-        {
-            var entities = await GetQuery()
-                .AsNoTracking()
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-            var dtos = entities.Select(Convert).ToList();
-            return dtos;
-        }
-
-        /// <inheritdoc/>
-        public virtual async Task<TDto?> GetOrDefaultAsync(int id, CancellationToken token)
-        {
-            var entity = await GetQuery()
-                .AsNoTracking()
-                .FirstOrDefaultAsync(e => e.Id == id, token)
-                .ConfigureAwait(false);
-            if (entity == default)
-                return default;
-            var dto = Convert(entity);
-            return dto;
-        }       
-
-        /// <inheritdoc/>
-        public virtual TDto? GetOrDefault(int id)
-        {
-            var entity = GetQuery()
-                .AsNoTracking()
-                .FirstOrDefault(e => e.Id == id);
-            if (entity == default)
-                return default;
-            var dto = Convert(entity);
-            return dto;
-        }
-
-        /// <inheritdoc/>
-        public virtual async Task<int> InsertAsync(TDto item, CancellationToken token)
-        {
-            var entity = Convert(item);
-            entity.Id = 0;
-            var entry = dbSet.Add(entity);
-            await dbContext.SaveChangesAsync(token);
-            entry.State = EntityState.Detached;
-            return entity.Id;
-        }
-
-        /// <inheritdoc/>
-        public virtual async Task<int> InsertRangeAsync(IEnumerable<TDto> items, CancellationToken token)
-        {
-            if (!items.Any())
-                return 0;
-            var entities = items.Select(i =>
-            {
-                var entity = Convert(i);
-                entity.Id = 0;
-                return entity;
-            });
-            var entries = new List<EntityEntry>(items.Count());
-            foreach (var entity in entities)
-            {
-                var entry = dbSet.Add(entity);
-                entries.Add(entry);
-            }
-            var affected = await dbContext.SaveChangesAsync(token);
-            entries.ForEach(e => e.State = EntityState.Detached);
-            return affected;
-        }
-
-        /// <inheritdoc/>
-        public virtual async Task<int> UpdateAsync(TDto item, CancellationToken token)
-        {
-            var existingEntity = await dbSet
-                .AsNoTracking()
-                .FirstOrDefaultAsync(e => e.Id == item.Id, token)
-                .ConfigureAwait(false);
-
-            if (existingEntity is null)
-                return ICrudRepository<TDto>.ErrorIdNotFound;
-
-            var entity = Convert(item);
-            var entry = dbSet.Update(entity);
-            await dbContext.SaveChangesAsync(token);
-            entry.State = EntityState.Detached;
-            return entry.Entity.Id;
-        }
-        
-        public virtual async Task<int> UpdateRangeAsync(IEnumerable<TDto> dtos, CancellationToken token)
-        {
-            if (!dtos.Any())
-                return 0;
-            
-            var ids = dtos
-                .Select(o => o.Id)
-                .Distinct()
-                .ToArray();
-            
-            if (ids.Any(id => id == default))
-                throw new ArgumentInvalidException(nameof(dtos), "Все записи должны иметь Id");
-            
-            if (ids.Length != dtos.Count())
-                throw new ArgumentInvalidException(nameof(dtos), "Все записи должны иметь уникальные Id");
-            
-            var existingEntitiesCount = await dbContext.Set<TEntity>()
-                .Where(o => ids.Contains(o.Id))
-                .CountAsync(token);
-            
-            if (ids.Length != existingEntitiesCount)
-                throw new ArgumentInvalidException(nameof(dtos), "Все записи должны существовать в БД");
-
-            var entities = dtos.Select(Convert);
-            
-            var entries = entities.Select(entity => dbContext.Set<TEntity>().Update(entity)).ToList();
-
-            var affected = await dbContext.SaveChangesAsync(token);
-            
-            entries.ForEach(entry => entry.State = EntityState.Detached);
-
-            return affected;
-        }
-
-        /// <inheritdoc/>
-        public virtual Task<int> DeleteAsync(int id, CancellationToken token)
-        {
-            var entity = dbSet
-                .AsNoTracking()
-                .FirstOrDefault(e => e.Id == id);
-            if (entity == default)
-                return Task.FromResult(ICrudRepository<TDto>.ErrorIdNotFound);
-            dbSet.Remove(entity);
-            var affected = dbContext.SaveChangesAsync(token);
-            return affected;
-        }
-
-        public virtual async Task<int> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token)
-        {
-            if (!ids.Any())
-                return 0;
-            
-            var countExistingEntities = await dbSet
-                .Where(d => ids.Contains(d.Id))
-                .CountAsync(token);
-
-            if (ids.Count() > countExistingEntities)
-                return ICrudRepository<TDto>.ErrorIdNotFound;
-            
-            var entities = dbContext.Set<TEntity>().Where(e => ids.Contains(e.Id));
-            dbContext.Set<TEntity>().RemoveRange(entities);
-            return await dbContext.SaveChangesAsync(token);
-        }
-
-        protected virtual TDto Convert(TEntity src) => src.Adapt<TDto>();
-
-        protected virtual TEntity Convert(TDto src) => src.Adapt<TEntity>();
+        var entities = await GetQuery()
+            .AsNoTracking()
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+        var dtos = entities.Select(Convert).ToList();
+        return dtos;
     }
 
+    /// <inheritdoc/>
+    public virtual async Task<TDto?> GetOrDefaultAsync(int id, CancellationToken token)
+    {
+        var entity = await GetQuery()
+            .AsNoTracking()
+            .FirstOrDefaultAsync(e => e.Id == id, token)
+            .ConfigureAwait(false);
+        if (entity == default)
+            return default;
+        var dto = Convert(entity);
+        return dto;
+    }       
+
+    /// <inheritdoc/>
+    public virtual TDto? GetOrDefault(int id)
+    {
+        var entity = GetQuery()
+            .AsNoTracking()
+            .FirstOrDefault(e => e.Id == id);
+        if (entity == default)
+            return default;
+        var dto = Convert(entity);
+        return dto;
+    }
+
+    /// <inheritdoc/>
+    public virtual async Task<int> InsertAsync(TDto item, CancellationToken token)
+    {
+        var entity = Convert(item);
+        entity.Id = 0;
+        var entry = dbSet.Add(entity);
+        await dbContext.SaveChangesAsync(token);
+        entry.State = EntityState.Detached;
+        return entity.Id;
+    }
+
+    /// <inheritdoc/>
+    public virtual async Task<int> InsertRangeAsync(IEnumerable<TDto> items, CancellationToken token)
+    {
+        if (!items.Any())
+            return 0;
+        var entities = items.Select(i =>
+        {
+            var entity = Convert(i);
+            entity.Id = 0;
+            return entity;
+        });
+        var entries = new List<EntityEntry>(items.Count());
+        foreach (var entity in entities)
+        {
+            var entry = dbSet.Add(entity);
+            entries.Add(entry);
+        }
+        var affected = await dbContext.SaveChangesAsync(token);
+        entries.ForEach(e => e.State = EntityState.Detached);
+        return affected;
+    }
+
+    /// <inheritdoc/>
+    public virtual async Task<int> UpdateAsync(TDto item, CancellationToken token)
+    {
+        var existingEntity = await dbSet
+            .AsNoTracking()
+            .FirstOrDefaultAsync(e => e.Id == item.Id, token)
+            .ConfigureAwait(false);
+
+        if (existingEntity is null)
+            return ICrudRepository<TDto>.ErrorIdNotFound;
+
+        var entity = Convert(item);
+        var entry = dbSet.Update(entity);
+        await dbContext.SaveChangesAsync(token);
+        entry.State = EntityState.Detached;
+        return entry.Entity.Id;
+    }
+    
+    public virtual async Task<int> UpdateRangeAsync(IEnumerable<TDto> dtos, CancellationToken token)
+    {
+        if (!dtos.Any())
+            return 0;
+        
+        var ids = dtos
+            .Select(o => o.Id)
+            .Distinct()
+            .ToArray();
+        
+        if (ids.Any(id => id == default))
+            throw new ArgumentInvalidException(nameof(dtos), "Все записи должны иметь Id");
+        
+        if (ids.Length != dtos.Count())
+            throw new ArgumentInvalidException(nameof(dtos), "Все записи должны иметь уникальные Id");
+        
+        var existingEntitiesCount = await dbContext.Set<TEntity>()
+            .Where(o => ids.Contains(o.Id))
+            .CountAsync(token);
+        
+        if (ids.Length != existingEntitiesCount)
+            throw new ArgumentInvalidException(nameof(dtos), "Все записи должны существовать в БД");
+
+        var entities = dtos.Select(Convert);
+        
+        var entries = entities.Select(entity => dbContext.Set<TEntity>().Update(entity)).ToList();
+
+        var affected = await dbContext.SaveChangesAsync(token);
+        
+        entries.ForEach(entry => entry.State = EntityState.Detached);
+
+        return affected;
+    }
+
+    /// <inheritdoc/>
+    public virtual Task<int> DeleteAsync(int id, CancellationToken token)
+    {
+        var entity = dbSet
+            .AsNoTracking()
+            .FirstOrDefault(e => e.Id == id);
+        if (entity == default)
+            return Task.FromResult(ICrudRepository<TDto>.ErrorIdNotFound);
+        dbSet.Remove(entity);
+        var affected = dbContext.SaveChangesAsync(token);
+        return affected;
+    }
+
+    public virtual async Task<int> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token)
+    {
+        if (!ids.Any())
+            return 0;
+        
+        var countExistingEntities = await dbSet
+            .Where(d => ids.Contains(d.Id))
+            .CountAsync(token);
+
+        if (ids.Count() > countExistingEntities)
+            return ICrudRepository<TDto>.ErrorIdNotFound;
+        
+        var entities = dbContext.Set<TEntity>().Where(e => ids.Contains(e.Id));
+        dbContext.Set<TEntity>().RemoveRange(entities);
+        return await dbContext.SaveChangesAsync(token);
+    }
+
+    protected virtual TDto Convert(TEntity src) => src.Adapt<TDto>();
+
+    protected virtual TEntity Convert(TDto src) => src.Adapt<TEntity>();
 }
diff --git a/AsbCloudInfrastructure/Repository/CrudWellRelatedCacheRepositoryBase.cs b/AsbCloudInfrastructure/Repository/CrudWellRelatedCacheRepositoryBase.cs
index 601ab274..73f3ead3 100644
--- a/AsbCloudInfrastructure/Repository/CrudWellRelatedCacheRepositoryBase.cs
+++ b/AsbCloudInfrastructure/Repository/CrudWellRelatedCacheRepositoryBase.cs
@@ -8,43 +8,41 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+public class CrudWellRelatedCacheRepositoryBase<TDto, TEntity> : CrudCacheRepositoryBase<TDto, TEntity>, IRepositoryWellRelated<TDto>
+    where TDto : AsbCloudApp.Data.IId, AsbCloudApp.Data.IWellRelated
+    where TEntity : class, IId, IWellRelated
 {
+    public CrudWellRelatedCacheRepositoryBase(IAsbCloudDbContext context, IMemoryCache memoryCache)
+    : base(context, memoryCache) { }
 
-    public class CrudWellRelatedCacheRepositoryBase<TDto, TEntity> : CrudCacheRepositoryBase<TDto, TEntity>, IRepositoryWellRelated<TDto>
-        where TDto : AsbCloudApp.Data.IId, AsbCloudApp.Data.IWellRelated
-        where TEntity : class, IId, IWellRelated
+    public CrudWellRelatedCacheRepositoryBase(IAsbCloudDbContext context, IMemoryCache memoryCache, Func<DbSet<TEntity>, IQueryable<TEntity>> makeQuery)
+        : base(context, memoryCache, makeQuery) { }
+
+    public async Task<IEnumerable<TDto>> GetByIdWellAsync(int idWell, CancellationToken token)
     {
-        public CrudWellRelatedCacheRepositoryBase(IAsbCloudDbContext context, IMemoryCache memoryCache)
-        : base(context, memoryCache) { }
+        var cache = await GetCacheAsync(token);
 
-        public CrudWellRelatedCacheRepositoryBase(IAsbCloudDbContext context, IMemoryCache memoryCache, Func<DbSet<TEntity>, IQueryable<TEntity>> makeQuery)
-            : base(context, memoryCache, makeQuery) { }
+        var dtos = cache
+            .Where(e => e.IdWell == idWell)
+            .Select(Convert);
 
-        public async Task<IEnumerable<TDto>> GetByIdWellAsync(int idWell, CancellationToken token)
-        {
-            var cache = await GetCacheAsync(token);
-
-            var dtos = cache
-                .Where(e => e.IdWell == idWell)
-                .Select(Convert);
-
-            return dtos;
-        }
-
-        public async Task<IEnumerable<TDto>> GetByIdWellAsync(IEnumerable<int> idsWells, CancellationToken token)
-        {
-            if (!idsWells.Any())
-                return Enumerable.Empty<TDto>();
-
-            var cache = await GetCacheAsync(token);
-
-            var dtos = cache
-               .Where(e => idsWells.Contains(e.IdWell))
-               .Select(Convert);
-
-            return dtos;
-        }
+        return dtos;
     }
 
+    public async Task<IEnumerable<TDto>> GetByIdWellAsync(IEnumerable<int> idsWells, CancellationToken token)
+    {
+        if (!idsWells.Any())
+            return Enumerable.Empty<TDto>();
+
+        var cache = await GetCacheAsync(token);
+
+        var dtos = cache
+           .Where(e => idsWells.Contains(e.IdWell))
+           .Select(Convert);
+
+        return dtos;
+    }
 }
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Repository/CrudWellRelatedRepositoryBase.cs b/AsbCloudInfrastructure/Repository/CrudWellRelatedRepositoryBase.cs
index bafb2944..4cdb237b 100644
--- a/AsbCloudInfrastructure/Repository/CrudWellRelatedRepositoryBase.cs
+++ b/AsbCloudInfrastructure/Repository/CrudWellRelatedRepositoryBase.cs
@@ -7,40 +7,39 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+public class CrudWellRelatedRepositoryBase<TDto, TEntity> : CrudRepositoryBase<TDto, TEntity>, IRepositoryWellRelated<TDto>
+    where TDto : AsbCloudApp.Data.IId, AsbCloudApp.Data.IWellRelated
+    where TEntity : class, IId, IWellRelated
 {
+    public CrudWellRelatedRepositoryBase(IAsbCloudDbContext context)
+        : base(context) { }
 
-    public class CrudWellRelatedRepositoryBase<TDto, TEntity> : CrudRepositoryBase<TDto, TEntity>, IRepositoryWellRelated<TDto>
-        where TDto : AsbCloudApp.Data.IId, AsbCloudApp.Data.IWellRelated
-        where TEntity : class, IId, IWellRelated
+    public CrudWellRelatedRepositoryBase(IAsbCloudDbContext context, Func<DbSet<TEntity>, IQueryable<TEntity>> makeQuery)
+        : base(context, makeQuery) { }
+
+    public async Task<IEnumerable<TDto>> GetByIdWellAsync(int idWell, CancellationToken token)
     {
-        public CrudWellRelatedRepositoryBase(IAsbCloudDbContext context)
-            : base(context) { }
+        var entities = await GetQuery()
+           .Where(e => e.IdWell == idWell)
+           .AsNoTracking()
+           .ToArrayAsync(token);
+        var dtos = entities.Select(Convert).ToList();
+        return dtos;
+    }
 
-        public CrudWellRelatedRepositoryBase(IAsbCloudDbContext context, Func<DbSet<TEntity>, IQueryable<TEntity>> makeQuery)
-            : base(context, makeQuery) { }
+    public async Task<IEnumerable<TDto>> GetByIdWellAsync(IEnumerable<int> idsWells, CancellationToken token)
+    {
+        if (!idsWells.Any())
+            return Enumerable.Empty<TDto>();
 
-        public async Task<IEnumerable<TDto>> GetByIdWellAsync(int idWell, CancellationToken token)
-        {
-            var entities = await GetQuery()
-               .Where(e => e.IdWell == idWell)
-               .AsNoTracking()
-               .ToArrayAsync(token);
-            var dtos = entities.Select(Convert).ToList();
-            return dtos;
-        }
-
-        public async Task<IEnumerable<TDto>> GetByIdWellAsync(IEnumerable<int> idsWells, CancellationToken token)
-        {
-            if (!idsWells.Any())
-                return Enumerable.Empty<TDto>();
-
-            var entities = await GetQuery()
-               .Where(e => idsWells.Contains(e.IdWell))
-               .AsNoTracking()
-               .ToArrayAsync(token);
-            var dtos = entities.Select(Convert).ToList();
-            return dtos;
-        }
+        var entities = await GetQuery()
+           .Where(e => idsWells.Contains(e.IdWell))
+           .AsNoTracking()
+           .ToArrayAsync(token);
+        var dtos = entities.Select(Convert).ToList();
+        return dtos;
     }
 }
diff --git a/AsbCloudInfrastructure/Repository/DataSaubStatRepository.cs b/AsbCloudInfrastructure/Repository/DataSaubStatRepository.cs
index d5159bf6..d8932b28 100644
--- a/AsbCloudInfrastructure/Repository/DataSaubStatRepository.cs
+++ b/AsbCloudInfrastructure/Repository/DataSaubStatRepository.cs
@@ -11,103 +11,102 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+public class DataSaubStatRepository : IDataSaubStatRepository
 {
-    public class DataSaubStatRepository : IDataSaubStatRepository
+    private readonly IAsbCloudDbContext db;
+    private readonly ITelemetryService telemetryService;
+
+    public DataSaubStatRepository(IAsbCloudDbContext dbContext, ITelemetryService telemetryService)
     {
-        private readonly IAsbCloudDbContext db;
-        private readonly ITelemetryService telemetryService;
+        db = dbContext;
+        this.telemetryService = telemetryService;
 
-        public DataSaubStatRepository(IAsbCloudDbContext dbContext, ITelemetryService telemetryService)
+    }
+
+    public async Task<IEnumerable<DataSaubStatDto>> GetLastsAsync(int[] idTelemetries, CancellationToken token)
+    {
+        var timeZoneOffsets = idTelemetries
+            .Distinct()
+            .ToDictionary(idTelemetry => idTelemetry, idTelemetry => TimeSpan.FromHours(telemetryService.GetTimezone(idTelemetry).Hours));
+
+        var stats = await db.Set<DataSaubStat>()
+            .Where(s => idTelemetries.Contains(s.IdTelemetry))
+            .GroupBy(s => s.IdTelemetry, (key, group) => group.OrderByDescending(el => el.DateEnd).First())
+            .ToArrayAsync(token);
+
+        var result = stats.Select(s => ConvertToDto(s, timeZoneOffsets[s.IdTelemetry]));
+
+        return result;
+    }
+
+    public async Task<IEnumerable<DataSaubStatDto>> GetAsync(int idTelemetry, DateTimeOffset geDate, DateTimeOffset leDate, CancellationToken token)
+    {
+        var timeSpan = TimeSpan.FromHours(telemetryService.GetTimezone(idTelemetry).Hours);
+        var geDateUtc = geDate.ToUniversalTime();
+        var leDateUtc = leDate.ToUniversalTime();
+
+        var stats = await db.Set<DataSaubStat>()
+            .Where(s => s.IdTelemetry == idTelemetry)
+            .Where(s => s.DateStart >= geDateUtc)
+            .Where(s => s.DateEnd <= leDateUtc)
+            .ToArrayAsync(token);
+
+        var result = stats.Select(s => ConvertToDto(s, timeSpan));
+
+        return result;
+    }
+
+    public async Task<int> InsertRangeAsync(IEnumerable<DataSaubStatDto> dataSaubStats, CancellationToken token)
+    {
+        var entities = dataSaubStats.Select(data => ConvertToEntity(data));
+        db.Set<DataSaubStat>().AddRange(entities);
+        return await db.SaveChangesAsync(token);
+    }
+
+    private static DataSaubStatDto ConvertToDto(DataSaubStat entity, TimeSpan timeSpan)
+    {
+        var dto = entity.Adapt<DataSaubStatDto>();
+        dto.DateStart = dto.DateStart.ToOffset(timeSpan);
+        dto.DateEnd = dto.DateEnd.ToOffset(timeSpan);
+
+        return dto;
+    }
+
+    private static DataSaubStat ConvertToEntity(DataSaubStatDto dto)
+    {
+        var entity = dto.Adapt<DataSaubStat>();
+        entity.DateStart = dto.DateStart.ToUniversalTime();
+        entity.DateEnd = dto.DateEnd.ToUniversalTime();
+
+        return entity;
+    }
+
+    private IQueryable<DataSaubStat> BuildQuery(TelemetryPartDeleteRequest request)
+    {
+        var query = db.Set<DataSaubStat>()
+            .Where(o => o.IdTelemetry == request.IdTelemetry);
+
+        if (request.LeDate is not null)
         {
-            db = dbContext;
-            this.telemetryService = telemetryService;
-
+            var leDate = request.LeDate.Value.ToUniversalTime();
+            query = query.Where(o => o.DateStart <= leDate);
         }
 
-        public async Task<IEnumerable<DataSaubStatDto>> GetLastsAsync(int[] idTelemetries, CancellationToken token)
+        if (request.GeDate is not null)
         {
-            var timeZoneOffsets = idTelemetries
-                .Distinct()
-                .ToDictionary(idTelemetry => idTelemetry, idTelemetry => TimeSpan.FromHours(telemetryService.GetTimezone(idTelemetry).Hours));
-
-            var stats = await db.Set<DataSaubStat>()
-                .Where(s => idTelemetries.Contains(s.IdTelemetry))
-                .GroupBy(s => s.IdTelemetry, (key, group) => group.OrderByDescending(el => el.DateEnd).First())
-                .ToArrayAsync(token);
-
-            var result = stats.Select(s => ConvertToDto(s, timeZoneOffsets[s.IdTelemetry]));
-
-            return result;
+            var geDate = request.GeDate.Value.ToUniversalTime();
+            query = query.Where(o => o.DateEnd >= geDate);
         }
 
-        public async Task<IEnumerable<DataSaubStatDto>> GetAsync(int idTelemetry, DateTimeOffset geDate, DateTimeOffset leDate, CancellationToken token)
-        {
-            var timeSpan = TimeSpan.FromHours(telemetryService.GetTimezone(idTelemetry).Hours);
-            var geDateUtc = geDate.ToUniversalTime();
-            var leDateUtc = leDate.ToUniversalTime();
+        return query;
+    }
 
-            var stats = await db.Set<DataSaubStat>()
-                .Where(s => s.IdTelemetry == idTelemetry)
-                .Where(s => s.DateStart >= geDateUtc)
-                .Where(s => s.DateEnd <= leDateUtc)
-                .ToArrayAsync(token);
-
-            var result = stats.Select(s => ConvertToDto(s, timeSpan));
-
-            return result;
-        }
-
-        public async Task<int> InsertRangeAsync(IEnumerable<DataSaubStatDto> dataSaubStats, CancellationToken token)
-        {
-            var entities = dataSaubStats.Select(data => ConvertToEntity(data));
-            db.Set<DataSaubStat>().AddRange(entities);
-            return await db.SaveChangesAsync(token);
-        }
-
-        private static DataSaubStatDto ConvertToDto(DataSaubStat entity, TimeSpan timeSpan)
-        {
-            var dto = entity.Adapt<DataSaubStatDto>();
-            dto.DateStart = dto.DateStart.ToOffset(timeSpan);
-            dto.DateEnd = dto.DateEnd.ToOffset(timeSpan);
-
-            return dto;
-        }
-
-        private static DataSaubStat ConvertToEntity(DataSaubStatDto dto)
-        {
-            var entity = dto.Adapt<DataSaubStat>();
-            entity.DateStart = dto.DateStart.ToUniversalTime();
-            entity.DateEnd = dto.DateEnd.ToUniversalTime();
-
-            return entity;
-        }
-
-        private IQueryable<DataSaubStat> BuildQuery(TelemetryPartDeleteRequest request)
-        {
-            var query = db.Set<DataSaubStat>()
-                .Where(o => o.IdTelemetry == request.IdTelemetry);
-
-            if (request.LeDate is not null)
-            {
-                var leDate = request.LeDate.Value.ToUniversalTime();
-                query = query.Where(o => o.DateStart <= leDate);
-            }
-
-            if (request.GeDate is not null)
-            {
-                var geDate = request.GeDate.Value.ToUniversalTime();
-                query = query.Where(o => o.DateEnd >= geDate);
-            }
-
-            return query;
-        }
-
-        public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
-        {
-            var query = BuildQuery(request);
-            db.Set<DataSaubStat>().RemoveRange(query);
-            return await db.SaveChangesAsync(token);
-        }
+    public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
+    {
+        var query = BuildQuery(request);
+        db.Set<DataSaubStat>().RemoveRange(query);
+        return await db.SaveChangesAsync(token);
     }
 }
diff --git a/AsbCloudInfrastructure/Repository/DrillTestRepository.cs b/AsbCloudInfrastructure/Repository/DrillTestRepository.cs
index a7bc82a0..d9d3931d 100644
--- a/AsbCloudInfrastructure/Repository/DrillTestRepository.cs
+++ b/AsbCloudInfrastructure/Repository/DrillTestRepository.cs
@@ -12,105 +12,104 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+public class DrillTestRepository : IDrillTestRepository
 {
-    public class DrillTestRepository : IDrillTestRepository
+    private readonly IAsbCloudDbContext db;
+
+    public DrillTestRepository(IAsbCloudDbContext db)
     {
-        private readonly IAsbCloudDbContext db;
+        this.db = db;
+    }
 
-        public DrillTestRepository(IAsbCloudDbContext db)
+    public async Task<IEnumerable<DrillTestDto>> GetAllAsync(int idTelemetry, FileReportRequest request, CancellationToken cancellationToken)
+    {
+        var query = db.DrillTests
+            .Where(d => d.IdTelemetry == idTelemetry)
+            .Include(d => d.Telemetry)
+            .AsNoTracking();
+
+        if (request.GeDate.HasValue)
         {
-            this.db = db;
+            var startDateUTC = new DateTimeOffset(request.GeDate.Value.Year, request.GeDate.Value.Month, request.GeDate.Value.Day, 0, 0, 0, TimeSpan.Zero);
+            query = query.Where(q => q.TimeStampStart >= startDateUTC);
+        }
+        if (request.LeDate.HasValue)
+        {
+            var finishDateUTC = new DateTimeOffset(request.LeDate.Value.Year, request.LeDate.Value.Month, request.LeDate.Value.Day, 0, 0, 0, TimeSpan.Zero);
+            query = query.Where(q => q.TimeStampStart <= finishDateUTC);
         }
 
-        public async Task<IEnumerable<DrillTestDto>> GetAllAsync(int idTelemetry, FileReportRequest request, CancellationToken cancellationToken)
+        var entities = await query.ToListAsync(cancellationToken);
+        var dtos = entities.Select(e => Convert(e));
+
+        return dtos;
+    }
+
+
+    public async Task<DrillTestDto> GetAsync(int idTelemetry, int id, CancellationToken cancellationToken)
+    {
+        var drillTest = await db.DrillTests
+            .Where(d => d.Id == id)
+            .Include(d => d.Telemetry)
+            .Where(d => d.Telemetry.Id == idTelemetry)
+            .FirstOrDefaultAsync(cancellationToken);
+
+        if (drillTest is null)
+            throw new ArgumentInvalidException(new string[] { nameof(id), nameof(idTelemetry) }, $"Drill test with id: {id} and idTelemetry: {idTelemetry} does not exist.");
+
+        var dto = Convert(drillTest);
+
+        return dto;
+    }
+
+    public async Task<int> SaveDataAsync(int idTelemetry, IEnumerable<DrillTestBaseDto> dtos, CancellationToken token)
+    {
+        var entities = dtos.Select(dto =>
         {
-            var query = db.DrillTests
-                .Where(d => d.IdTelemetry == idTelemetry)
-                .Include(d => d.Telemetry)
-                .AsNoTracking();
+            var entity = dto.Adapt<DrillTest>();
+            entity.TimeStampStart = dto.TimeStampStart.ToUniversalTime();
+            entity.IdTelemetry = idTelemetry;
+            return entity;
+        });
 
-            if (request.GeDate.HasValue)
-            {
-                var startDateUTC = new DateTimeOffset(request.GeDate.Value.Year, request.GeDate.Value.Month, request.GeDate.Value.Day, 0, 0, 0, TimeSpan.Zero);
-                query = query.Where(q => q.TimeStampStart >= startDateUTC);
-            }
-            if (request.LeDate.HasValue)
-            {
-                var finishDateUTC = new DateTimeOffset(request.LeDate.Value.Year, request.LeDate.Value.Month, request.LeDate.Value.Day, 0, 0, 0, TimeSpan.Zero);
-                query = query.Where(q => q.TimeStampStart <= finishDateUTC);
-            }
+        var result = await db.Database.ExecInsertOrUpdateAsync(db.Set<DrillTest>(), entities, token);
+        return result;
+    }
 
-            var entities = await query.ToListAsync(cancellationToken);
-            var dtos = entities.Select(e => Convert(e));
+    private static DrillTestDto Convert(DrillTest entity)
+    {
+        var dto = entity.Adapt<DrillTestDto>();
+        dto.TimeStampStart = dto.TimeStampStart.ToRemoteDateTime(dto.Telemetry?.TimeZone?.Hours ?? 0);
+        return dto;
+    }
 
-            return dtos;
+    //TODO: Унифицировать модели данных телеметрии.Чтобы в будущем унифицировать репозитории данных телеметрии.
+    private IQueryable<DrillTest> BuildQuery(TelemetryPartDeleteRequest request)
+    {
+        var query = db.Set<DrillTest>()
+            .Where(o => o.IdTelemetry == request.IdTelemetry);
+
+        if (request.LeDate is not null)
+        {
+            var leDate = request.LeDate.Value.ToUniversalTime();
+            query = query.Where(o => o.TimeStampStart <= leDate);
         }
 
-
-        public async Task<DrillTestDto> GetAsync(int idTelemetry, int id, CancellationToken cancellationToken)
+        if (request.GeDate is not null)
         {
-            var drillTest = await db.DrillTests
-                .Where(d => d.Id == id)
-                .Include(d => d.Telemetry)
-                .Where(d => d.Telemetry.Id == idTelemetry)
-                .FirstOrDefaultAsync(cancellationToken);
-
-            if (drillTest is null)
-                throw new ArgumentInvalidException(new string[] { nameof(id), nameof(idTelemetry) }, $"Drill test with id: {id} and idTelemetry: {idTelemetry} does not exist.");
-
-            var dto = Convert(drillTest);
-
-            return dto;
+            var geDate = request.GeDate.Value.ToUniversalTime();
+            query = query.Where(o => o.TimeStampStart >= geDate);
         }
 
-        public async Task<int> SaveDataAsync(int idTelemetry, IEnumerable<DrillTestBaseDto> dtos, CancellationToken token)
-        {
-            var entities = dtos.Select(dto =>
-            {
-                var entity = dto.Adapt<DrillTest>();
-                entity.TimeStampStart = dto.TimeStampStart.ToUniversalTime();
-                entity.IdTelemetry = idTelemetry;
-                return entity;
-            });
+        return query;
+    }
 
-            var result = await db.Database.ExecInsertOrUpdateAsync(db.Set<DrillTest>(), entities, token);
-            return result;
-        }
-
-        private static DrillTestDto Convert(DrillTest entity)
-        {
-            var dto = entity.Adapt<DrillTestDto>();
-            dto.TimeStampStart = dto.TimeStampStart.ToRemoteDateTime(dto.Telemetry?.TimeZone?.Hours ?? 0);
-            return dto;
-        }
-
-        //TODO: Унифицировать модели данных телеметрии.Чтобы в будущем унифицировать репозитории данных телеметрии.
-        private IQueryable<DrillTest> BuildQuery(TelemetryPartDeleteRequest request)
-        {
-            var query = db.Set<DrillTest>()
-                .Where(o => o.IdTelemetry == request.IdTelemetry);
-
-            if (request.LeDate is not null)
-            {
-                var leDate = request.LeDate.Value.ToUniversalTime();
-                query = query.Where(o => o.TimeStampStart <= leDate);
-            }
-
-            if (request.GeDate is not null)
-            {
-                var geDate = request.GeDate.Value.ToUniversalTime();
-                query = query.Where(o => o.TimeStampStart >= geDate);
-            }
-
-            return query;
-        }
-
-        public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
-        {
-            var query = BuildQuery(request);
-            db.Set<DrillTest>().RemoveRange(query);
-            return await db.SaveChangesAsync(token);
-        }
+    public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
+    {
+        var query = BuildQuery(request);
+        db.Set<DrillTest>().RemoveRange(query);
+        return await db.SaveChangesAsync(token);
     }
 }
diff --git a/AsbCloudInfrastructure/Repository/FaqRepository.cs b/AsbCloudInfrastructure/Repository/FaqRepository.cs
index 378a540a..ccea4385 100644
--- a/AsbCloudInfrastructure/Repository/FaqRepository.cs
+++ b/AsbCloudInfrastructure/Repository/FaqRepository.cs
@@ -13,148 +13,147 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+/// <summary>
+/// сервис по работе с faq-вопросами
+/// </summary>
+public class FaqRepository : IFaqRepository
 {
-    /// <summary>
-    /// сервис по работе с faq-вопросами
-    /// </summary>
-    public class FaqRepository : IFaqRepository
+    private readonly IAsbCloudDbContext db;
+    private readonly IWellService wellService;
+
+    public FaqRepository(IAsbCloudDbContext db, IWellService wellService)
     {
-        private readonly IAsbCloudDbContext db;
-        private readonly IWellService wellService;
+        this.db = db;
+        this.wellService = wellService;
+    }
 
-        public FaqRepository(IAsbCloudDbContext db, IWellService wellService)
+    public async Task<IEnumerable<FaqDto>> GetFilteredAsync(FaqRequest request, CancellationToken token)
+    {
+        var query = db.Faqs.AsNoTracking();
+
+        if (request.IsFrequently)
         {
-            this.db = db;
-            this.wellService = wellService;
+            query = query.Where(o => o.IsFrequently);
+        }
+        if (request.HasAnswer)
+        {
+            query = query.Where(o => !string.IsNullOrEmpty(o.Answer));
+        }
+        if (!request.IncludeDeleted)
+        {
+            query = query.Where(o => o.State != Faq.StateDeleted);
         }
 
-        public async Task<IEnumerable<FaqDto>> GetFilteredAsync(FaqRequest request, CancellationToken token)
-        {
-            var query = db.Faqs.AsNoTracking();
-
-            if (request.IsFrequently)
+        var entities = query
+            .OrderByDescending(e => e.DateCreatedQuestion)
+            .Select(o => new FaqDto()
             {
-                query = query.Where(o => o.IsFrequently);
-            }
-            if (request.HasAnswer)
-            {
-                query = query.Where(o => !string.IsNullOrEmpty(o.Answer));
-            }
-            if (!request.IncludeDeleted)
-            {
-                query = query.Where(o => o.State != Faq.StateDeleted);
-            }
-
-            var entities = query
-                .OrderByDescending(e => e.DateCreatedQuestion)
-                .Select(o => new FaqDto()
-                {
-                    Id = o.Id,
-                    Question = o.Question,
-                    Answer = o.Answer,
-                    CounterQuestion = o.CounterQuestion,
-                    IsFrequently = o.IsFrequently,
-                    State = o.State,
-                    DateCreatedQuestion = o.DateCreatedQuestion,
-                    IdAuthorQuestion = o.IdAuthorQuestion,
-                    AurhorQuestionName = o.AuthorQuestion.MakeDisplayName(),
-                    AurhorAnswerName = (o.AuthorAnswer != null) 
-                        ? o.AuthorAnswer.MakeDisplayName() 
-                        : string.Empty,
-                });
+                Id = o.Id,
+                Question = o.Question,
+                Answer = o.Answer,
+                CounterQuestion = o.CounterQuestion,
+                IsFrequently = o.IsFrequently,
+                State = o.State,
+                DateCreatedQuestion = o.DateCreatedQuestion,
+                IdAuthorQuestion = o.IdAuthorQuestion,
+                AurhorQuestionName = o.AuthorQuestion.MakeDisplayName(),
+                AurhorAnswerName = (o.AuthorAnswer != null) 
+                    ? o.AuthorAnswer.MakeDisplayName() 
+                    : string.Empty,
+            });
 
 
-            var result = await entities.AsNoTracking()
-                .ToArrayAsync(token)
-                .ConfigureAwait(false);
+        var result = await entities.AsNoTracking()
+            .ToArrayAsync(token)
+            .ConfigureAwait(false);
 
-            return result;
+        return result;
 
-        }
+    }
 
-        public async Task<int> InsertAsync(FaqDto faqDto, CancellationToken token)
+    public async Task<int> InsertAsync(FaqDto faqDto, CancellationToken token)
+    {
+        var entity = faqDto.Adapt<Faq>();
+        entity.DateCreatedQuestion = entity.DateLastEditedQuestion = DateTimeOffset.UtcNow;
+        entity.CounterQuestion = 1;
+        entity.State = Faq.StateOpened;
+        if (!string.IsNullOrEmpty(entity.Answer))
+            entity.IdAuthorAnswer = entity.IdAuthorQuestion;
+
+
+        db.Faqs.Add(entity);
+
+        await db.SaveChangesAsync(token).ConfigureAwait(false);
+        return entity.Id;
+    }
+
+    public async Task<int> MergeAsync(int sourceId1, int sourceId2, bool mergeQuestions, CancellationToken token)
+    {
+        var sourceFaqs = db.Faqs.Where(e => e.Id == sourceId1 || e.Id == sourceId2).ToArray();
+        if (sourceFaqs.Count() < 2)
+            throw new ArgumentInvalidException(nameof(sourceFaqs), "Questions with target ids don't exist");
+
+        var newFaq = new Faq()
         {
-            var entity = faqDto.Adapt<Faq>();
-            entity.DateCreatedQuestion = entity.DateLastEditedQuestion = DateTimeOffset.UtcNow;
-            entity.CounterQuestion = 1;
-            entity.State = Faq.StateOpened;
-            if (!string.IsNullOrEmpty(entity.Answer))
-                entity.IdAuthorAnswer = entity.IdAuthorQuestion;
+            CounterQuestion = sourceFaqs.Sum(e => e.CounterQuestion),
+            State = 0,
+            IsFrequently = sourceFaqs.Any(e => e.IsFrequently),
+            IdAuthorQuestion = sourceFaqs.Last().IdAuthorQuestion,
+            DateCreatedQuestion = DateTimeOffset.UtcNow,
+            DateLastEditedQuestion = DateTimeOffset.UtcNow,
+            Answer = mergeQuestions == true
+                ? string.Join(Environment.NewLine, sourceFaqs.Select(e => e.Answer))
+                : sourceFaqs.Last().Answer,
+            Question = mergeQuestions == true
+                ? string.Join(Environment.NewLine, sourceFaqs.Select(e => e.Question))
+                : sourceFaqs.Last().Question,
+        };
 
+        db.Faqs.Add(newFaq);
+        await db.SaveChangesAsync(token).ConfigureAwait(false);
 
-            db.Faqs.Add(entity);
+        if (newFaq.Id == 0)
+            throw new ArgumentInvalidException(nameof(sourceId1), "Error creating new question");
 
-            await db.SaveChangesAsync(token).ConfigureAwait(false);
-            return entity.Id;
-        }
-
-        public async Task<int> MergeAsync(int sourceId1, int sourceId2, bool mergeQuestions, CancellationToken token)
+        foreach (var sourceFaq in sourceFaqs)
         {
-            var sourceFaqs = db.Faqs.Where(e => e.Id == sourceId1 || e.Id == sourceId2).ToArray();
-            if (sourceFaqs.Count() < 2)
-                throw new ArgumentInvalidException(nameof(sourceFaqs), "Questions with target ids don't exist");
-
-            var newFaq = new Faq()
-            {
-                CounterQuestion = sourceFaqs.Sum(e => e.CounterQuestion),
-                State = 0,
-                IsFrequently = sourceFaqs.Any(e => e.IsFrequently),
-                IdAuthorQuestion = sourceFaqs.Last().IdAuthorQuestion,
-                DateCreatedQuestion = DateTimeOffset.UtcNow,
-                DateLastEditedQuestion = DateTimeOffset.UtcNow,
-                Answer = mergeQuestions == true
-                    ? string.Join(Environment.NewLine, sourceFaqs.Select(e => e.Answer))
-                    : sourceFaqs.Last().Answer,
-                Question = mergeQuestions == true
-                    ? string.Join(Environment.NewLine, sourceFaqs.Select(e => e.Question))
-                    : sourceFaqs.Last().Question,
-            };
-
-            db.Faqs.Add(newFaq);
-            await db.SaveChangesAsync(token).ConfigureAwait(false);
-
-            if (newFaq.Id == 0)
-                throw new ArgumentInvalidException(nameof(sourceId1), "Error creating new question");
-
-            foreach (var sourceFaq in sourceFaqs)
-            {
-                sourceFaq.IdReplacementQuestion = newFaq.Id;
-                sourceFaq.State = Faq.StateDeleted;
-            }
-            await db.SaveChangesAsync(token).ConfigureAwait(false);
-
-            return newFaq.Id;
+            sourceFaq.IdReplacementQuestion = newFaq.Id;
+            sourceFaq.State = Faq.StateDeleted;
         }
+        await db.SaveChangesAsync(token).ConfigureAwait(false);
 
-        public async Task<int> UpdateAsync(FaqDto dto, CancellationToken token)
-        {
-            var entity = dto.Adapt<Faq>();
-            entity.DateLastEditedQuestion = DateTimeOffset.UtcNow;
-            db.Faqs.Update(entity);
-            return await db.SaveChangesAsync(token)
-                .ConfigureAwait(false);
-        }
+        return newFaq.Id;
+    }
 
-        public async Task<int> MarkAsDeletedAsync(int id, CancellationToken token)
-        {
-            var entity = db.Faqs.FirstOrDefault(e => e.Id == id)
-                ?? throw new ArgumentInvalidException(nameof(id), "Question doesn't exist");
+    public async Task<int> UpdateAsync(FaqDto dto, CancellationToken token)
+    {
+        var entity = dto.Adapt<Faq>();
+        entity.DateLastEditedQuestion = DateTimeOffset.UtcNow;
+        db.Faqs.Update(entity);
+        return await db.SaveChangesAsync(token)
+            .ConfigureAwait(false);
+    }
 
-            entity.State = Faq.StateDeleted;
-            entity.DateLastEditedQuestion = DateTimeOffset.UtcNow;
+    public async Task<int> MarkAsDeletedAsync(int id, CancellationToken token)
+    {
+        var entity = db.Faqs.FirstOrDefault(e => e.Id == id)
+            ?? throw new ArgumentInvalidException(nameof(id), "Question doesn't exist");
 
-            return await db.SaveChangesAsync(token)
-                .ConfigureAwait(false);
-        }
+        entity.State = Faq.StateDeleted;
+        entity.DateLastEditedQuestion = DateTimeOffset.UtcNow;
 
-        public async Task<int> DeleteAsync(int id, CancellationToken token)
-        {
-            var faq = db.Faqs.FirstOrDefault(f => f.Id == id)
-                ?? throw new ArgumentInvalidException(nameof(id), "Question doesn't exist");
+        return await db.SaveChangesAsync(token)
+            .ConfigureAwait(false);
+    }
 
-            db.Faqs.Remove(faq);
-            return await db.SaveChangesAsync(token);
-        }
+    public async Task<int> DeleteAsync(int id, CancellationToken token)
+    {
+        var faq = db.Faqs.FirstOrDefault(f => f.Id == id)
+            ?? throw new ArgumentInvalidException(nameof(id), "Question doesn't exist");
+
+        db.Faqs.Remove(faq);
+        return await db.SaveChangesAsync(token);
     }
 }
diff --git a/AsbCloudInfrastructure/Repository/FileRepository.cs b/AsbCloudInfrastructure/Repository/FileRepository.cs
index a01f121b..8dd865ee 100644
--- a/AsbCloudInfrastructure/Repository/FileRepository.cs
+++ b/AsbCloudInfrastructure/Repository/FileRepository.cs
@@ -11,279 +11,277 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+public class FileRepository : IFileRepository
 {
+    private readonly IQueryable<FileInfo> dbSetConfigured;
+    private readonly IAsbCloudDbContext db;
 
-    public class FileRepository : IFileRepository
+    public FileRepository(IAsbCloudDbContext db)
     {
-        private readonly IQueryable<FileInfo> dbSetConfigured;
-        private readonly IAsbCloudDbContext db;
-
-        public FileRepository(IAsbCloudDbContext db)
-        {
-            this.db = db;
-            this.dbSetConfigured = db.Files
-                .Include(f => f.Author)
-                    .ThenInclude(u => u!.Company)
-                        .ThenInclude(c => c.CompanyType)
-                .Include(f => f.FileMarks)
-                    .ThenInclude(m => m.User)
-                .Include(f => f.Well);
-        }
-
-        private IQueryable<FileInfo> BuildQuery(FileRequest request)
-        {
-            var query = dbSetConfigured
-                .Where(e => e.IdWell == request.IdWell);
-
-            if (request.IdCategory is not null)
-                query = query.Where(x => x.IdCategory == request.IdCategory);
-
-            if (request.IsDeleted is not null)
-                query = query.Where(x => x.IsDeleted == request.IsDeleted);
-
-            if (request.CompanyNamePart is not null)
-                query = query.Where(e => e.Author != null && e.Author.Company.Caption.ToLower().Contains(request.CompanyNamePart.ToLower())); 
-
-            if (request.FileNamePart is not null)
-                query = query.Where(e => e.Name.ToLower().Contains(request.FileNamePart.ToLower()));
-
-            if (request.Begin is not null)
-            {
-                var beginUtc = request.Begin.Value.ToUniversalTime();
-                query = query.Where(e => e.UploadDate >= beginUtc);
-            }
-
-            if (request.End is not null)
-            {
-                var endUtc = request.End.Value.ToUniversalTime();
-                query = query.Where(e => e.UploadDate <= endUtc);
-            }
-
-            if (request?.SortFields?.Any() == true)
-            {
-                query = query.SortBy(request.SortFields);
-            }
-            else
-                query = query
-                    .OrderBy(o => o.UploadDate);
-
-            return query;
-        }
-
-        public async Task<IEnumerable<FileInfoDto>> GetInfosAsync(FileRequest request, CancellationToken token)
-        {
-            var query = BuildQuery(request);
-
-            var entities = await query
-                .SkipTake(request.Skip, request.Take)
-                .AsNoTracking()
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-
-            var dtos = entities.Select(e => Convert(e));
-            return dtos;
-        }
-
-        public async Task<PaginationContainer<FileInfoDto>> GetInfosPaginatedAsync(FileRequest request, CancellationToken token = default)
-        {
-            var skip = request.Skip ?? 0;
-            var take = request.Take ?? 32;
-
-            var query = BuildQuery(request);
-
-            var result = new PaginationContainer<FileInfoDto>()
-            {
-                Skip = skip,
-                Take = take,
-                Count = await query.CountAsync(token),
-            };
-
-            if (result.Count == 0)
-                return result;
-
-            var entities = await query
-                .SkipTake(skip, take)
-                .AsNoTracking()
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-
-            result.Items = entities.Select(e => Convert(e));
-
-            return result;
-        }
-
-        public async Task<IEnumerable<FileInfoDto>> GetInfoByIdsAsync(IEnumerable<int> idsFile, CancellationToken token)
-        {
-            var result = Enumerable.Empty<FileInfoDto>();
-
-            var entities = await dbSetConfigured
-                .AsNoTracking()
-                .Where(f => idsFile.Contains(f.Id))
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-
-            if (entities is not null)
-                result = entities.Select(entity => Convert(entity));
-
-            return result;
-        }
-
-        public async Task<int> MarkAsDeletedAsync(int idFile, CancellationToken token = default)
-        {
-            var fileInfo = await db.Files.FirstOrDefaultAsync(f => f.Id == idFile, token).ConfigureAwait(false);
-
-            if (fileInfo is null)
-                return 0;
-
-            fileInfo.IsDeleted = true;
-
-            return await db.SaveChangesAsync(token).ConfigureAwait(false);
-        }
-
-        public async Task<IEnumerable<FileInfoDto>> DeleteAsync(IEnumerable<int> ids, CancellationToken token)
-        {
-            var query = dbSetConfigured
-                .Where(f => ids.Contains(f.Id));
-
-                var files = await query.ToListAsync(token);
-
-                var filesDtos = files.Select(x => Convert(x));
-
-                db.Files.RemoveRange(query);
-                await db.SaveChangesAsync(token).ConfigureAwait(false);
-
-                return filesDtos;
-            }
-
-        public async Task<FileInfoDto> GetByMarkId(int idMark, CancellationToken token)
-        {
-            var entity = await dbSetConfigured
-                .FirstOrDefaultAsync(f => f.FileMarks.Any(m => m.Id == idMark), token)
-                .ConfigureAwait(false);
-
-            FileInfoDto dto = Convert(entity!);
-            return dto;
-        }
-
-        public async Task<int> CreateFileMarkAsync(FileMarkDto fileMarkDto, int idUser, CancellationToken token)
-        {
-            var fileMark = await db.FileMarks
-                .FirstOrDefaultAsync(m => m.IdFile == fileMarkDto.IdFile &&
-                    m.IdMarkType == fileMarkDto.IdMarkType &&
-                    m.IdUser == idUser &&
-                    m.IsDeleted == false,
-                    token)
-                .ConfigureAwait(false);
-
-            if (fileMark is not null)
-                return 0;
-
-            var newFileMark = fileMarkDto.Adapt<FileMark>();
-            newFileMark.Id = default;
-            newFileMark.DateCreated = DateTimeOffset.UtcNow;
-            newFileMark.IdUser = idUser;
-            newFileMark.User = null!;
-
-            db.FileMarks.Add(newFileMark);
-            return await db.SaveChangesAsync(token);
-        }
-
-        public async Task<int> MarkFileMarkAsDeletedAsync(IEnumerable<int> idsMarks, CancellationToken token)
-        {
-            var fileMarkQuery = db.FileMarks
-                .Where(m => idsMarks.Contains(m.Id));
-
-            foreach (var fileMark in fileMarkQuery)
-                fileMark.IsDeleted = true;
-
-            return await db.SaveChangesAsync(token);
-        }
-
-        public async Task<IEnumerable<FileInfoDto>> GetAllAsync(CancellationToken token)
-            => await dbSetConfigured.AsNoTracking()
-                .Select(x => Convert(x))
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-
-        public async Task<FileInfoDto?> GetOrDefaultAsync(int id, CancellationToken token)
-        {
-            var entity = await dbSetConfigured
-                .AsNoTracking()
-                .FirstOrDefaultAsync(f => f.Id == id, token)
-                .ConfigureAwait(false);
-
-            if (entity is null)
-                return null;
-
-            var dto = Convert(entity);
-            return dto;
-        }
-
-        public FileInfoDto? GetOrDefault(int id)
-        {
-            var entity = dbSetConfigured
-                .AsNoTracking()
-                .FirstOrDefault(f => f.Id == id);
-
-            if (entity is null)
-                return null;
-
-            var dto = Convert(entity);
-            return dto;
-        }
-
-        public async Task<int> InsertAsync(FileInfoDto newItem, CancellationToken token)
-        {
-            var fileInfo = new FileInfo()
-            {
-                IdWell = newItem.IdWell,
-                IdAuthor = newItem.IdAuthor,
-                IdCategory = newItem.IdCategory,
-                Name = newItem.Name,
-                UploadDate = DateTimeOffset.UtcNow,
-                IsDeleted = false,
-                Size = newItem.Size,
-            };
-
-            var entry = db.Files.Add(fileInfo);
-            await db.SaveChangesAsync(token).ConfigureAwait(false);
-            return entry.Entity.Id;
-        }
-
-        public Task<int> InsertRangeAsync(IEnumerable<FileInfoDto> newItems, CancellationToken token)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<int> UpdateAsync(FileInfoDto item, CancellationToken token)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<int> DeleteAsync(int id, CancellationToken token)
-        {
-            throw new NotImplementedException();
-        }
-
-        private static FileInfoDto Convert(FileInfo entity)
-        {
-            var timezoneOffset = entity.Well.Timezone?.Hours ?? 5;
-            return Convert(entity, timezoneOffset);
-        }
-
-        private static FileInfoDto Convert(FileInfo entity, double timezoneOffset)
-        {
-            var dto = entity.Adapt<FileInfoDto>();
-            dto.UploadDate = entity.UploadDate.ToOffset(TimeSpan.FromHours(timezoneOffset));
-            dto.FileMarks = entity.FileMarks.Select(m =>
-            {
-                var mark = m.Adapt<FileMarkDto>();
-                mark.DateCreated = m.DateCreated.ToOffset(TimeSpan.FromHours(timezoneOffset));
-                return mark;
-            });
-            return dto;
-        }
+        this.db = db;
+        this.dbSetConfigured = db.Files
+            .Include(f => f.Author)
+                .ThenInclude(u => u!.Company)
+                    .ThenInclude(c => c.CompanyType)
+            .Include(f => f.FileMarks)
+                .ThenInclude(m => m.User)
+            .Include(f => f.Well);
     }
 
+    private IQueryable<FileInfo> BuildQuery(FileRequest request)
+    {
+        var query = dbSetConfigured
+            .Where(e => e.IdWell == request.IdWell);
+
+        if (request.IdCategory is not null)
+            query = query.Where(x => x.IdCategory == request.IdCategory);
+
+        if (request.IsDeleted is not null)
+            query = query.Where(x => x.IsDeleted == request.IsDeleted);
+
+        if (request.CompanyNamePart is not null)
+            query = query.Where(e => e.Author != null && e.Author.Company.Caption.ToLower().Contains(request.CompanyNamePart.ToLower())); 
+
+        if (request.FileNamePart is not null)
+            query = query.Where(e => e.Name.ToLower().Contains(request.FileNamePart.ToLower()));
+
+        if (request.Begin is not null)
+        {
+            var beginUtc = request.Begin.Value.ToUniversalTime();
+            query = query.Where(e => e.UploadDate >= beginUtc);
+        }
+
+        if (request.End is not null)
+        {
+            var endUtc = request.End.Value.ToUniversalTime();
+            query = query.Where(e => e.UploadDate <= endUtc);
+        }
+
+        if (request?.SortFields?.Any() == true)
+        {
+            query = query.SortBy(request.SortFields);
+        }
+        else
+            query = query
+                .OrderBy(o => o.UploadDate);
+
+        return query;
+    }
+
+    public async Task<IEnumerable<FileInfoDto>> GetInfosAsync(FileRequest request, CancellationToken token)
+    {
+        var query = BuildQuery(request);
+
+        var entities = await query
+            .SkipTake(request.Skip, request.Take)
+            .AsNoTracking()
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+
+        var dtos = entities.Select(e => Convert(e));
+        return dtos;
+    }
+
+    public async Task<PaginationContainer<FileInfoDto>> GetInfosPaginatedAsync(FileRequest request, CancellationToken token = default)
+    {
+        var skip = request.Skip ?? 0;
+        var take = request.Take ?? 32;
+
+        var query = BuildQuery(request);
+
+        var result = new PaginationContainer<FileInfoDto>()
+        {
+            Skip = skip,
+            Take = take,
+            Count = await query.CountAsync(token),
+        };
+
+        if (result.Count == 0)
+            return result;
+
+        var entities = await query
+            .SkipTake(skip, take)
+            .AsNoTracking()
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+
+        result.Items = entities.Select(e => Convert(e));
+
+        return result;
+    }
+
+    public async Task<IEnumerable<FileInfoDto>> GetInfoByIdsAsync(IEnumerable<int> idsFile, CancellationToken token)
+    {
+        var result = Enumerable.Empty<FileInfoDto>();
+
+        var entities = await dbSetConfigured
+            .AsNoTracking()
+            .Where(f => idsFile.Contains(f.Id))
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+
+        if (entities is not null)
+            result = entities.Select(entity => Convert(entity));
+
+        return result;
+    }
+
+    public async Task<int> MarkAsDeletedAsync(int idFile, CancellationToken token = default)
+    {
+        var fileInfo = await db.Files.FirstOrDefaultAsync(f => f.Id == idFile, token).ConfigureAwait(false);
+
+        if (fileInfo is null)
+            return 0;
+
+        fileInfo.IsDeleted = true;
+
+        return await db.SaveChangesAsync(token).ConfigureAwait(false);
+    }
+
+    public async Task<IEnumerable<FileInfoDto>> DeleteAsync(IEnumerable<int> ids, CancellationToken token)
+    {
+        var query = dbSetConfigured
+            .Where(f => ids.Contains(f.Id));
+
+            var files = await query.ToListAsync(token);
+
+            var filesDtos = files.Select(x => Convert(x));
+
+            db.Files.RemoveRange(query);
+            await db.SaveChangesAsync(token).ConfigureAwait(false);
+
+            return filesDtos;
+        }
+
+    public async Task<FileInfoDto> GetByMarkId(int idMark, CancellationToken token)
+    {
+        var entity = await dbSetConfigured
+            .FirstOrDefaultAsync(f => f.FileMarks.Any(m => m.Id == idMark), token)
+            .ConfigureAwait(false);
+
+        FileInfoDto dto = Convert(entity!);
+        return dto;
+    }
+
+    public async Task<int> CreateFileMarkAsync(FileMarkDto fileMarkDto, int idUser, CancellationToken token)
+    {
+        var fileMark = await db.FileMarks
+            .FirstOrDefaultAsync(m => m.IdFile == fileMarkDto.IdFile &&
+                m.IdMarkType == fileMarkDto.IdMarkType &&
+                m.IdUser == idUser &&
+                m.IsDeleted == false,
+                token)
+            .ConfigureAwait(false);
+
+        if (fileMark is not null)
+            return 0;
+
+        var newFileMark = fileMarkDto.Adapt<FileMark>();
+        newFileMark.Id = default;
+        newFileMark.DateCreated = DateTimeOffset.UtcNow;
+        newFileMark.IdUser = idUser;
+        newFileMark.User = null!;
+
+        db.FileMarks.Add(newFileMark);
+        return await db.SaveChangesAsync(token);
+    }
+
+    public async Task<int> MarkFileMarkAsDeletedAsync(IEnumerable<int> idsMarks, CancellationToken token)
+    {
+        var fileMarkQuery = db.FileMarks
+            .Where(m => idsMarks.Contains(m.Id));
+
+        foreach (var fileMark in fileMarkQuery)
+            fileMark.IsDeleted = true;
+
+        return await db.SaveChangesAsync(token);
+    }
+
+    public async Task<IEnumerable<FileInfoDto>> GetAllAsync(CancellationToken token)
+        => await dbSetConfigured.AsNoTracking()
+            .Select(x => Convert(x))
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+
+    public async Task<FileInfoDto?> GetOrDefaultAsync(int id, CancellationToken token)
+    {
+        var entity = await dbSetConfigured
+            .AsNoTracking()
+            .FirstOrDefaultAsync(f => f.Id == id, token)
+            .ConfigureAwait(false);
+
+        if (entity is null)
+            return null;
+
+        var dto = Convert(entity);
+        return dto;
+    }
+
+    public FileInfoDto? GetOrDefault(int id)
+    {
+        var entity = dbSetConfigured
+            .AsNoTracking()
+            .FirstOrDefault(f => f.Id == id);
+
+        if (entity is null)
+            return null;
+
+        var dto = Convert(entity);
+        return dto;
+    }
+
+    public async Task<int> InsertAsync(FileInfoDto newItem, CancellationToken token)
+    {
+        var fileInfo = new FileInfo()
+        {
+            IdWell = newItem.IdWell,
+            IdAuthor = newItem.IdAuthor,
+            IdCategory = newItem.IdCategory,
+            Name = newItem.Name,
+            UploadDate = DateTimeOffset.UtcNow,
+            IsDeleted = false,
+            Size = newItem.Size,
+        };
+
+        var entry = db.Files.Add(fileInfo);
+        await db.SaveChangesAsync(token).ConfigureAwait(false);
+        return entry.Entity.Id;
+    }
+
+    public Task<int> InsertRangeAsync(IEnumerable<FileInfoDto> newItems, CancellationToken token)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<int> UpdateAsync(FileInfoDto item, CancellationToken token)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<int> DeleteAsync(int id, CancellationToken token)
+    {
+        throw new NotImplementedException();
+    }
+
+    private static FileInfoDto Convert(FileInfo entity)
+    {
+        var timezoneOffset = entity.Well.Timezone?.Hours ?? 5;
+        return Convert(entity, timezoneOffset);
+    }
+
+    private static FileInfoDto Convert(FileInfo entity, double timezoneOffset)
+    {
+        var dto = entity.Adapt<FileInfoDto>();
+        dto.UploadDate = entity.UploadDate.ToOffset(TimeSpan.FromHours(timezoneOffset));
+        dto.FileMarks = entity.FileMarks.Select(m =>
+        {
+            var mark = m.Adapt<FileMarkDto>();
+            mark.DateCreated = m.DateCreated.ToOffset(TimeSpan.FromHours(timezoneOffset));
+            return mark;
+        });
+        return dto;
+    }
 }
diff --git a/AsbCloudInfrastructure/Repository/GtrWitsRepository.cs b/AsbCloudInfrastructure/Repository/GtrWitsRepository.cs
index 54b19e6b..22707146 100644
--- a/AsbCloudInfrastructure/Repository/GtrWitsRepository.cs
+++ b/AsbCloudInfrastructure/Repository/GtrWitsRepository.cs
@@ -17,478 +17,477 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+public class GtrWitsRepository : IGtrRepository
 {
-    public class GtrWitsRepository : IGtrRepository
+    private static IDictionary<(int IdRecord, int IdItem), string> WitsParameters = new Dictionary<(int, int), string>
     {
-        private static IDictionary<(int IdRecord, int IdItem), string> WitsParameters = new Dictionary<(int, int), string>
+        { (1, 8), nameof(GtrWitsDto.DEPTBITM) },
+        { (1, 10), nameof(GtrWitsDto.DEPTMEAS) },
+        { (1, 14), nameof(GtrWitsDto.HKLA) },
+        { (1, 12), nameof(GtrWitsDto.BLKPOS) },
+        { (1, 16), nameof(GtrWitsDto.WOBA) },
+        { (1, 18), nameof(GtrWitsDto.TORQA) },
+        { (1, 21), nameof(GtrWitsDto.SPPA) },
+        { (2, 15), nameof(GtrWitsDto.RPMA) },
+        { (1, 13), nameof(GtrWitsDto.ROPA) },
+        { (3, 16), nameof(GtrWitsDto.RSUX) },
+        { (3, 17), nameof(GtrWitsDto.RSDX) },
+        { (1, 30), nameof(GtrWitsDto.MFIA) },
+        { (1, 29), nameof(GtrWitsDto.MFOA)},
+        { (1, 34), nameof(GtrWitsDto.MTIA) },
+        { (1, 33), nameof(GtrWitsDto.MTOA) },
+        { (1, 23), nameof(GtrWitsDto.SPM1) },
+        { (1, 24), nameof(GtrWitsDto.SPM2) },
+        { (1, 25), nameof(GtrWitsDto.SPM3) },
+        { (1, 26), nameof(GtrWitsDto.TVOLACT) },
+        { (11, 29), nameof(GtrWitsDto.TTVOL1) },
+        { (11, 30), nameof(GtrWitsDto.TTVOL2) },
+        { (11, 15), nameof(GtrWitsDto.TVOL01) },
+        { (11, 16), nameof(GtrWitsDto.TVOL02) },
+        { (11, 17), nameof(GtrWitsDto.TVOL03) },
+        { (11, 18), nameof(GtrWitsDto.TVOL04) },
+        { (11, 19), nameof(GtrWitsDto.TVOL05) },
+        { (11, 20), nameof(GtrWitsDto.TVOL06) },
+        { (11, 21), nameof(GtrWitsDto.TVOL07) },
+        { (11, 22), nameof(GtrWitsDto.TVOL08) },
+        { (11, 23), nameof(GtrWitsDto.TVOL09) },
+        { (11, 24), nameof(GtrWitsDto.TVOL10) },
+        { (11, 25), nameof(GtrWitsDto.TVOL11) },
+        { (11, 26), nameof(GtrWitsDto.TVOL12) },
+        { (11, 27), nameof(GtrWitsDto.TVOL13) },
+        { (11, 28), nameof(GtrWitsDto.TVOL14) },
+        { (1, 31), nameof(GtrWitsDto.MDOA) },
+        { (1, 32), nameof(GtrWitsDto.MDIA) },
+        { (12, 12), nameof(GtrWitsDto.METHANE) },
+        { (12, 13), nameof(GtrWitsDto.ETHANE) },
+        { (12, 14), nameof(GtrWitsDto.PROPANE) },
+        { (12, 15), nameof(GtrWitsDto.IBUTANE) },
+        { (12, 16), nameof(GtrWitsDto.NBUTANE) },
+        { (1, 40), nameof(GtrWitsDto.GASA) },
+    };
+
+    private readonly IAsbCloudDbContext db;
+    private readonly ITelemetryService telemetryService;
+    private static ConcurrentDictionary<int, ConcurrentDictionary<(int, int), WitsItemRecordDto>> cache = new();
+
+    public GtrWitsRepository(
+        IAsbCloudDbContext db,
+        ITelemetryService telemetryService)
+    {
+        this.db = db;
+        this.telemetryService = telemetryService;
+    }
+
+    public async Task<IEnumerable<GtrWitsDto>> GetAsync(int idWell, GtrRequest request, CancellationToken token) =>
+        await GetAsync<WitsItemFloat, float>(idWell, request, token);
+
+    public async Task<DatesRangeDto?> GetRangeAsync(int idWell, DateTimeOffset? geDate, DateTimeOffset? leDate, CancellationToken token)
+    {
+        var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
+
+        if (telemetry is null)
+            return null;
+
+        var rangeQuery = db
+            .Set<WitsItemFloat>()
+            .Where(e => e.IdTelemetry == telemetry.Id);
+
+        if (geDate is not null)
+            rangeQuery = rangeQuery.Where(e => e.DateTime >= geDate);
+
+        if (leDate is not null)
+            rangeQuery = rangeQuery.Where(e => e.DateTime <= leDate);
+
+        var groupedQuery = rangeQuery.GroupBy(e => e.IdTelemetry)
+            .Select(group => new
+            {
+                Min = group.Min(e => e.DateTime),
+                Max = group.Max(e => e.DateTime)
+            });
+        var range = await groupedQuery.FirstOrDefaultAsync(token);
+
+        if (range is null)
+            return null;
+
+        var result = new DatesRangeDto
         {
-            { (1, 8), nameof(GtrWitsDto.DEPTBITM) },
-            { (1, 10), nameof(GtrWitsDto.DEPTMEAS) },
-            { (1, 14), nameof(GtrWitsDto.HKLA) },
-            { (1, 12), nameof(GtrWitsDto.BLKPOS) },
-            { (1, 16), nameof(GtrWitsDto.WOBA) },
-            { (1, 18), nameof(GtrWitsDto.TORQA) },
-            { (1, 21), nameof(GtrWitsDto.SPPA) },
-            { (2, 15), nameof(GtrWitsDto.RPMA) },
-            { (1, 13), nameof(GtrWitsDto.ROPA) },
-            { (3, 16), nameof(GtrWitsDto.RSUX) },
-            { (3, 17), nameof(GtrWitsDto.RSDX) },
-            { (1, 30), nameof(GtrWitsDto.MFIA) },
-            { (1, 29), nameof(GtrWitsDto.MFOA)},
-            { (1, 34), nameof(GtrWitsDto.MTIA) },
-            { (1, 33), nameof(GtrWitsDto.MTOA) },
-            { (1, 23), nameof(GtrWitsDto.SPM1) },
-            { (1, 24), nameof(GtrWitsDto.SPM2) },
-            { (1, 25), nameof(GtrWitsDto.SPM3) },
-            { (1, 26), nameof(GtrWitsDto.TVOLACT) },
-            { (11, 29), nameof(GtrWitsDto.TTVOL1) },
-            { (11, 30), nameof(GtrWitsDto.TTVOL2) },
-            { (11, 15), nameof(GtrWitsDto.TVOL01) },
-            { (11, 16), nameof(GtrWitsDto.TVOL02) },
-            { (11, 17), nameof(GtrWitsDto.TVOL03) },
-            { (11, 18), nameof(GtrWitsDto.TVOL04) },
-            { (11, 19), nameof(GtrWitsDto.TVOL05) },
-            { (11, 20), nameof(GtrWitsDto.TVOL06) },
-            { (11, 21), nameof(GtrWitsDto.TVOL07) },
-            { (11, 22), nameof(GtrWitsDto.TVOL08) },
-            { (11, 23), nameof(GtrWitsDto.TVOL09) },
-            { (11, 24), nameof(GtrWitsDto.TVOL10) },
-            { (11, 25), nameof(GtrWitsDto.TVOL11) },
-            { (11, 26), nameof(GtrWitsDto.TVOL12) },
-            { (11, 27), nameof(GtrWitsDto.TVOL13) },
-            { (11, 28), nameof(GtrWitsDto.TVOL14) },
-            { (1, 31), nameof(GtrWitsDto.MDOA) },
-            { (1, 32), nameof(GtrWitsDto.MDIA) },
-            { (12, 12), nameof(GtrWitsDto.METHANE) },
-            { (12, 13), nameof(GtrWitsDto.ETHANE) },
-            { (12, 14), nameof(GtrWitsDto.PROPANE) },
-            { (12, 15), nameof(GtrWitsDto.IBUTANE) },
-            { (12, 16), nameof(GtrWitsDto.NBUTANE) },
-            { (1, 40), nameof(GtrWitsDto.GASA) },
+            From = range.Min.ToOffset(telemetry.TimeZone!.Offset),
+            To = range.Max.ToOffset(telemetry.TimeZone!.Offset),
+        };
+        return result;
+    }
+
+    private async Task<IEnumerable<GtrWitsDto>> GetAsync<TEntity, TType>(int idWell, GtrRequest request, CancellationToken token)
+        where TEntity : WitsItemBase<TType>
+        where TType : notnull
+    {
+        var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
+
+        if (telemetry is null)
+            return Enumerable.Empty<GtrWitsDto>();
+
+        if (telemetry.TimeZone is null)
+            throw new ArgumentInvalidException(nameof(idWell), $"Telemetry id: {telemetry.Id} can't find timezone");
+
+        var query = BuildQuery<TEntity, TType>(telemetry.Id, request);
+
+        var idsRecord = WitsParameters.Select(p => p.Key.IdRecord);
+
+        var entities = await query
+            .Where(e => idsRecord.Contains(e.IdRecord))
+            .OrderBy(e => e.DateTime)
+            .AsNoTracking()
+            .ToArrayAsync(token);
+
+        if (!entities.Any())
+            return Enumerable.Empty<GtrWitsDto>();
+
+        var interval = TimeSpan.FromSeconds(10);
+        var timezoneOffset = TimeSpan.FromHours(telemetry.TimeZone.Hours);
+
+        var dtos = entities
+            .GroupBy(e => e.DateTime.Ticks / interval.Ticks)
+            .Select(groupByInterval =>
+            {
+                var items = groupByInterval.Select(e => e);
+                var values = items.GroupBy(e => (e.IdRecord, e.IdItem))
+                    .Where(group => WitsParameters.ContainsKey(group.Key))
+                    .ToDictionary(group => WitsParameters[group.Key], g => (object)g.Last().Value);
+
+                var dto = values.Adapt<GtrWitsDto>();
+                dto.DateTime = items.Last().DateTime.ToOffset(timezoneOffset);
+                return dto;
+            });
+
+        return dtos;
+    }
+
+    private IQueryable<TEntity> BuildQuery<TEntity, TType>(int idTelemetry, GtrRequest request)
+        where TEntity : WitsItemBase<TType>
+        where TType : notnull
+    {
+        var query = db.Set<TEntity>()
+            .Where(e => e.IdTelemetry == idTelemetry);
+
+        if (request.Begin.HasValue)
+        {
+            var dateBegin = request.Begin.Value.ToUniversalTime();
+            var dateEnd = dateBegin.AddSeconds(request.IntervalSec);
+            query = query
+                .Where(e => e.DateTime >= dateBegin)
+                .Where(e => e.DateTime <= dateEnd);
+        }
+        else
+        {
+            var lastDate = query
+                .OrderBy(e => e.DateTime)
+                .LastOrDefault()
+                ?.DateTime
+                ?? DateTimeOffset.UtcNow;
+            var dateBegin = lastDate.AddSeconds(-request.IntervalSec);
+            var dateEnd = lastDate;
+            query = query
+                .Where(e => e.DateTime >= dateBegin)
+                .Where(e => e.DateTime <= dateEnd);
+        }
+
+        return query;
+    }
+
+    [Obsolete]
+    public async Task<IEnumerable<WitsRecordDto>> GetAsync(int idWell, DateTime? dateBegin, double intervalSec = 600, int approxPointsCount = 1024, CancellationToken token = default)
+    {
+        var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
+        if (telemetry is null)
+            return Enumerable.Empty<WitsRecordDto>();
+
+        var timezone = telemetryService.GetTimezone(telemetry.Id);
+
+        DateTimeOffset? dateBeginUtc = dateBegin?.ToUtcDateTimeOffset(timezone.Hours);
+        var dateEnd = dateBeginUtc?.AddSeconds(intervalSec);
+
+        var witsRequest = new WitsRequest()
+        {
+            IdTelemetry = telemetry.Id,
+            DateBeginUtc = dateBeginUtc,
+            DateEnd = dateEnd,
+            ApproxPointsCount = approxPointsCount,
+            TimezoneHours = timezone.Hours
         };
 
-        private readonly IAsbCloudDbContext db;
-        private readonly ITelemetryService telemetryService;
-        private static ConcurrentDictionary<int, ConcurrentDictionary<(int, int), WitsItemRecordDto>> cache = new();
+        var recordAllInt = await GetItemsOrDefaultAsync<WitsItemInt, int>(witsRequest, token);
+        var recordAllFloat = await GetItemsOrDefaultAsync<WitsItemFloat, float>(witsRequest, token);
+        var recordAllString = await GetItemsOrDefaultAsync<WitsItemString, string>(witsRequest, token);
 
-        public GtrWitsRepository(
-            IAsbCloudDbContext db,
-            ITelemetryService telemetryService)
-        {
-            this.db = db;
-            this.telemetryService = telemetryService;
-        }
-
-        public async Task<IEnumerable<GtrWitsDto>> GetAsync(int idWell, GtrRequest request, CancellationToken token) =>
-            await GetAsync<WitsItemFloat, float>(idWell, request, token);
-
-        public async Task<DatesRangeDto?> GetRangeAsync(int idWell, DateTimeOffset? geDate, DateTimeOffset? leDate, CancellationToken token)
-        {
-            var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
-
-            if (telemetry is null)
-                return null;
-
-            var rangeQuery = db
-                .Set<WitsItemFloat>()
-                .Where(e => e.IdTelemetry == telemetry.Id);
-
-            if (geDate is not null)
-                rangeQuery = rangeQuery.Where(e => e.DateTime >= geDate);
-
-            if (leDate is not null)
-                rangeQuery = rangeQuery.Where(e => e.DateTime <= leDate);
-
-            var groupedQuery = rangeQuery.GroupBy(e => e.IdTelemetry)
-                .Select(group => new
+        var dtos = (recordAllFloat.Union(recordAllInt)).Union(recordAllString)
+            .GroupBy(g => new
+            {
+                g.IdRecord,
+                g.Date
+            })
+            .Select(g => new WitsRecordDto
+            {
+                Id = g.Key.IdRecord,
+                Date = g.Key.Date,
+                Items = g.Select(r => new
                 {
-                    Min = group.Min(e => e.DateTime),
-                    Max = group.Max(e => e.DateTime)
-                });
-            var range = await groupedQuery.FirstOrDefaultAsync(token);
-
-            if (range is null)
-                return null;
-
-            var result = new DatesRangeDto
-            {
-                From = range.Min.ToOffset(telemetry.TimeZone!.Offset),
-                To = range.Max.ToOffset(telemetry.TimeZone!.Offset),
-            };
-            return result;
-        }
-
-        private async Task<IEnumerable<GtrWitsDto>> GetAsync<TEntity, TType>(int idWell, GtrRequest request, CancellationToken token)
-            where TEntity : WitsItemBase<TType>
-            where TType : notnull
-        {
-            var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
-
-            if (telemetry is null)
-                return Enumerable.Empty<GtrWitsDto>();
-
-            if (telemetry.TimeZone is null)
-                throw new ArgumentInvalidException(nameof(idWell), $"Telemetry id: {telemetry.Id} can't find timezone");
-
-            var query = BuildQuery<TEntity, TType>(telemetry.Id, request);
-
-            var idsRecord = WitsParameters.Select(p => p.Key.IdRecord);
-
-            var entities = await query
-                .Where(e => idsRecord.Contains(e.IdRecord))
-                .OrderBy(e => e.DateTime)
-                .AsNoTracking()
-                .ToArrayAsync(token);
-
-            if (!entities.Any())
-                return Enumerable.Empty<GtrWitsDto>();
-
-            var interval = TimeSpan.FromSeconds(10);
-            var timezoneOffset = TimeSpan.FromHours(telemetry.TimeZone.Hours);
-
-            var dtos = entities
-                .GroupBy(e => e.DateTime.Ticks / interval.Ticks)
-                .Select(groupByInterval =>
-                {
-                    var items = groupByInterval.Select(e => e);
-                    var values = items.GroupBy(e => (e.IdRecord, e.IdItem))
-                        .Where(group => WitsParameters.ContainsKey(group.Key))
-                        .ToDictionary(group => WitsParameters[group.Key], g => (object)g.Last().Value);
-
-                    var dto = values.Adapt<GtrWitsDto>();
-                    dto.DateTime = items.Last().DateTime.ToOffset(timezoneOffset);
-                    return dto;
-                });
-
-            return dtos;
-        }
-
-        private IQueryable<TEntity> BuildQuery<TEntity, TType>(int idTelemetry, GtrRequest request)
-            where TEntity : WitsItemBase<TType>
-            where TType : notnull
-        {
-            var query = db.Set<TEntity>()
-                .Where(e => e.IdTelemetry == idTelemetry);
-
-            if (request.Begin.HasValue)
-            {
-                var dateBegin = request.Begin.Value.ToUniversalTime();
-                var dateEnd = dateBegin.AddSeconds(request.IntervalSec);
-                query = query
-                    .Where(e => e.DateTime >= dateBegin)
-                    .Where(e => e.DateTime <= dateEnd);
-            }
-            else
-            {
-                var lastDate = query
-                    .OrderBy(e => e.DateTime)
-                    .LastOrDefault()
-                    ?.DateTime
-                    ?? DateTimeOffset.UtcNow;
-                var dateBegin = lastDate.AddSeconds(-request.IntervalSec);
-                var dateEnd = lastDate;
-                query = query
-                    .Where(e => e.DateTime >= dateBegin)
-                    .Where(e => e.DateTime <= dateEnd);
-            }
-
-            return query;
-        }
-
-        [Obsolete]
-        public async Task<IEnumerable<WitsRecordDto>> GetAsync(int idWell, DateTime? dateBegin, double intervalSec = 600, int approxPointsCount = 1024, CancellationToken token = default)
-        {
-            var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
-            if (telemetry is null)
-                return Enumerable.Empty<WitsRecordDto>();
-
-            var timezone = telemetryService.GetTimezone(telemetry.Id);
-
-            DateTimeOffset? dateBeginUtc = dateBegin?.ToUtcDateTimeOffset(timezone.Hours);
-            var dateEnd = dateBeginUtc?.AddSeconds(intervalSec);
-
-            var witsRequest = new WitsRequest()
-            {
-                IdTelemetry = telemetry.Id,
-                DateBeginUtc = dateBeginUtc,
-                DateEnd = dateEnd,
-                ApproxPointsCount = approxPointsCount,
-                TimezoneHours = timezone.Hours
-            };
-
-            var recordAllInt = await GetItemsOrDefaultAsync<WitsItemInt, int>(witsRequest, token);
-            var recordAllFloat = await GetItemsOrDefaultAsync<WitsItemFloat, float>(witsRequest, token);
-            var recordAllString = await GetItemsOrDefaultAsync<WitsItemString, string>(witsRequest, token);
-
-            var dtos = (recordAllFloat.Union(recordAllInt)).Union(recordAllString)
-                .GroupBy(g => new
-                {
-                    g.IdRecord,
-                    g.Date
-                })
-                .Select(g => new WitsRecordDto
-                {
-                    Id = g.Key.IdRecord,
-                    Date = g.Key.Date,
-                    Items = g.Select(r => new
-                    {
-                        Key = r.IdItem,
-                        r.Value
-                    }).ToDictionary(x => x.Key, x => x.Value)
-                });
-            return dtos;
-        }
-
-        public IEnumerable<WitsItemRecordDto> GetLastDataByRecordId(int idWell, int idRecord)
-        {
-            var result = GetLastData(idWell)
-                .Where(item => item.IdRecord == idRecord);
-            return result;
-        }
-
-        public IEnumerable<WitsItemRecordDto> GetLastData(int idWell)
-        {
-            var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
-            if (telemetry is null)
-                return Enumerable.Empty<WitsItemRecordDto>();
-
-            var lastData = cache.GetValueOrDefault(telemetry.Id);
-            return lastData?.Values ?? Enumerable.Empty<WitsItemRecordDto>();
-        }
-
-        private async Task<IEnumerable<WitsItemRecordDto>> GetItemsOrDefaultAsync<TEntity, TValue>(
-            WitsRequest request,
-            CancellationToken token)
-            where TEntity : WitsItemBase<TValue>
-            where TValue : notnull
-        {
-            var query = BuildQuery<TEntity, TValue>(request);
-
-            var fullDataCount = await query.CountAsync(token);
-            if (fullDataCount == 0)
-                return Enumerable.Empty<WitsItemRecordDto>();
-
-            if (request.ApproxPointsCount is not null && fullDataCount > 1.75 * request.ApproxPointsCount)
-            {
-                var m = (int)Math.Round(1d * fullDataCount / request.ApproxPointsCount!.Value);
-                if (m > 1)
-                    query = query.Where((d) => (((d.DateTime.DayOfYear * 24 + d.DateTime.Hour) * 60 + d.DateTime.Minute) * 60 + d.DateTime.Second) % m == 0);
-            }
-
-            var entities = await query
-                .OrderBy(d => d.DateTime)
-                .AsNoTracking()
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-
-            var items = entities.Select(e => new WitsItemRecordDto
-            {
-                IdRecord = e.IdRecord,
-                Date = e.DateTime.ToRemoteDateTime(request.TimezoneHours),
-                IdItem = e.IdItem,
-                Value = new JsonValue(e.Value)
+                    Key = r.IdItem,
+                    r.Value
+                }).ToDictionary(x => x.Key, x => x.Value)
             });
-            return items;
+        return dtos;
+    }
+
+    public IEnumerable<WitsItemRecordDto> GetLastDataByRecordId(int idWell, int idRecord)
+    {
+        var result = GetLastData(idWell)
+            .Where(item => item.IdRecord == idRecord);
+        return result;
+    }
+
+    public IEnumerable<WitsItemRecordDto> GetLastData(int idWell)
+    {
+        var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
+        if (telemetry is null)
+            return Enumerable.Empty<WitsItemRecordDto>();
+
+        var lastData = cache.GetValueOrDefault(telemetry.Id);
+        return lastData?.Values ?? Enumerable.Empty<WitsItemRecordDto>();
+    }
+
+    private async Task<IEnumerable<WitsItemRecordDto>> GetItemsOrDefaultAsync<TEntity, TValue>(
+        WitsRequest request,
+        CancellationToken token)
+        where TEntity : WitsItemBase<TValue>
+        where TValue : notnull
+    {
+        var query = BuildQuery<TEntity, TValue>(request);
+
+        var fullDataCount = await query.CountAsync(token);
+        if (fullDataCount == 0)
+            return Enumerable.Empty<WitsItemRecordDto>();
+
+        if (request.ApproxPointsCount is not null && fullDataCount > 1.75 * request.ApproxPointsCount)
+        {
+            var m = (int)Math.Round(1d * fullDataCount / request.ApproxPointsCount!.Value);
+            if (m > 1)
+                query = query.Where((d) => (((d.DateTime.DayOfYear * 24 + d.DateTime.Hour) * 60 + d.DateTime.Minute) * 60 + d.DateTime.Second) % m == 0);
         }
 
-        private IQueryable<TEntity> BuildQuery<TEntity, TValue>(WitsRequest request)
-            where TEntity : WitsItemBase<TValue>
-            where TValue : notnull
+        var entities = await query
+            .OrderBy(d => d.DateTime)
+            .AsNoTracking()
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+
+        var items = entities.Select(e => new WitsItemRecordDto
         {
-            var query = db.Set<TEntity>().Where(i => i.IdTelemetry == request.IdTelemetry);
+            IdRecord = e.IdRecord,
+            Date = e.DateTime.ToRemoteDateTime(request.TimezoneHours),
+            IdItem = e.IdItem,
+            Value = new JsonValue(e.Value)
+        });
+        return items;
+    }
 
-            if (request.IdRecord is not null)
-                query = query
-                    .Where(d => d.IdRecord == request.IdRecord);
+    private IQueryable<TEntity> BuildQuery<TEntity, TValue>(WitsRequest request)
+        where TEntity : WitsItemBase<TValue>
+        where TValue : notnull
+    {
+        var query = db.Set<TEntity>().Where(i => i.IdTelemetry == request.IdTelemetry);
 
-            if (request.DateBeginUtc is not null)
-                query = query
-                    .Where(d => d.DateTime >= request.DateBeginUtc);
+        if (request.IdRecord is not null)
+            query = query
+                .Where(d => d.IdRecord == request.IdRecord);
 
-            if (request.DateEnd is not null)
-                query = query
-                    .Where(d => d.DateTime <= request.DateEnd);
+        if (request.DateBeginUtc is not null)
+            query = query
+                .Where(d => d.DateTime >= request.DateBeginUtc);
 
-            return query;
-        }
+        if (request.DateEnd is not null)
+            query = query
+                .Where(d => d.DateTime <= request.DateEnd);
 
-        public async Task SaveDataAsync(int idTelemetry, IEnumerable<WitsRecordDto> dtos, CancellationToken token)
+        return query;
+    }
+
+    public async Task SaveDataAsync(int idTelemetry, IEnumerable<WitsRecordDto> dtos, CancellationToken token)
+    {
+        var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours;
+
+        var cacheTelemetryItems = cache.GetValueOrDefault(idTelemetry);
+
+        var strings = new List<WitsItemString>(4);
+        var floats = new List<WitsItemFloat>(4);
+        var ints = new List<WitsItemInt>(4);
+
+        foreach (var record in dtos)
         {
-            var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours;
-
-            var cacheTelemetryItems = cache.GetValueOrDefault(idTelemetry);
-
-            var strings = new List<WitsItemString>(4);
-            var floats = new List<WitsItemFloat>(4);
-            var ints = new List<WitsItemInt>(4);
-
-            foreach (var record in dtos)
+            var dateTime = record.Date.ToUtcDateTimeOffset(timezoneHours);
+            foreach (var item in record.Items)
             {
-                var dateTime = record.Date.ToUtcDateTimeOffset(timezoneHours);
-                foreach (var item in record.Items)
-                {
-                    if (cacheTelemetryItems?.TryGetValue((record.Id, item.Key), out var cacheItem) == true)
-                        if (Math.Abs((dateTime - cacheItem.Date).TotalSeconds) < 1)
-                            continue;
+                if (cacheTelemetryItems?.TryGetValue((record.Id, item.Key), out var cacheItem) == true)
+                    if (Math.Abs((dateTime - cacheItem.Date).TotalSeconds) < 1)
+                        continue;
 
-                    if (item.Value.Value is string valueString)
-                    {
-                        var entity = MakeEntity<WitsItemString, string>(record.Id, item.Key, idTelemetry, dateTime, valueString);
-                        strings.Add(entity);
-                    }
-                    if (item.Value.Value is float valueFloat)
-                    {
-                        var entity = MakeEntity<WitsItemFloat, float>(record.Id, item.Key, idTelemetry, dateTime, valueFloat);
-                        floats.Add(entity);
-                    }
-                    if (item.Value.Value is int valueInt)
-                    {
-                        var entity = MakeEntity<WitsItemInt, int>(record.Id, item.Key, idTelemetry, dateTime, valueInt);
-                        ints.Add(entity);
-                    }
+                if (item.Value.Value is string valueString)
+                {
+                    var entity = MakeEntity<WitsItemString, string>(record.Id, item.Key, idTelemetry, dateTime, valueString);
+                    strings.Add(entity);
+                }
+                if (item.Value.Value is float valueFloat)
+                {
+                    var entity = MakeEntity<WitsItemFloat, float>(record.Id, item.Key, idTelemetry, dateTime, valueFloat);
+                    floats.Add(entity);
+                }
+                if (item.Value.Value is int valueInt)
+                {
+                    var entity = MakeEntity<WitsItemInt, int>(record.Id, item.Key, idTelemetry, dateTime, valueInt);
+                    ints.Add(entity);
                 }
             }
-
-            try
-            {
-                if (strings.Any())
-                    await db.Database.ExecInsertOrIgnoreAsync(db.Set<WitsItemString>(), strings, token);
-
-                if (floats.Any())
-                    await db.Database.ExecInsertOrIgnoreAsync(db.Set<WitsItemFloat>(), floats, token);
-
-                if (ints.Any())
-                    await db.Database.ExecInsertOrIgnoreAsync(db.Set<WitsItemInt>(), ints, token);
-            }
-            catch (Exception ex)
-            {
-                Trace.TraceError("Exception while saving GTR Wits data", ex);
-            }
-
-            cache.AddOrUpdate(idTelemetry,
-                (_) => MakeNewCache(dtos),
-                (_, oldItemsDictionary) =>
-                {
-                    foreach (var record in dtos)
-                        foreach (var item in record.Items)
-                        {
-                            oldItemsDictionary.AddOrUpdate(
-                                (record.Id, item.Key),
-                                (_) => new WitsItemRecordDto
-                                {
-                                    IdRecord = record.Id,
-                                    IdItem = item.Key,
-                                    Date = record.Date,
-                                    Value = item.Value
-                                },
-                                (_, _) => new WitsItemRecordDto
-                                {
-                                    IdRecord = record.Id,
-                                    IdItem = item.Key,
-                                    Date = record.Date,
-                                    Value = item.Value
-                                });
-                        }
-                    return oldItemsDictionary;
-                });
         }
 
-        private static ConcurrentDictionary<(int, int), WitsItemRecordDto> MakeNewCache(IEnumerable<WitsRecordDto> dtos)
+        try
         {
-            var items = dtos.SelectMany(record =>
-                record.Items.Select(
-                    item => new WitsItemRecordDto
+            if (strings.Any())
+                await db.Database.ExecInsertOrIgnoreAsync(db.Set<WitsItemString>(), strings, token);
+
+            if (floats.Any())
+                await db.Database.ExecInsertOrIgnoreAsync(db.Set<WitsItemFloat>(), floats, token);
+
+            if (ints.Any())
+                await db.Database.ExecInsertOrIgnoreAsync(db.Set<WitsItemInt>(), ints, token);
+        }
+        catch (Exception ex)
+        {
+            Trace.TraceError("Exception while saving GTR Wits data", ex);
+        }
+
+        cache.AddOrUpdate(idTelemetry,
+            (_) => MakeNewCache(dtos),
+            (_, oldItemsDictionary) =>
+            {
+                foreach (var record in dtos)
+                    foreach (var item in record.Items)
                     {
-                        IdItem = item.Key,
-                        IdRecord = record.Id,
-                        Date = record.Date,
-                        Value = item.Value,
-                    }));
+                        oldItemsDictionary.AddOrUpdate(
+                            (record.Id, item.Key),
+                            (_) => new WitsItemRecordDto
+                            {
+                                IdRecord = record.Id,
+                                IdItem = item.Key,
+                                Date = record.Date,
+                                Value = item.Value
+                            },
+                            (_, _) => new WitsItemRecordDto
+                            {
+                                IdRecord = record.Id,
+                                IdItem = item.Key,
+                                Date = record.Date,
+                                Value = item.Value
+                            });
+                    }
+                return oldItemsDictionary;
+            });
+    }
 
-            var groups = items
-                .GroupBy(item => (item.IdRecord, item.IdItem));
+    private static ConcurrentDictionary<(int, int), WitsItemRecordDto> MakeNewCache(IEnumerable<WitsRecordDto> dtos)
+    {
+        var items = dtos.SelectMany(record =>
+            record.Items.Select(
+                item => new WitsItemRecordDto
+                {
+                    IdItem = item.Key,
+                    IdRecord = record.Id,
+                    Date = record.Date,
+                    Value = item.Value,
+                }));
 
-            var pairs = groups.Select(group => new KeyValuePair<(int, int), WitsItemRecordDto>(
-                group.Key,
-                group.OrderByDescending(item => item.Date).First()));
+        var groups = items
+            .GroupBy(item => (item.IdRecord, item.IdItem));
 
-            return new ConcurrentDictionary<(int, int), WitsItemRecordDto>(pairs);
+        var pairs = groups.Select(group => new KeyValuePair<(int, int), WitsItemRecordDto>(
+            group.Key,
+            group.OrderByDescending(item => item.Date).First()));
+
+        return new ConcurrentDictionary<(int, int), WitsItemRecordDto>(pairs);
+    }
+
+    private static TEntity MakeEntity<TEntity, TValue>(int idRecord, int idItem, int idTelemetry, DateTimeOffset dateTime, TValue value)
+        where TEntity : WitsItemBase<TValue>, new()
+        where TValue : notnull
+    => new TEntity()
+    {
+        IdRecord = idRecord,
+        IdItem = idItem,
+        IdTelemetry = idTelemetry,
+        DateTime = dateTime,
+        Value = value,
+    };
+
+    private static TEntity MakeEntity<TEntity, TValue>(WitsItemRecordDto dto, int idTelemetry, DateTimeOffset dateTime)
+        where TEntity : WitsItemBase<TValue>, new()
+        where TValue : notnull
+    => new TEntity()
+    {
+        IdRecord = dto.IdRecord,
+        IdItem = dto.IdItem,
+        IdTelemetry = idTelemetry,
+        DateTime = dateTime,
+        Value = (TValue)dto.Value.Value,
+    };
+
+    private IQueryable<TEntity> BuildQuery<TEntity, TValue>(TelemetryPartDeleteRequest request)
+        where TEntity : WitsItemBase<TValue>
+        where TValue : notnull
+    {
+        var query = db.Set<TEntity>().Where(i => i.IdTelemetry == request.IdTelemetry);
+
+        if (request.LeDate is not null)
+        {
+            var leDate = request.LeDate.Value.ToUniversalTime();
+            query = query.Where(o => o.DateTime <= leDate);
         }
 
-        private static TEntity MakeEntity<TEntity, TValue>(int idRecord, int idItem, int idTelemetry, DateTimeOffset dateTime, TValue value)
-            where TEntity : WitsItemBase<TValue>, new()
-            where TValue : notnull
-        => new TEntity()
+        if (request.GeDate is not null)
         {
-            IdRecord = idRecord,
-            IdItem = idItem,
-            IdTelemetry = idTelemetry,
-            DateTime = dateTime,
-            Value = value,
-        };
-
-        private static TEntity MakeEntity<TEntity, TValue>(WitsItemRecordDto dto, int idTelemetry, DateTimeOffset dateTime)
-            where TEntity : WitsItemBase<TValue>, new()
-            where TValue : notnull
-        => new TEntity()
-        {
-            IdRecord = dto.IdRecord,
-            IdItem = dto.IdItem,
-            IdTelemetry = idTelemetry,
-            DateTime = dateTime,
-            Value = (TValue)dto.Value.Value,
-        };
-
-        private IQueryable<TEntity> BuildQuery<TEntity, TValue>(TelemetryPartDeleteRequest request)
-            where TEntity : WitsItemBase<TValue>
-            where TValue : notnull
-        {
-            var query = db.Set<TEntity>().Where(i => i.IdTelemetry == request.IdTelemetry);
-
-            if (request.LeDate is not null)
-            {
-                var leDate = request.LeDate.Value.ToUniversalTime();
-                query = query.Where(o => o.DateTime <= leDate);
-            }
-
-            if (request.GeDate is not null)
-            {
-                var geDate = request.GeDate.Value.ToUniversalTime();
-                query = query.Where(o => o.DateTime >= geDate);
-            }
-
-            return query;
+            var geDate = request.GeDate.Value.ToUniversalTime();
+            query = query.Where(o => o.DateTime >= geDate);
         }
 
-        public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
-        {
-            var result = 0;
-            result += await DeleteAsync<WitsItemFloat, float>(request, token);
-            result += await DeleteAsync<WitsItemInt, int>(request, token);
-            result += await DeleteAsync<WitsItemString, string>(request, token);
+        return query;
+    }
 
-            return result;
-        }
+    public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
+    {
+        var result = 0;
+        result += await DeleteAsync<WitsItemFloat, float>(request, token);
+        result += await DeleteAsync<WitsItemInt, int>(request, token);
+        result += await DeleteAsync<WitsItemString, string>(request, token);
 
-        private async Task<int> DeleteAsync<TEntity, TType>(TelemetryPartDeleteRequest request, CancellationToken token)
-            where TEntity : WitsItemBase<TType>
-            where TType : notnull
-        {
-            var query = BuildQuery<TEntity, TType>(request);
-            db.Set<TEntity>().RemoveRange(query);
-            return await db.SaveChangesAsync(token);
-        }
+        return result;
+    }
+
+    private async Task<int> DeleteAsync<TEntity, TType>(TelemetryPartDeleteRequest request, CancellationToken token)
+        where TEntity : WitsItemBase<TType>
+        where TType : notnull
+    {
+        var query = BuildQuery<TEntity, TType>(request);
+        db.Set<TEntity>().RemoveRange(query);
+        return await db.SaveChangesAsync(token);
+    }
 
 
-        private class WitsRequest
-        {
-            public int IdTelemetry { get; set; }
-            public DateTimeOffset? DateBeginUtc { get; set; }
-            public DateTimeOffset? DateEnd { get; set; }
-            public int? ApproxPointsCount { get; set; }
-            public double TimezoneHours { get; set; }
-            public int? IdRecord { get; set; }
-        }
+    private class WitsRequest
+    {
+        public int IdTelemetry { get; set; }
+        public DateTimeOffset? DateBeginUtc { get; set; }
+        public DateTimeOffset? DateEnd { get; set; }
+        public int? ApproxPointsCount { get; set; }
+        public double TimezoneHours { get; set; }
+        public int? IdRecord { get; set; }
     }
 }
diff --git a/AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs b/AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs
index 858558df..dd24e573 100644
--- a/AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs
+++ b/AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs
@@ -9,98 +9,96 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+public class LimitingParameterRepository : ILimitingParameterRepository
 {
+    private readonly IAsbCloudDbContext context;
 
-    public class LimitingParameterRepository : ILimitingParameterRepository
+    public LimitingParameterRepository(IAsbCloudDbContext context)
     {
-        private readonly IAsbCloudDbContext context;
-
-        public LimitingParameterRepository(IAsbCloudDbContext context)
-        {
-            this.context = context;
-        }
-
-        public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
-        {
-            var query = BuildQuery(request);
-            context.Set<LimitingParameter>().RemoveRange(query);
-            return await context.SaveChangesAsync(token);
-        }
-
-        public async Task<IEnumerable<LimitingParameterDataDto>> GetLimitingParametersAsync(LimitingParameterRequest request, WellDto wellDto, CancellationToken token)
-        {
-            var timezoneOffset = wellDto.Timezone.Hours;
-            var IdTelemetry = wellDto.IdTelemetry!.Value;
-            return await GetLimitingParametersAsync(request, IdTelemetry, timezoneOffset, token);
-        }
-
-        public async Task<IEnumerable<LimitingParameterDataDto>> GetLimitingParametersAsync(LimitingParameterRequest request, int idTelemetry, double timezoneHours, CancellationToken token)
-        {
-            var timezoneSpan = TimeSpan.FromHours(timezoneHours);
-            var query = BuildQuery(request, idTelemetry, timezoneHours);
-
-            var data = (await query.ToListAsync(token))
-                .Select(x => new LimitingParameterDataDto
-                {
-                    IdWell = request.IdWell,
-                    IdTelemetry = x.IdTelemetry,
-                    IdFeedRegulator = x.IdFeedRegulator,
-                    DateStart = x.DateStart.ToOffset(timezoneSpan),
-                    DateEnd = x.DateEnd.ToOffset(timezoneSpan),
-                    DepthStart = x.DepthStart,
-                    DepthEnd = x.DepthEnd
-                });
-            return data;
-        }
-
-        private IQueryable<LimitingParameter> BuildQuery(LimitingParameterRequest request, int idTelemetry, double timezoneHours)
-        {
-            var query = context.LimitingParameter
-                .OrderBy(x => x.Id)
-                .Where(x => x.IdTelemetry == idTelemetry)
-                .AsNoTracking();
-
-            if (request.GtDate.HasValue)
-            {
-                var gtDate = request.GtDate.Value.ToUniversalTime();
-                query = query.Where(x => x.DateEnd >= gtDate);
-            }
-
-            if (request.LtDate.HasValue)
-            {
-                var ltDate = request.LtDate.Value.ToUniversalTime();
-                query = query.Where(x => x.DateStart <= ltDate);
-            }
-
-            if (request.GtDepth.HasValue)
-                query = query.Where(x => x.DepthEnd >= request.GtDepth.Value);
-
-            if (request.LtDepth.HasValue)
-                query = query.Where(x => x.DepthStart <= request.LtDepth.Value);
-
-            return query;
-        }
-
-        private IQueryable<LimitingParameter> BuildQuery(TelemetryPartDeleteRequest request)
-        {
-            var query = context.Set<LimitingParameter>()
-                .Where(o => o.IdTelemetry == request.IdTelemetry);
-
-            if (request.LeDate is not null)
-            {
-                var leDate = request.LeDate.Value.ToUniversalTime();
-                query = query.Where(o => o.DateStart <= leDate);
-            }
-
-            if (request.GeDate is not null)
-            {
-                var geDate = request.GeDate.Value.ToUniversalTime();
-                query = query.Where(o => o.DateEnd >= geDate);
-            }
-
-            return query;
-        }
+        this.context = context;
     }
 
+    public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
+    {
+        var query = BuildQuery(request);
+        context.Set<LimitingParameter>().RemoveRange(query);
+        return await context.SaveChangesAsync(token);
+    }
+
+    public async Task<IEnumerable<LimitingParameterDataDto>> GetLimitingParametersAsync(LimitingParameterRequest request, WellDto wellDto, CancellationToken token)
+    {
+        var timezoneOffset = wellDto.Timezone.Hours;
+        var IdTelemetry = wellDto.IdTelemetry!.Value;
+        return await GetLimitingParametersAsync(request, IdTelemetry, timezoneOffset, token);
+    }
+
+    public async Task<IEnumerable<LimitingParameterDataDto>> GetLimitingParametersAsync(LimitingParameterRequest request, int idTelemetry, double timezoneHours, CancellationToken token)
+    {
+        var timezoneSpan = TimeSpan.FromHours(timezoneHours);
+        var query = BuildQuery(request, idTelemetry, timezoneHours);
+
+        var data = (await query.ToListAsync(token))
+            .Select(x => new LimitingParameterDataDto
+            {
+                IdWell = request.IdWell,
+                IdTelemetry = x.IdTelemetry,
+                IdFeedRegulator = x.IdFeedRegulator,
+                DateStart = x.DateStart.ToOffset(timezoneSpan),
+                DateEnd = x.DateEnd.ToOffset(timezoneSpan),
+                DepthStart = x.DepthStart,
+                DepthEnd = x.DepthEnd
+            });
+        return data;
+    }
+
+    private IQueryable<LimitingParameter> BuildQuery(LimitingParameterRequest request, int idTelemetry, double timezoneHours)
+    {
+        var query = context.LimitingParameter
+            .OrderBy(x => x.Id)
+            .Where(x => x.IdTelemetry == idTelemetry)
+            .AsNoTracking();
+
+        if (request.GtDate.HasValue)
+        {
+            var gtDate = request.GtDate.Value.ToUniversalTime();
+            query = query.Where(x => x.DateEnd >= gtDate);
+        }
+
+        if (request.LtDate.HasValue)
+        {
+            var ltDate = request.LtDate.Value.ToUniversalTime();
+            query = query.Where(x => x.DateStart <= ltDate);
+        }
+
+        if (request.GtDepth.HasValue)
+            query = query.Where(x => x.DepthEnd >= request.GtDepth.Value);
+
+        if (request.LtDepth.HasValue)
+            query = query.Where(x => x.DepthStart <= request.LtDepth.Value);
+
+        return query;
+    }
+
+    private IQueryable<LimitingParameter> BuildQuery(TelemetryPartDeleteRequest request)
+    {
+        var query = context.Set<LimitingParameter>()
+            .Where(o => o.IdTelemetry == request.IdTelemetry);
+
+        if (request.LeDate is not null)
+        {
+            var leDate = request.LeDate.Value.ToUniversalTime();
+            query = query.Where(o => o.DateStart <= leDate);
+        }
+
+        if (request.GeDate is not null)
+        {
+            var geDate = request.GeDate.Value.ToUniversalTime();
+            query = query.Where(o => o.DateEnd >= geDate);
+        }
+
+        return query;
+    }
 }
diff --git a/AsbCloudInfrastructure/Repository/QueryContainer.cs b/AsbCloudInfrastructure/Repository/QueryContainer.cs
index a2179e8b..1ade79d5 100644
--- a/AsbCloudInfrastructure/Repository/QueryContainer.cs
+++ b/AsbCloudInfrastructure/Repository/QueryContainer.cs
@@ -3,28 +3,26 @@ using Microsoft.EntityFrameworkCore;
 using System;
 using System.Linq;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+public class QueryContainer<TEntity> where TEntity : class, IId
 {
+    protected readonly IAsbCloudDbContext dbContext;
+    protected readonly DbSet<TEntity> dbSet;
+    protected readonly Func<IQueryable<TEntity>> GetQuery;
 
-    public class QueryContainer<TEntity> where TEntity : class, IId
+    public QueryContainer(IAsbCloudDbContext context)
     {
-        protected readonly IAsbCloudDbContext dbContext;
-        protected readonly DbSet<TEntity> dbSet;
-        protected readonly Func<IQueryable<TEntity>> GetQuery;
-
-        public QueryContainer(IAsbCloudDbContext context)
-        {
-            dbContext = context;
-            dbSet = context.Set<TEntity>();
-            GetQuery = () => dbSet;
-        }
-
-        public QueryContainer(IAsbCloudDbContext context, Func<DbSet<TEntity>, IQueryable<TEntity>> makeQuery)
-        {
-            dbContext = context;
-            dbSet = context.Set<TEntity>();
-            GetQuery = () => makeQuery(dbSet);
-        }
+        dbContext = context;
+        dbSet = context.Set<TEntity>();
+        GetQuery = () => dbSet;
     }
 
+    public QueryContainer(IAsbCloudDbContext context, Func<DbSet<TEntity>, IQueryable<TEntity>> makeQuery)
+    {
+        dbContext = context;
+        dbSet = context.Set<TEntity>();
+        GetQuery = () => makeQuery(dbSet);
+    }
 }
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Repository/ScheduleRepository.cs b/AsbCloudInfrastructure/Repository/ScheduleRepository.cs
index cbafa45a..d4e5001a 100644
--- a/AsbCloudInfrastructure/Repository/ScheduleRepository.cs
+++ b/AsbCloudInfrastructure/Repository/ScheduleRepository.cs
@@ -10,93 +10,91 @@ using System.Threading.Tasks;
 using AsbCloudApp.Requests;
 using Mapster;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+public class ScheduleRepository : CrudWellRelatedRepositoryBase<ScheduleDto, Schedule>, 
+    IScheduleRepository
 {
+    private readonly IWellService wellService;
 
-    public class ScheduleRepository : CrudWellRelatedRepositoryBase<ScheduleDto, Schedule>, 
-        IScheduleRepository
+    public ScheduleRepository(IAsbCloudDbContext context, IWellService wellService)
+        : base(context, dbSet => dbSet.Include(s => s.Driller))
     {
-        private readonly IWellService wellService;
-
-        public ScheduleRepository(IAsbCloudDbContext context, IWellService wellService)
-            : base(context, dbSet => dbSet.Include(s => s.Driller))
-        {
-            this.wellService = wellService;
-        }
-
-        public async Task<IEnumerable<ScheduleDto>> GetAsync(int idWell, DateTimeOffset workTime, CancellationToken token)
-        {
-            var entities = await BuildQuery(idWell, workTime)
-                .AsNoTracking()
-                .ToArrayAsync(token);
-
-            return entities.Select(Convert);
-        }
-
-        public async Task<DrillerDto?> GetOrDefaultDrillerAsync(int idWell, DateTimeOffset workTime, CancellationToken token)
-        {
-            var entities = await BuildQuery(idWell, workTime)
-                .AsNoTracking()
-                .ToArrayAsync(token);
-
-            if (!entities.Any())
-                return null;
-            
-            var hoursOffset = wellService.GetTimezone(idWell).Hours;
-            var time = new TimeOnly(workTime.Hour, workTime.Minute, workTime.Second);
-            
-            var entity = entities.FirstOrDefault(s =>
-                s.ShiftStart > s.ShiftEnd ^
-                (time >= s.ShiftStart && time < s.ShiftEnd)
-            );
-            
-            return entity?.Driller.Adapt<DrillerDto>();
-        }
-
-        public async Task<IEnumerable<ScheduleDto>> GetPageAsync(GetStatRequest request, CancellationToken token)
-        {
-            var idWell = request.IdsWells;
-            var idsDrillers = request.IdsDrillers;
-            var query =  GetQuery().Where(s =>  request.IdsWells.Contains(s.IdWell));
-            if (idsDrillers.Any())
-            {
-                query = query.Where(s => idsDrillers.Contains(s.IdDriller));
-            }
-
-            var result = await query.ToArrayAsync(token);
-            return result.Select(Convert);
-
-        }
-
-        private IQueryable<Schedule> BuildQuery(int idWell, DateTimeOffset workTime)
-        {
-            var hoursOffset = wellService.GetTimezone(idWell).Hours;
-
-            var workTimeDateTime = workTime.ToUniversalTime();
-            
-            return GetQuery().Where(s => s.IdWell == idWell
-                                  && s.DrillStart <= workTimeDateTime
-                                  && s.DrillEnd >= workTimeDateTime);
-        }
-
-        protected override Schedule Convert(ScheduleDto dto)
-        {
-            var entity = base.Convert(dto);
-            entity.DrillStart = dto.DrillStart.ToUniversalTime();
-            entity.DrillEnd = dto.DrillEnd.ToUniversalTime();
-            return entity;
-        }
-
-        protected override ScheduleDto Convert(Schedule entity)
-        {
-            var hoursOffset = wellService.GetTimezone(entity.IdWell).Hours;
-            var timeSpan = TimeSpan.FromHours(hoursOffset);
-
-            var dto = base.Convert(entity);
-            dto.DrillStart = entity.DrillStart.ToOffset(timeSpan);
-            dto.DrillEnd = entity.DrillEnd.ToOffset(timeSpan);
-            return dto;
-        }
+        this.wellService = wellService;
     }
 
+    public async Task<IEnumerable<ScheduleDto>> GetAsync(int idWell, DateTimeOffset workTime, CancellationToken token)
+    {
+        var entities = await BuildQuery(idWell, workTime)
+            .AsNoTracking()
+            .ToArrayAsync(token);
+
+        return entities.Select(Convert);
+    }
+
+    public async Task<DrillerDto?> GetOrDefaultDrillerAsync(int idWell, DateTimeOffset workTime, CancellationToken token)
+    {
+        var entities = await BuildQuery(idWell, workTime)
+            .AsNoTracking()
+            .ToArrayAsync(token);
+
+        if (!entities.Any())
+            return null;
+        
+        var hoursOffset = wellService.GetTimezone(idWell).Hours;
+        var time = new TimeOnly(workTime.Hour, workTime.Minute, workTime.Second);
+        
+        var entity = entities.FirstOrDefault(s =>
+            s.ShiftStart > s.ShiftEnd ^
+            (time >= s.ShiftStart && time < s.ShiftEnd)
+        );
+        
+        return entity?.Driller.Adapt<DrillerDto>();
+    }
+
+    public async Task<IEnumerable<ScheduleDto>> GetPageAsync(GetStatRequest request, CancellationToken token)
+    {
+        var idWell = request.IdsWells;
+        var idsDrillers = request.IdsDrillers;
+        var query =  GetQuery().Where(s =>  request.IdsWells.Contains(s.IdWell));
+        if (idsDrillers.Any())
+        {
+            query = query.Where(s => idsDrillers.Contains(s.IdDriller));
+        }
+
+        var result = await query.ToArrayAsync(token);
+        return result.Select(Convert);
+
+    }
+
+    private IQueryable<Schedule> BuildQuery(int idWell, DateTimeOffset workTime)
+    {
+        var hoursOffset = wellService.GetTimezone(idWell).Hours;
+
+        var workTimeDateTime = workTime.ToUniversalTime();
+        
+        return GetQuery().Where(s => s.IdWell == idWell
+                              && s.DrillStart <= workTimeDateTime
+                              && s.DrillEnd >= workTimeDateTime);
+    }
+
+    protected override Schedule Convert(ScheduleDto dto)
+    {
+        var entity = base.Convert(dto);
+        entity.DrillStart = dto.DrillStart.ToUniversalTime();
+        entity.DrillEnd = dto.DrillEnd.ToUniversalTime();
+        return entity;
+    }
+
+    protected override ScheduleDto Convert(Schedule entity)
+    {
+        var hoursOffset = wellService.GetTimezone(entity.IdWell).Hours;
+        var timeSpan = TimeSpan.FromHours(hoursOffset);
+
+        var dto = base.Convert(entity);
+        dto.DrillStart = entity.DrillStart.ToOffset(timeSpan);
+        dto.DrillEnd = entity.DrillEnd.ToOffset(timeSpan);
+        return dto;
+    }
 }
diff --git a/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs b/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs
index 027b2565..02608bd8 100644
--- a/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs
+++ b/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs
@@ -10,71 +10,69 @@ using System.Threading;
 using System.Linq;
 using AsbCloudApp.Exceptions;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+public class SetpointsRequestRepository : CrudWellRelatedCacheRepositoryBase<SetpointsRequestDto, SetpointsRequest>
 {
+    private readonly IWellService wellService;
 
-    public class SetpointsRequestRepository : CrudWellRelatedCacheRepositoryBase<SetpointsRequestDto, SetpointsRequest>
+    public SetpointsRequestRepository(IAsbCloudDbContext dbContext, IMemoryCache memoryCache, IWellService wellService) 
+        : base(dbContext, memoryCache, q => q.Include(s => s.Author)
+                                .Include(s => s.Well))
     {
-        private readonly IWellService wellService;
-
-        public SetpointsRequestRepository(IAsbCloudDbContext dbContext, IMemoryCache memoryCache, IWellService wellService) 
-            : base(dbContext, memoryCache, q => q.Include(s => s.Author)
-                                    .Include(s => s.Well))
-        {
-            this.wellService = wellService;
-        }
-
-        //TODO: заметка для рефакторинга. Использовать метод из базового репозитория
-        public virtual async Task<int> UpdateRangeAsync(IEnumerable<SetpointsRequestDto> dtos, CancellationToken token)
-        {
-            if (!dtos.Any())
-                return 0;
-            
-            var ids = dtos
-                .Select(o => o.Id)
-                .Distinct()
-                .ToArray();
-            
-            if (ids.Any(id => id == default))
-                throw new ArgumentInvalidException(nameof(dtos), "Все записи должны иметь Id");
-            
-            if (ids.Length != dtos.Count())
-                throw new ArgumentInvalidException(nameof(dtos), "Все записи должны иметь уникальные Id");
-            
-            var existingEntitiesCount = await dbContext.Set<SetpointsRequest>()
-                .Where(o => ids.Contains(o.Id))
-                .CountAsync(token);
-            
-            if (ids.Length != existingEntitiesCount)
-                throw new ArgumentInvalidException(nameof(dtos), "Все записи должны существовать в БД");
-
-            var entities = dtos.Select(Convert);
-            var entries = entities.Select(entity => dbContext.Set<SetpointsRequest>().Update(entity)).ToList();
-
-            var affected = await dbContext.SaveChangesAsync(token);
-            
-            entries.ForEach(entry => entry.State = EntityState.Detached);
-
-            if(affected > 0) 
-                DropCache();
-            
-            return affected;
-        }
-
-        protected override SetpointsRequestDto Convert(SetpointsRequest src)
-        {
-            var result = base.Convert(src);
-            var timezoneOffsetHours = wellService.GetTimezone(src.IdWell).Hours;
-            result.UploadDate = src.UploadDate.ToOffset(TimeSpan.FromHours(timezoneOffsetHours));
-            return result;
-        }
-
-        protected override SetpointsRequest Convert(SetpointsRequestDto src)
-        {
-            var result = base.Convert(src);
-            result.UploadDate = src.UploadDate.ToUniversalTime();
-            return result;
-        }
+        this.wellService = wellService;
     }
 
+    //TODO: заметка для рефакторинга. Использовать метод из базового репозитория
+    public virtual async Task<int> UpdateRangeAsync(IEnumerable<SetpointsRequestDto> dtos, CancellationToken token)
+    {
+        if (!dtos.Any())
+            return 0;
+        
+        var ids = dtos
+            .Select(o => o.Id)
+            .Distinct()
+            .ToArray();
+        
+        if (ids.Any(id => id == default))
+            throw new ArgumentInvalidException(nameof(dtos), "Все записи должны иметь Id");
+        
+        if (ids.Length != dtos.Count())
+            throw new ArgumentInvalidException(nameof(dtos), "Все записи должны иметь уникальные Id");
+        
+        var existingEntitiesCount = await dbContext.Set<SetpointsRequest>()
+            .Where(o => ids.Contains(o.Id))
+            .CountAsync(token);
+        
+        if (ids.Length != existingEntitiesCount)
+            throw new ArgumentInvalidException(nameof(dtos), "Все записи должны существовать в БД");
+
+        var entities = dtos.Select(Convert);
+        var entries = entities.Select(entity => dbContext.Set<SetpointsRequest>().Update(entity)).ToList();
+
+        var affected = await dbContext.SaveChangesAsync(token);
+        
+        entries.ForEach(entry => entry.State = EntityState.Detached);
+
+        if(affected > 0) 
+            DropCache();
+        
+        return affected;
+    }
+
+    protected override SetpointsRequestDto Convert(SetpointsRequest src)
+    {
+        var result = base.Convert(src);
+        var timezoneOffsetHours = wellService.GetTimezone(src.IdWell).Hours;
+        result.UploadDate = src.UploadDate.ToOffset(TimeSpan.FromHours(timezoneOffsetHours));
+        return result;
+    }
+
+    protected override SetpointsRequest Convert(SetpointsRequestDto src)
+    {
+        var result = base.Convert(src);
+        result.UploadDate = src.UploadDate.ToUniversalTime();
+        return result;
+    }
 }
diff --git a/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs b/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs
index c57fc57c..032dfc65 100644
--- a/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs
+++ b/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs
@@ -11,100 +11,98 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+public class TelemetryWirelineRunOutRepository : ITelemetryWirelineRunOutRepository
 {
+    private readonly IAsbCloudDbContext context;
+    private readonly ITelemetryService telemetryService;
+    private readonly IWellService wellService;
 
-    public class TelemetryWirelineRunOutRepository : ITelemetryWirelineRunOutRepository
+    public TelemetryWirelineRunOutRepository(IAsbCloudDbContext context, 
+        ITelemetryService telemetryService,
+        IWellService wellService)
     {
-        private readonly IAsbCloudDbContext context;
-        private readonly ITelemetryService telemetryService;
-        private readonly IWellService wellService;
-
-        public TelemetryWirelineRunOutRepository(IAsbCloudDbContext context, 
-            ITelemetryService telemetryService,
-            IWellService wellService)
-        {
-            this.context = context;
-            this.telemetryService = telemetryService;
-            this.wellService = wellService;
-        }
-
-        /// <inheritdoc/>
-        public async Task<int> AddOrUpdateAsync(string uid, TelemetryWirelineRunOutBaseDto dto, CancellationToken token)
-        {
-            var idTelemetry = telemetryService.GetOrCreateTelemetryByUid(uid).Id;
-            var timezoneOffset = telemetryService.GetTimezone(idTelemetry).Hours;
-            var entity = Convert(idTelemetry, dto, timezoneOffset);
-            
-            if (await context.TelemetryWirelineRunOut.AnyAsync(w => w.IdTelemetry == idTelemetry, token))
-                context.TelemetryWirelineRunOut.Update(entity);
-            else
-                context.TelemetryWirelineRunOut.Add(entity);
-
-            return await context.SaveChangesAsync(token);
-        }
-
-        /// <inheritdoc/>
-        public async Task<TelemetryWirelineRunOutDto?> GetOrDefaultAsync(int idWell, CancellationToken token)
-        {
-            var well = await wellService.GetOrDefaultAsync(idWell, token).ConfigureAwait(false);
-            if (well is null)
-                return null;
-
-            return await GetOrDefaultAsync(well, token);
-        }
-
-        private async Task<TelemetryWirelineRunOutDto?> GetOrDefaultAsync(WellDto well, CancellationToken token)
-        {
-            var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(well.Id);
-            if (telemetry is null)
-                return null;
-
-            var entity = await context.TelemetryWirelineRunOut
-                .Where(x => x.IdTelemetry == telemetry.Id)
-                .AsNoTracking()
-                .FirstOrDefaultAsync(token)
-                .ConfigureAwait(false);
-
-            if (entity is null)
-                return null;
-
-            var timezoneHours = well.Timezone.Hours;
-            return Convert(entity, well, timezoneHours);
-        }
-
-        /// <inheritdoc/>
-        public async Task<IEnumerable<TelemetryWirelineRunOutDto>> GetAllAsync(int idCompany, CancellationToken token)
-        {
-            var wells = await wellService.GetAsync(new() { IdCompany = idCompany }, token)
-                .ConfigureAwait(false);
-
-            var result = new List<TelemetryWirelineRunOutDto>(wells.Count());
-            foreach (var well in wells)
-            {
-                var dto = await GetOrDefaultAsync(well, token);
-                if (dto is not null)
-                    result.Add(dto);
-            }
-
-            return result;
-        }
-
-        private static TelemetryWirelineRunOut Convert(int idTelemetry, TelemetryWirelineRunOutBaseDto dto, double timezoneOffset)
-        {
-            var entity = dto.Adapt<TelemetryWirelineRunOut>();
-            entity.IdTelemetry = idTelemetry;
-            entity.DateTime = dto.DateTime.ToUniversalTime();
-            return entity;
-        }
-
-        private static TelemetryWirelineRunOutDto Convert(TelemetryWirelineRunOut entity, WellDto well, double timezoneOffset)
-        {
-            var dto = entity.Adapt<TelemetryWirelineRunOutDto>();
-            dto.DateTime = entity.DateTime.ToOffset(TimeSpan.FromHours(timezoneOffset));
-            dto.WellInfo = well;
-            return dto;
-        }
+        this.context = context;
+        this.telemetryService = telemetryService;
+        this.wellService = wellService;
     }
 
+    /// <inheritdoc/>
+    public async Task<int> AddOrUpdateAsync(string uid, TelemetryWirelineRunOutBaseDto dto, CancellationToken token)
+    {
+        var idTelemetry = telemetryService.GetOrCreateTelemetryByUid(uid).Id;
+        var timezoneOffset = telemetryService.GetTimezone(idTelemetry).Hours;
+        var entity = Convert(idTelemetry, dto, timezoneOffset);
+        
+        if (await context.TelemetryWirelineRunOut.AnyAsync(w => w.IdTelemetry == idTelemetry, token))
+            context.TelemetryWirelineRunOut.Update(entity);
+        else
+            context.TelemetryWirelineRunOut.Add(entity);
+
+        return await context.SaveChangesAsync(token);
+    }
+
+    /// <inheritdoc/>
+    public async Task<TelemetryWirelineRunOutDto?> GetOrDefaultAsync(int idWell, CancellationToken token)
+    {
+        var well = await wellService.GetOrDefaultAsync(idWell, token).ConfigureAwait(false);
+        if (well is null)
+            return null;
+
+        return await GetOrDefaultAsync(well, token);
+    }
+
+    private async Task<TelemetryWirelineRunOutDto?> GetOrDefaultAsync(WellDto well, CancellationToken token)
+    {
+        var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(well.Id);
+        if (telemetry is null)
+            return null;
+
+        var entity = await context.TelemetryWirelineRunOut
+            .Where(x => x.IdTelemetry == telemetry.Id)
+            .AsNoTracking()
+            .FirstOrDefaultAsync(token)
+            .ConfigureAwait(false);
+
+        if (entity is null)
+            return null;
+
+        var timezoneHours = well.Timezone.Hours;
+        return Convert(entity, well, timezoneHours);
+    }
+
+    /// <inheritdoc/>
+    public async Task<IEnumerable<TelemetryWirelineRunOutDto>> GetAllAsync(int idCompany, CancellationToken token)
+    {
+        var wells = await wellService.GetAsync(new() { IdCompany = idCompany }, token)
+            .ConfigureAwait(false);
+
+        var result = new List<TelemetryWirelineRunOutDto>(wells.Count());
+        foreach (var well in wells)
+        {
+            var dto = await GetOrDefaultAsync(well, token);
+            if (dto is not null)
+                result.Add(dto);
+        }
+
+        return result;
+    }
+
+    private static TelemetryWirelineRunOut Convert(int idTelemetry, TelemetryWirelineRunOutBaseDto dto, double timezoneOffset)
+    {
+        var entity = dto.Adapt<TelemetryWirelineRunOut>();
+        entity.IdTelemetry = idTelemetry;
+        entity.DateTime = dto.DateTime.ToUniversalTime();
+        return entity;
+    }
+
+    private static TelemetryWirelineRunOutDto Convert(TelemetryWirelineRunOut entity, WellDto well, double timezoneOffset)
+    {
+        var dto = entity.Adapt<TelemetryWirelineRunOutDto>();
+        dto.DateTime = entity.DateTime.ToOffset(TimeSpan.FromHours(timezoneOffset));
+        dto.WellInfo = well;
+        return dto;
+    }
 }
diff --git a/AsbCloudInfrastructure/Repository/TrajectoryEditableRepository.cs b/AsbCloudInfrastructure/Repository/TrajectoryEditableRepository.cs
index 6233dfc3..4b45a9ea 100644
--- a/AsbCloudInfrastructure/Repository/TrajectoryEditableRepository.cs
+++ b/AsbCloudInfrastructure/Repository/TrajectoryEditableRepository.cs
@@ -12,108 +12,107 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+/// <summary>
+/// CRUD-репозиторий для работы с траекториями (плановыми и фактическими)
+/// </summary>
+/// <typeparam name="TEntity"></typeparam>
+/// <typeparam name="Tdto"></typeparam>
+public class TrajectoryEditableRepository<TEntity, Tdto> : ITrajectoryEditableRepository<Tdto>
+    where TEntity : Trajectory
+    where Tdto : TrajectoryGeoDto
 {
-    /// <summary>
-    /// CRUD-репозиторий для работы с траекториями (плановыми и фактическими)
-    /// </summary>
-    /// <typeparam name="TEntity"></typeparam>
-    /// <typeparam name="Tdto"></typeparam>
-    public class TrajectoryEditableRepository<TEntity, Tdto> : ITrajectoryEditableRepository<Tdto>
-        where TEntity : Trajectory
-        where Tdto : TrajectoryGeoDto
+    private readonly IAsbCloudDbContext db;
+    private readonly IWellService wellService;
+    public TrajectoryEditableRepository(IAsbCloudDbContext db, IWellService wellService)
     {
-        private readonly IAsbCloudDbContext db;
-        private readonly IWellService wellService;
-        public TrajectoryEditableRepository(IAsbCloudDbContext db, IWellService wellService)
-        {
-            this.db = db;
-            this.wellService = wellService;
-        }
+        this.db = db;
+        this.wellService = wellService;
+    }
 
-        public async Task<int> AddRangeAsync(IEnumerable<Tdto> trajectoryRows, CancellationToken token)
-        {
-            var idWell = trajectoryRows.First().IdWell;
-            if (!trajectoryRows.All(r => r.IdWell == idWell))
-                throw new ArgumentInvalidException(nameof(trajectoryRows), "Все строки должны относиться к одной скважине");
+    public async Task<int> AddRangeAsync(IEnumerable<Tdto> trajectoryRows, CancellationToken token)
+    {
+        var idWell = trajectoryRows.First().IdWell;
+        if (!trajectoryRows.All(r => r.IdWell == idWell))
+            throw new ArgumentInvalidException(nameof(trajectoryRows), "Все строки должны относиться к одной скважине");
 
-            var entities = trajectoryRows
-                .Select(e =>
-                {
-                    var entity = Convert(e);
-                    entity.Id = 0;
-                    return entity;
-                });
+        var entities = trajectoryRows
+            .Select(e =>
+            {
+                var entity = Convert(e);
+                entity.Id = 0;
+                return entity;
+            });
 
-            db.Set<TEntity>().AddRange(entities);
-            return await db.SaveChangesAsync(token);
-        }
+        db.Set<TEntity>().AddRange(entities);
+        return await db.SaveChangesAsync(token);
+    }
 
-        public async Task<int> AddAsync(Tdto trajectoryRow, CancellationToken token)
-        {
-            var entity = Convert(trajectoryRow);
-            entity.Id = 0;
-            db.Set<TEntity>().Add(entity);
-            return await db.SaveChangesAsync(token)
-                .ConfigureAwait(false);
-        }
+    public async Task<int> AddAsync(Tdto trajectoryRow, CancellationToken token)
+    {
+        var entity = Convert(trajectoryRow);
+        entity.Id = 0;
+        db.Set<TEntity>().Add(entity);
+        return await db.SaveChangesAsync(token)
+            .ConfigureAwait(false);
+    }
 
-        public async Task<int> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token)
-        {
-            var query = db.Set<TEntity>()
-                .Where(e => ids.Contains(e.Id));
-            db.Set<TEntity>().RemoveRange(query);
-            return await db.SaveChangesAsync(token)
-                .ConfigureAwait(false);
-        }
+    public async Task<int> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token)
+    {
+        var query = db.Set<TEntity>()
+            .Where(e => ids.Contains(e.Id));
+        db.Set<TEntity>().RemoveRange(query);
+        return await db.SaveChangesAsync(token)
+            .ConfigureAwait(false);
+    }
 
-        public async Task<int> DeleteByIdWellAsync(int idWell, CancellationToken token)
-        {
-            var query = db.Set<TEntity>()
-                .Where(e => e.IdWell == idWell);
-            db.Set<TEntity>().RemoveRange(query);
-            return await db.SaveChangesAsync(token)
-                .ConfigureAwait(false);
-        }
+    public async Task<int> DeleteByIdWellAsync(int idWell, CancellationToken token)
+    {
+        var query = db.Set<TEntity>()
+            .Where(e => e.IdWell == idWell);
+        db.Set<TEntity>().RemoveRange(query);
+        return await db.SaveChangesAsync(token)
+            .ConfigureAwait(false);
+    }
 
-        public async Task<IEnumerable<Tdto>> GetAsync(int idWell, CancellationToken token)
-        {
-            var well = wellService.GetOrDefault(idWell)
-                ?? throw new ArgumentInvalidException(nameof(idWell), "idWell doesn`t exist");
+    public async Task<IEnumerable<Tdto>> GetAsync(int idWell, CancellationToken token)
+    {
+        var well = wellService.GetOrDefault(idWell)
+            ?? throw new ArgumentInvalidException(nameof(idWell), "idWell doesn`t exist");
 
-            var offsetHours = well.Timezone.Hours;
-            var query = db.Set<TEntity>()
-                .AsNoTracking()
-                .Where(x => x.IdWell == well.Id);
-            var entities = await query
-                .OrderBy(e => e.WellboreDepth)
-                .ToArrayAsync(token);
+        var offsetHours = well.Timezone.Hours;
+        var query = db.Set<TEntity>()
+            .AsNoTracking()
+            .Where(x => x.IdWell == well.Id);
+        var entities = await query
+            .OrderBy(e => e.WellboreDepth)
+            .ToArrayAsync(token);
 
-            var result = entities
-                .Select(r => Convert(r, offsetHours));
-            return result;
-        }
+        var result = entities
+            .Select(r => Convert(r, offsetHours));
+        return result;
+    }
 
-        public async Task<int> UpdateAsync(Tdto row, CancellationToken token)
-        {
-            var entity = Convert(row);
-            db.Set<TEntity>().Update(entity);
-            return await db.SaveChangesAsync(token)
-                .ConfigureAwait(false);
-        }
+    public async Task<int> UpdateAsync(Tdto row, CancellationToken token)
+    {
+        var entity = Convert(row);
+        db.Set<TEntity>().Update(entity);
+        return await db.SaveChangesAsync(token)
+            .ConfigureAwait(false);
+    }
 
-        private static Tdto Convert(TEntity entity, double offsetHours)
-        {
-            var dto = entity.Adapt<Tdto>();
-            dto.UpdateDate = entity.UpdateDate.ToOffset(TimeSpan.FromHours(offsetHours));
-            return dto;
-        }
+    private static Tdto Convert(TEntity entity, double offsetHours)
+    {
+        var dto = entity.Adapt<Tdto>();
+        dto.UpdateDate = entity.UpdateDate.ToOffset(TimeSpan.FromHours(offsetHours));
+        return dto;
+    }
 
-        private static TEntity Convert(Tdto dto)
-        {
-            var entity = dto.Adapt<TEntity>();
-            entity.UpdateDate = DateTimeOffset.UtcNow;
-            return entity;
-        }
+    private static TEntity Convert(Tdto dto)
+    {
+        var entity = dto.Adapt<TEntity>();
+        entity.UpdateDate = DateTimeOffset.UtcNow;
+        return entity;
     }
 }
diff --git a/AsbCloudInfrastructure/Repository/TrajectoryNnbRepository.cs b/AsbCloudInfrastructure/Repository/TrajectoryNnbRepository.cs
index 1bd3ca2a..fe17315d 100644
--- a/AsbCloudInfrastructure/Repository/TrajectoryNnbRepository.cs
+++ b/AsbCloudInfrastructure/Repository/TrajectoryNnbRepository.cs
@@ -11,78 +11,77 @@ using System.Threading;
 using System.Threading.Tasks;
 using AsbCloudApp.Services;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+public class TrajectoryNnbRepository : ITrajectoryNnbRepository
 {
-    public class TrajectoryNnbRepository : ITrajectoryNnbRepository
+    private readonly IAsbCloudDbContext db;
+    private readonly IWellService wellService;
+    
+    public TrajectoryNnbRepository(IAsbCloudDbContext db,
+        IWellService wellService)
     {
-        private readonly IAsbCloudDbContext db;
-        private readonly IWellService wellService;
-        
-        public TrajectoryNnbRepository(IAsbCloudDbContext db,
-            IWellService wellService)
+        this.db = db;
+        this.wellService = wellService;
+    }
+
+    private IQueryable<Record7> BuildQuery(TrajectoryRequest request)
+    {
+        var well = db.Wells.SingleOrDefault(w => w.Id == request.IdWell);
+        var timezone = wellService.GetTimezone(request.IdWell);
+
+        if (well is null)
+            throw new ArgumentInvalidException($"Скважина с Id: {request.IdWell} не найдена", nameof(request.IdWell));
+
+        var query = db.Record7.Where(r => r.IdTelemetry == well.IdTelemetry)
+            .Where(x => x.IdTelemetry == well.IdTelemetry);
+
+        if (request.GeDate.HasValue)
         {
-            this.db = db;
-            this.wellService = wellService;
+            var geDate = request.GeDate.Value.ToUniversalTime();
+            query = query.Where(r => r.DateTime >= geDate);   
         }
 
-        private IQueryable<Record7> BuildQuery(TrajectoryRequest request)
+        if (request.LeDate.HasValue)
         {
-            var well = db.Wells.SingleOrDefault(w => w.Id == request.IdWell);
-            var timezone = wellService.GetTimezone(request.IdWell);
+            var leDate = request.LeDate.Value.ToUniversalTime();
+            query = query.Where(r => r.DateTime <= leDate);   
+        }
 
-            if (well is null)
-                throw new ArgumentInvalidException($"Скважина с Id: {request.IdWell} не найдена", nameof(request.IdWell));
+        return query.OrderBy(e => e.Deptsvym);
+    }
 
-            var query = db.Record7.Where(r => r.IdTelemetry == well.IdTelemetry)
-                .Where(x => x.IdTelemetry == well.IdTelemetry);
+    public async Task<IEnumerable<TrajectoryGeoFactDto>> GetAsync(int idWell, CancellationToken token)
+    {
+        var request = new TrajectoryRequest()
+        {
+            IdWell = idWell,
+        };
+        var result = await GetByRequestAsync(request, token);
+        return result;
+    }
 
-            if (request.GeDate.HasValue)
+    public async Task<IEnumerable<TrajectoryGeoFactDto>> GetByRequestAsync(TrajectoryRequest request, CancellationToken token)
+    {
+        var entities = (await BuildQuery(request)
+       .Where(coord => coord.Deptsvym.HasValue &&
+                       coord.Svyinc.HasValue &&
+                       coord.Svyazc.HasValue)
+       .AsNoTracking()
+       .ToArrayAsync(token));
+
+        var result = entities
+            .Select(coord => new TrajectoryGeoFactDto
             {
-                var geDate = request.GeDate.Value.ToUniversalTime();
-                query = query.Where(r => r.DateTime >= geDate);   
-            }
+                IdWell = request.IdWell,
+                AzimuthMagnetic = coord.Svymtf,
+                VerticalDepth = coord.Deptsvyv,
+                WellboreDepth = coord.Deptsvym!.Value,
+                ZenithAngle = coord.Svyinc!.Value,
+                AzimuthGeo = coord.Svyazc!.Value
+            })
+            .ToArray();
 
-            if (request.LeDate.HasValue)
-            {
-                var leDate = request.LeDate.Value.ToUniversalTime();
-                query = query.Where(r => r.DateTime <= leDate);   
-            }
-
-            return query.OrderBy(e => e.Deptsvym);
-        }
-
-        public async Task<IEnumerable<TrajectoryGeoFactDto>> GetAsync(int idWell, CancellationToken token)
-        {
-            var request = new TrajectoryRequest()
-            {
-                IdWell = idWell,
-            };
-            var result = await GetByRequestAsync(request, token);
-            return result;
-        }
-
-        public async Task<IEnumerable<TrajectoryGeoFactDto>> GetByRequestAsync(TrajectoryRequest request, CancellationToken token)
-        {
-            var entities = (await BuildQuery(request)
-           .Where(coord => coord.Deptsvym.HasValue &&
-                           coord.Svyinc.HasValue &&
-                           coord.Svyazc.HasValue)
-           .AsNoTracking()
-           .ToArrayAsync(token));
-
-            var result = entities
-                .Select(coord => new TrajectoryGeoFactDto
-                {
-                    IdWell = request.IdWell,
-                    AzimuthMagnetic = coord.Svymtf,
-                    VerticalDepth = coord.Deptsvyv,
-                    WellboreDepth = coord.Deptsvym!.Value,
-                    ZenithAngle = coord.Svyinc!.Value,
-                    AzimuthGeo = coord.Svyazc!.Value
-                })
-                .ToArray();
-
-            return result;
-        }
+        return result;
     }
 }
diff --git a/AsbCloudInfrastructure/Repository/UserRepository.cs b/AsbCloudInfrastructure/Repository/UserRepository.cs
index 0f40b933..2f23bf0d 100644
--- a/AsbCloudInfrastructure/Repository/UserRepository.cs
+++ b/AsbCloudInfrastructure/Repository/UserRepository.cs
@@ -12,274 +12,272 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Memory;
 using AsbCloudApp.Data.User;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+public class UserRepository : IUserRepository
 {
-
-    public class UserRepository : IUserRepository
+    private readonly IAsbCloudDbContext dbContext;
+    private readonly IUserRoleRepository userRoleRepository;
+    private const string userCacheTag = "User";
+    private const string relationUserUserRoleCacheTag = "RelationUserUserRole";
+    private static readonly TimeSpan cacheObsolence = TimeSpan.FromMinutes(15);
+    private static readonly TypeAdapterConfig userTypeAdapterConfig = TypeAdapterConfig<UserExtendedDto, User>
+        .NewConfig()
+        .Ignore(dst => dst.Company,
+            dst => dst.FileMarks,
+            dst => dst.Files,
+            dst => dst.RelationUsersUserRoles)
+        .Config;
+    private readonly IMemoryCache memoryCache;
+    public UserRepository(IAsbCloudDbContext dbContext, IUserRoleRepository userRoleRepository, IMemoryCache memoryCache)
     {
-        private readonly IAsbCloudDbContext dbContext;
-        private readonly IUserRoleRepository userRoleRepository;
-        private const string userCacheTag = "User";
-        private const string relationUserUserRoleCacheTag = "RelationUserUserRole";
-        private static readonly TimeSpan cacheObsolence = TimeSpan.FromMinutes(15);
-        private static readonly TypeAdapterConfig userTypeAdapterConfig = TypeAdapterConfig<UserExtendedDto, User>
-            .NewConfig()
-            .Ignore(dst => dst.Company,
-                dst => dst.FileMarks,
-                dst => dst.Files,
-                dst => dst.RelationUsersUserRoles)
-            .Config;
-        private readonly IMemoryCache memoryCache;
-        public UserRepository(IAsbCloudDbContext dbContext, IUserRoleRepository userRoleRepository, IMemoryCache memoryCache)
-        {
-            this.dbContext = dbContext;
-            this.userRoleRepository = userRoleRepository;
-            this.memoryCache = memoryCache;
-        }
-
-        public async Task<int> InsertAsync(UserExtendedDto dto, CancellationToken token)
-        {
-            dto.Id = default;
-            var entity = Convert(dto);
-            await AssertLoginIsBusyAsync(dto.Login, token);
-            var userRoles = await userRoleRepository.GetByNamesAsync(dto.RoleNames, token).ConfigureAwait(false);
-            var updatedEntity = await dbContext.Users.AddAsync(entity, token).ConfigureAwait(false);
-            await dbContext.SaveChangesAsync(token);
-
-            if (userRoles?.Any() == true)
-                await UpdateRolesCacheForUserAsync(updatedEntity.Entity.Id, userRoles, token);
-
-            DropCacheUsers();
-            return updatedEntity.Entity.Id;
-        }
-
-        public Task<int> InsertRangeAsync(IEnumerable<UserExtendedDto> newItems, CancellationToken token)
-        {
-            throw new NotImplementedException();
-        }
-
-        public async Task<IEnumerable<UserExtendedDto>> GetAllAsync(CancellationToken token)
-        {
-            var users = await GetCacheUserAsync(token);
-            if (users is null)
-                return Enumerable.Empty<UserExtendedDto>();
-            var dtos = new List<UserExtendedDto>();
-            foreach(var user in users)
-            {
-                var dto = Convert(user);
-                dto.RoleNames = GetRolesNamesByIdUser(user.Id);
-                dtos.Add(dto);
-            };            
-            return dtos;
-        }
-        
-
-        public UserExtendedDto? GetOrDefault(int id)
-        {
-            var user = GetCacheUser().FirstOrDefault(u => u.Id == id);
-            if (user is null)
-                return null;
-            var dto = Convert(user);
-            dto.RoleNames = GetRolesNamesByIdUser(dto.Id);
-            return dto;
-        }
-
-        public async Task<UserExtendedDto?> GetOrDefaultAsync(int id, CancellationToken token)
-        {            
-            var user = (await GetCacheUserAsync(token)).FirstOrDefault(u => u.Id == id);
-            if (user is null)
-                return null;
-            var dto = Convert(user);
-            dto.RoleNames = GetRolesNamesByIdUser(dto.Id);
-            return dto;
-        }
-
-        public async Task<int> UpdateAsync(UserExtendedDto dto, CancellationToken token)
-        {
-            if (dto.Id <= 1)
-                throw new ArgumentInvalidException(nameof(dto), $"Invalid id {dto.Id}. You can't edit this user.");
-
-            var oldUser = (await GetCacheUserAsync(token)).FirstOrDefault(u => u.Id == dto.Id)
-                ?? throw new ArgumentInvalidException(nameof(dto), $"Invalid id {dto.Id}. You can't edit this user.");
-
-            if (oldUser.Login != dto.Login)
-                await AssertLoginIsBusyAsync(dto.Login, token);
-
-            var userRoles = await userRoleRepository.GetByNamesAsync(dto.RoleNames, token).ConfigureAwait(false);
-            await UpdateRolesCacheForUserAsync(dto.Id, userRoles, token);
-
-            var entity = dbContext.Users.FirstOrDefault(u => u.Id == dto.Id)
-                ?? throw new ArgumentInvalidException(nameof(dto), $"Invalid id {dto.Id}. You can't edit this user.");
-            
-            entity.Id = dto.Id;
-            entity.Login = dto.Login;
-            entity.Name = dto.Name;
-            entity.Email = dto.Email;
-            entity.Phone = dto.Phone;
-            entity.Surname = dto.Surname;
-            entity.Patronymic = dto.Patronymic;
-            entity.Position = dto.Position;
-            entity.IdCompany = dto.IdCompany;
-            entity.IdState = dto.IdState;
-            await dbContext.SaveChangesAsync(token);
-            DropCacheUsers();
-            return entity.Id;            
-        }
-
-        public async Task<int> DeleteAsync(int id, CancellationToken token)
-        {
-            var user = (await GetCacheUserAsync(token)).FirstOrDefault(u => u.Id == id)
-                ?? throw new ArgumentInvalidException(nameof(id), $"Invalid id {id}. You can't edit this user.");
-            
-            var query = dbContext
-                .Users
-                .Where(u => u.Id == id);
-            if (query.Any())
-            {
-                var result = dbContext.Users.Remove(query.First());
-                await dbContext.SaveChangesAsync(token);
-                DropCacheUsers();
-                return result.Entity.Id;
-            }
-            throw new ArgumentInvalidException
-                    (nameof(id), $"Invalid id {id}. You can't edit this user.");
-        }
-
-        public IEnumerable<UserRoleDto> GetRolesByIdUser(int idUser, int nestedLevel = 0)
-        {
-            var roles = GetCachRelationUserUserRoleCacheTag().Where(r => r.IdUser == idUser);
-            return roles.SelectMany(r => userRoleRepository.GetNestedById(r.IdUserRole, nestedLevel));
-        }
-
-        public IEnumerable<PermissionDto> GetNestedPermissions(int idUser)
-        {
-            var roles = GetRolesByIdUser(idUser, 7);
-            if (roles is null)
-                return Enumerable.Empty<PermissionDto>();
-
-            var permissions = roles
-                .Where(r => r.Permissions is not null)
-                .SelectMany(r => r.Permissions);
-
-            return permissions;
-        }
-
-        public bool HasPermission(int idUser, string permissionName)
-        {
-            if (idUser == 1)
-                return true;
-
-            var relationsToRoles = GetCachRelationUserUserRoleCacheTag()
-                .Where(r => r.IdUser == idUser);
-            if (relationsToRoles is null)
-                return false;
-
-            return userRoleRepository.HasPermission(relationsToRoles
-                .Select(r => r.IdUserRole), permissionName);
-        }
-
-        private IEnumerable<string> GetRolesNamesByIdUser(int idUser)
-        { 
-            var userRoles = GetRolesByIdUser(idUser, 7)
-                .Select(r => r.Caption)
-                .Distinct();
-            if (userRoles.Any())
-                return userRoles;
-            return Enumerable.Empty<string>();
-        }
-
-        private async Task AssertLoginIsBusyAsync(string login, CancellationToken token)
-        {
-            var existingUserDto = (await GetCacheUserAsync(token))
-                .FirstOrDefault(u => u.Login.ToLower() == login.ToLower());
-
-            if (existingUserDto is not null)
-                throw new ArgumentInvalidException(nameof(login), $"Login {login} is busy by {existingUserDto.MakeDisplayName()}, id{existingUserDto.Id}");
-        }
-        
-        private IEnumerable<RelationUserUserRole> GetCachRelationUserUserRoleCacheTag()
-        {
-            var cache = memoryCache.GetOrCreate(relationUserUserRoleCacheTag, cacheEntry =>
-            {
-                cacheEntry.AbsoluteExpirationRelativeToNow = cacheObsolence;
-                cacheEntry.SlidingExpiration = cacheObsolence;
-                var query = dbContext.RelationUserUserRoles
-                        .Include(r => r.UserRole)
-                        .Include(r => r.User);
-                var entities = query.ToArray();
-                return entities;
-            });
-            return cache!;
-        }
-
-        private void DropCacheRelationUserUserRoleCacheTag()
-        { 
-            memoryCache.Remove(relationUserUserRoleCacheTag);
-        }
-
-        private async Task UpdateRolesCacheForUserAsync(int idUser, IEnumerable<UserRoleDto> roleDtos, CancellationToken token)
-        {
-            var relations = dbContext.RelationUserUserRoles.Where(r => r.IdUser == idUser);
-            dbContext.RelationUserUserRoles.RemoveRange(relations);
-            var entityRoles = roleDtos.Select(role => new RelationUserUserRole
-            {
-                IdUser = idUser,
-                IdUserRole = role.Id
-            });
-            dbContext.RelationUserUserRoles.AddRange(entityRoles);
-            await dbContext.SaveChangesAsync(token);
-            DropCacheRelationUserUserRoleCacheTag();
-        }
-
-        private void DropCacheUsers()
-            => memoryCache.Remove(userCacheTag);
-
-        private IEnumerable<User> GetCacheUser()
-        {
-            var cache = memoryCache.GetOrCreate(userCacheTag, cacheEntry =>
-            {
-                cacheEntry.AbsoluteExpirationRelativeToNow = cacheObsolence;
-                cacheEntry.SlidingExpiration = cacheObsolence;
-                var query = dbContext.Users
-                        .Include(r => r.Company)
-                        .Include(r => r.RelationUsersUserRoles);
-                var entities = query.ToArray();
-                return entities;
-            });
-            return cache!;
-        }
-
-        private Task<IEnumerable<User>> GetCacheUserAsync(CancellationToken token)
-        {
-            var cache = memoryCache.GetOrCreateAsync(userCacheTag, async (cacheEntry) =>
-            {
-                cacheEntry.AbsoluteExpirationRelativeToNow = cacheObsolence;
-                cacheEntry.SlidingExpiration = cacheObsolence;
-                var query = dbContext.Users
-                        .Include(r => r.Company)
-                        .Include(r => r.RelationUsersUserRoles);
-                var entities = await query.ToArrayAsync(token);
-                return entities.AsEnumerable();
-            });
-            return cache!;
-        }
-
-        protected User Convert(UserExtendedDto dto)
-        {
-            var entity = dto.Adapt<User>(userTypeAdapterConfig);
-            if (string.IsNullOrEmpty(entity.PasswordHash))
-            {
-                var hash = dbContext.Users.FirstOrDefault(u => u.Id == dto.Id)?.PasswordHash;
-                entity.PasswordHash = hash ?? string.Empty;
-            }
-                
-            return entity;
-        }
-        protected virtual UserExtendedDto Convert(User entity)
-        {
-            var dto = entity.Adapt<UserExtendedDto>();
-            return dto;
-        }        
+        this.dbContext = dbContext;
+        this.userRoleRepository = userRoleRepository;
+        this.memoryCache = memoryCache;
     }
 
+    public async Task<int> InsertAsync(UserExtendedDto dto, CancellationToken token)
+    {
+        dto.Id = default;
+        var entity = Convert(dto);
+        await AssertLoginIsBusyAsync(dto.Login, token);
+        var userRoles = await userRoleRepository.GetByNamesAsync(dto.RoleNames, token).ConfigureAwait(false);
+        var updatedEntity = await dbContext.Users.AddAsync(entity, token).ConfigureAwait(false);
+        await dbContext.SaveChangesAsync(token);
+
+        if (userRoles?.Any() == true)
+            await UpdateRolesCacheForUserAsync(updatedEntity.Entity.Id, userRoles, token);
+
+        DropCacheUsers();
+        return updatedEntity.Entity.Id;
+    }
+
+    public Task<int> InsertRangeAsync(IEnumerable<UserExtendedDto> newItems, CancellationToken token)
+    {
+        throw new NotImplementedException();
+    }
+
+    public async Task<IEnumerable<UserExtendedDto>> GetAllAsync(CancellationToken token)
+    {
+        var users = await GetCacheUserAsync(token);
+        if (users is null)
+            return Enumerable.Empty<UserExtendedDto>();
+        var dtos = new List<UserExtendedDto>();
+        foreach(var user in users)
+        {
+            var dto = Convert(user);
+            dto.RoleNames = GetRolesNamesByIdUser(user.Id);
+            dtos.Add(dto);
+        };            
+        return dtos;
+    }
+    
+
+    public UserExtendedDto? GetOrDefault(int id)
+    {
+        var user = GetCacheUser().FirstOrDefault(u => u.Id == id);
+        if (user is null)
+            return null;
+        var dto = Convert(user);
+        dto.RoleNames = GetRolesNamesByIdUser(dto.Id);
+        return dto;
+    }
+
+    public async Task<UserExtendedDto?> GetOrDefaultAsync(int id, CancellationToken token)
+    {            
+        var user = (await GetCacheUserAsync(token)).FirstOrDefault(u => u.Id == id);
+        if (user is null)
+            return null;
+        var dto = Convert(user);
+        dto.RoleNames = GetRolesNamesByIdUser(dto.Id);
+        return dto;
+    }
+
+    public async Task<int> UpdateAsync(UserExtendedDto dto, CancellationToken token)
+    {
+        if (dto.Id <= 1)
+            throw new ArgumentInvalidException(nameof(dto), $"Invalid id {dto.Id}. You can't edit this user.");
+
+        var oldUser = (await GetCacheUserAsync(token)).FirstOrDefault(u => u.Id == dto.Id)
+            ?? throw new ArgumentInvalidException(nameof(dto), $"Invalid id {dto.Id}. You can't edit this user.");
+
+        if (oldUser.Login != dto.Login)
+            await AssertLoginIsBusyAsync(dto.Login, token);
+
+        var userRoles = await userRoleRepository.GetByNamesAsync(dto.RoleNames, token).ConfigureAwait(false);
+        await UpdateRolesCacheForUserAsync(dto.Id, userRoles, token);
+
+        var entity = dbContext.Users.FirstOrDefault(u => u.Id == dto.Id)
+            ?? throw new ArgumentInvalidException(nameof(dto), $"Invalid id {dto.Id}. You can't edit this user.");
+        
+        entity.Id = dto.Id;
+        entity.Login = dto.Login;
+        entity.Name = dto.Name;
+        entity.Email = dto.Email;
+        entity.Phone = dto.Phone;
+        entity.Surname = dto.Surname;
+        entity.Patronymic = dto.Patronymic;
+        entity.Position = dto.Position;
+        entity.IdCompany = dto.IdCompany;
+        entity.IdState = dto.IdState;
+        await dbContext.SaveChangesAsync(token);
+        DropCacheUsers();
+        return entity.Id;            
+    }
+
+    public async Task<int> DeleteAsync(int id, CancellationToken token)
+    {
+        var user = (await GetCacheUserAsync(token)).FirstOrDefault(u => u.Id == id)
+            ?? throw new ArgumentInvalidException(nameof(id), $"Invalid id {id}. You can't edit this user.");
+        
+        var query = dbContext
+            .Users
+            .Where(u => u.Id == id);
+        if (query.Any())
+        {
+            var result = dbContext.Users.Remove(query.First());
+            await dbContext.SaveChangesAsync(token);
+            DropCacheUsers();
+            return result.Entity.Id;
+        }
+        throw new ArgumentInvalidException
+                (nameof(id), $"Invalid id {id}. You can't edit this user.");
+    }
+
+    public IEnumerable<UserRoleDto> GetRolesByIdUser(int idUser, int nestedLevel = 0)
+    {
+        var roles = GetCachRelationUserUserRoleCacheTag().Where(r => r.IdUser == idUser);
+        return roles.SelectMany(r => userRoleRepository.GetNestedById(r.IdUserRole, nestedLevel));
+    }
+
+    public IEnumerable<PermissionDto> GetNestedPermissions(int idUser)
+    {
+        var roles = GetRolesByIdUser(idUser, 7);
+        if (roles is null)
+            return Enumerable.Empty<PermissionDto>();
+
+        var permissions = roles
+            .Where(r => r.Permissions is not null)
+            .SelectMany(r => r.Permissions);
+
+        return permissions;
+    }
+
+    public bool HasPermission(int idUser, string permissionName)
+    {
+        if (idUser == 1)
+            return true;
+
+        var relationsToRoles = GetCachRelationUserUserRoleCacheTag()
+            .Where(r => r.IdUser == idUser);
+        if (relationsToRoles is null)
+            return false;
+
+        return userRoleRepository.HasPermission(relationsToRoles
+            .Select(r => r.IdUserRole), permissionName);
+    }
+
+    private IEnumerable<string> GetRolesNamesByIdUser(int idUser)
+    { 
+        var userRoles = GetRolesByIdUser(idUser, 7)
+            .Select(r => r.Caption)
+            .Distinct();
+        if (userRoles.Any())
+            return userRoles;
+        return Enumerable.Empty<string>();
+    }
+
+    private async Task AssertLoginIsBusyAsync(string login, CancellationToken token)
+    {
+        var existingUserDto = (await GetCacheUserAsync(token))
+            .FirstOrDefault(u => u.Login.ToLower() == login.ToLower());
+
+        if (existingUserDto is not null)
+            throw new ArgumentInvalidException(nameof(login), $"Login {login} is busy by {existingUserDto.MakeDisplayName()}, id{existingUserDto.Id}");
+    }
+    
+    private IEnumerable<RelationUserUserRole> GetCachRelationUserUserRoleCacheTag()
+    {
+        var cache = memoryCache.GetOrCreate(relationUserUserRoleCacheTag, cacheEntry =>
+        {
+            cacheEntry.AbsoluteExpirationRelativeToNow = cacheObsolence;
+            cacheEntry.SlidingExpiration = cacheObsolence;
+            var query = dbContext.RelationUserUserRoles
+                    .Include(r => r.UserRole)
+                    .Include(r => r.User);
+            var entities = query.ToArray();
+            return entities;
+        });
+        return cache!;
+    }
+
+    private void DropCacheRelationUserUserRoleCacheTag()
+    { 
+        memoryCache.Remove(relationUserUserRoleCacheTag);
+    }
+
+    private async Task UpdateRolesCacheForUserAsync(int idUser, IEnumerable<UserRoleDto> roleDtos, CancellationToken token)
+    {
+        var relations = dbContext.RelationUserUserRoles.Where(r => r.IdUser == idUser);
+        dbContext.RelationUserUserRoles.RemoveRange(relations);
+        var entityRoles = roleDtos.Select(role => new RelationUserUserRole
+        {
+            IdUser = idUser,
+            IdUserRole = role.Id
+        });
+        dbContext.RelationUserUserRoles.AddRange(entityRoles);
+        await dbContext.SaveChangesAsync(token);
+        DropCacheRelationUserUserRoleCacheTag();
+    }
+
+    private void DropCacheUsers()
+        => memoryCache.Remove(userCacheTag);
+
+    private IEnumerable<User> GetCacheUser()
+    {
+        var cache = memoryCache.GetOrCreate(userCacheTag, cacheEntry =>
+        {
+            cacheEntry.AbsoluteExpirationRelativeToNow = cacheObsolence;
+            cacheEntry.SlidingExpiration = cacheObsolence;
+            var query = dbContext.Users
+                    .Include(r => r.Company)
+                    .Include(r => r.RelationUsersUserRoles);
+            var entities = query.ToArray();
+            return entities;
+        });
+        return cache!;
+    }
+
+    private Task<IEnumerable<User>> GetCacheUserAsync(CancellationToken token)
+    {
+        var cache = memoryCache.GetOrCreateAsync(userCacheTag, async (cacheEntry) =>
+        {
+            cacheEntry.AbsoluteExpirationRelativeToNow = cacheObsolence;
+            cacheEntry.SlidingExpiration = cacheObsolence;
+            var query = dbContext.Users
+                    .Include(r => r.Company)
+                    .Include(r => r.RelationUsersUserRoles);
+            var entities = await query.ToArrayAsync(token);
+            return entities.AsEnumerable();
+        });
+        return cache!;
+    }
+
+    protected User Convert(UserExtendedDto dto)
+    {
+        var entity = dto.Adapt<User>(userTypeAdapterConfig);
+        if (string.IsNullOrEmpty(entity.PasswordHash))
+        {
+            var hash = dbContext.Users.FirstOrDefault(u => u.Id == dto.Id)?.PasswordHash;
+            entity.PasswordHash = hash ?? string.Empty;
+        }
+            
+        return entity;
+    }
+    protected virtual UserExtendedDto Convert(User entity)
+    {
+        var dto = entity.Adapt<UserExtendedDto>();
+        return dto;
+    }        
 }
diff --git a/AsbCloudInfrastructure/Repository/UserRoleRepository.cs b/AsbCloudInfrastructure/Repository/UserRoleRepository.cs
index 799fe857..5301a7d5 100644
--- a/AsbCloudInfrastructure/Repository/UserRoleRepository.cs
+++ b/AsbCloudInfrastructure/Repository/UserRoleRepository.cs
@@ -14,287 +14,285 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+public class UserRoleRepository : IUserRoleRepository
 {
+    private readonly IAsbCloudDbContext dbContext;
+    private readonly IMemoryCache memoryCache;
 
-    public class UserRoleRepository : IUserRoleRepository
+    public UserRoleRepository(IAsbCloudDbContext dbContext, IMemoryCache memoryCache)
     {
-        private readonly IAsbCloudDbContext dbContext;
-        private readonly IMemoryCache memoryCache;
+        this.dbContext = dbContext;
+        this.memoryCache = memoryCache;
+    }
 
-        public UserRoleRepository(IAsbCloudDbContext dbContext, IMemoryCache memoryCache)
-        {
-            this.dbContext = dbContext;
-            this.memoryCache = memoryCache;
-        }
-
-        public async Task<int> InsertAsync(UserRoleDto dto, CancellationToken token)
-        {
-            var entity = dto.Adapt<UserRole>();
-            var updatedEntity = dbContext.UserRoles.Add(entity);
-            await dbContext.SaveChangesAsync(token);
-
-            if (updatedEntity.IsKeySet)
-            {
-                dto.Id = updatedEntity.Entity.Id;
-                await UpdatePermissionsAsync(dto, token);
-                await UpdateIncludedRolesAsync(dto, token);
-
-                DropCacheUserRole();
-                return updatedEntity.Entity.Id;
-            }
-            return 0;
-        }
-
-        public Task<int> InsertRangeAsync(IEnumerable<UserRoleDto> newItems, CancellationToken token)
-        {
-            throw new NotImplementedException();
-        }
-
-        public async Task<IEnumerable<UserRoleDto>> GetAllAsync(CancellationToken token)
-        {
-            var entities = await  GetCacheUserRoleAsync(token)
-                .ConfigureAwait(false);
-
-            return entities.Select(Convert);
-        }
-
-        public UserRoleDto? GetOrDefault(int id)
-        {
-            var entity = GetCacheUserRole().FirstOrDefault(x => x.Id == id);
-            if (entity is null)
-                return null;
-            return Convert(entity);
-        }
-
-        public async Task<UserRoleDto?> GetOrDefaultAsync(int id, CancellationToken token)
-        {
-            var entity = (await GetCacheUserRoleAsync(token)
-                .ConfigureAwait(false)).FirstOrDefault(r => r.Id == id);
-            if (entity is null)
-                return null;
-            return Convert(entity);
-        }
-
-        public async Task<IEnumerable<UserRoleDto>> GetByNamesAsync(IEnumerable<string> names, CancellationToken token)
-        {
-            if (names?.Any() != true)
-                return Enumerable.Empty<UserRoleDto>();
-
-            var entities = (await GetCacheUserRoleAsync(token))
-                .Where(r => names.Contains(r.Caption));
-
-            if (entities?.Count() != names.Count())
-                throw new ArgumentInvalidException(nameof(names), "Invalid role names");
-
-            return entities.Select(Convert);
-        }
-
-        public async Task<int> UpdateAsync(UserRoleDto dto, CancellationToken token)
+    public async Task<int> InsertAsync(UserRoleDto dto, CancellationToken token)
+    {
+        var entity = dto.Adapt<UserRole>();
+        var updatedEntity = dbContext.UserRoles.Add(entity);
+        await dbContext.SaveChangesAsync(token);
+
+        if (updatedEntity.IsKeySet)
         {
+            dto.Id = updatedEntity.Entity.Id;
             await UpdatePermissionsAsync(dto, token);
             await UpdateIncludedRolesAsync(dto, token);
 
-            var entity = Convert(dto);
-            var result = dbContext.UserRoles.Upsert(entity);
-            await dbContext.SaveChangesAsync(token);
             DropCacheUserRole();
-            return result.Entity.Id;
-        }
-
-        public IEnumerable<UserRoleDto> GetNestedById(int id, int recursionLevel = 7)
-        {
-            var role = GetCacheUserRole()
-                .FirstOrDefault(r => r.Id == id);
-            if (role is null)
-                return Enumerable.Empty<UserRoleDto>();
-
-            var roles = new SortedSet<UserRoleDto>(ComparerIId.GetInstance()) { Convert(role) };
-
-            if (recursionLevel <= 0 || role.RelationUserRoleUserRoles?.Any() != true)
-                return roles;
-
-            foreach (var relation in role.RelationUserRoleUserRoles)
-            {
-                var nestedRoles = GetNestedById(relation.IdInclude, --recursionLevel);
-                if (nestedRoles?.Any() != true)
-                    continue;
-                foreach (var nestedRole in nestedRoles)
-                    roles.Add(nestedRole);
-            }
-            return roles;
-        }
-
-        public async Task<int> DeleteAsync(int id, CancellationToken token)
-        {
-            var entity = (await GetCacheUserRoleAsync(token)).FirstOrDefault(r => r.Id == id);
-
-            if (entity is not null)
-            {
-                var removeEntity = dbContext.UserRoles.Remove(entity);
-                await dbContext.SaveChangesAsync(token);
-                DropCacheUserRole();
-                return removeEntity.Entity.Id;
-            }
-            else return 0;
-        }
-
-        public bool HasPermission(IEnumerable<int> rolesIds, string permissionName)
-        {
-            var permissionInfo = GetCacheRelationUserRolePermissions()
-                .FirstOrDefault(p => p. Permission?.Name.ToLower() == permissionName.ToLower())
-                ?.Permission;
-
-            if (permissionInfo is null)
-                return false;
-
-            if (rolesIds.Contains(1))
-                return true;
-
-            var idPermissionInfo = permissionInfo.Id;
-            var entities = GetCacheUserRole()
-                .Where(r => rolesIds.Contains(r.Id));
-
-            foreach (var role in entities)
-                if (HasPermission(role, idPermissionInfo))
-                    return true;
-            return false;
-        }
-
-        private bool HasPermission(UserRole userRole, int idPermission, int recursionLevel = 7)
-        {
-            if (userRole.RelationUserRolePermissions.Any(p => p.IdPermission == idPermission))
-                return true;
-
-            if (recursionLevel <= 0 || userRole.RelationUserRoleUserRoles?.Any() != true)
-                return false;
-
-            foreach (var relation in userRole.RelationUserRoleUserRoles)
-            {
-                var entity = GetCacheUserRole()
-                    .First(p => p.Id == relation.IdInclude);
-                if (HasPermission(entity, idPermission, --recursionLevel))
-                    return true;
-            }
-            return false;
-        }
-
-        private IEnumerable<UserRoleDto> GetNestedByIds(IEnumerable<int> ids, int recursionLevel = 7)
-        { 
-            var roles = new List<UserRoleDto>();
-            foreach (var id in ids)
-                roles.AddRange(GetNestedById(id, recursionLevel));
-
-            return roles;
-        }
-
-        private async Task UpdateIncludedRolesAsync(UserRoleDto dto, CancellationToken token)
-        {
-            if (!dto.Roles.Any())
-                return;
-
-            var idsIncludeRole = GetNestedByIds(dto.Roles.Select(x => x.Id)).Select(x => x.Id);
-
-            if (idsIncludeRole.Any(x => x == dto.Id))
-                throw new ArgumentInvalidException(nameof(dto), "Invalid include role (self reference)");
-
-            var removeRelationsQuery = dbContext.RelationUserRoleUserRoles
-                .Where(r => r.Id == dto.Id);
-
-            dbContext.RelationUserRoleUserRoles.RemoveRange(removeRelationsQuery);
-            var newRelations = dto.Roles.Select(r => new RelationUserRoleUserRole 
-            { 
-                Id = dto.Id, 
-                IdInclude = r.Id,
-            });
-            dbContext.RelationUserRoleUserRoles.AddRange(newRelations);
-            await dbContext.SaveChangesAsync(token);
-            DropCacheRelationUserRoleUserRole();
-        }
-
-        private async Task UpdatePermissionsAsync(UserRoleDto dto, CancellationToken token)
-        {
-            if (dto?.Permissions is null)
-                return;
-
-            var relations = await dbContext.RelationUserRolePermissions
-                .Where(r => r.IdUserRole == dto.Id)
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-            dbContext.RelationUserRolePermissions.RemoveRange(relations);
-
-            if (dto.Permissions.Any())
-            {
-                var newRelations = dto.Permissions.Select(p => new RelationUserRolePermission
-                {
-                    IdPermission = p.Id,
-                    IdUserRole = dto.Id,
-                });
-
-                await dbContext.RelationUserRolePermissions.AddRangeAsync(newRelations, token);
-                await dbContext.SaveChangesAsync(token);
-            }
-            DropCacheRelationUserRolePermissions();
-        }
-
-        private Task<IEnumerable<UserRole>> GetCacheUserRoleAsync(CancellationToken token)
-            => memoryCache.GetOrCreateBasicAsync(dbContext.Set<UserRole>()
-            .Include(r => r.RelationUserRolePermissions)
-            .Include(r => r.RelationUserRoleUserRoles)
-            .Include(r => r.RelationUsersUserRoles), token);
-
-        private IEnumerable<UserRole> GetCacheUserRole()
-            => memoryCache.GetOrCreateBasic(dbContext.Set<UserRole>()
-            .Include(r => r.RelationUserRolePermissions)
-            .Include(r => r.RelationUserRoleUserRoles)
-            .Include(r => r.RelationUsersUserRoles));
-
-        private void DropCacheUserRole()
-            => memoryCache.DropBasic<UserRole>();
-
-        private void DropCacheRelationUserRoleUserRole()
-            => memoryCache.DropBasic<RelationUserUserRole>();
-
-        private IEnumerable<RelationUserRolePermission> GetCacheRelationUserRolePermissions()
-            => memoryCache.GetOrCreateBasic(dbContext.Set<RelationUserRolePermission>()
-            .Include(r => r.UserRole)
-            .Include(r => r.Permission));
-
-        private void DropCacheRelationUserRolePermissions()
-            => memoryCache.DropBasic<RelationUserRolePermission>();
-
-        private UserRoleDto Convert(UserRole entity)
-        {
-            var dto = entity.Adapt<UserRoleDto>();
-            if (entity.RelationUserRolePermissions?.Any() == true)
-            {
-                dto.Permissions = GetCacheRelationUserRolePermissions()
-                    .Where(r => entity.Id == r.IdUserRole)
-                    .Select(r => Convert(r.Permission));
-            }
-
-            if (entity.RelationUserRoleUserRoles?.Any() == true)
-            {
-                var rolesCache = GetCacheUserRole();
-                dto.Roles = entity.RelationUserRoleUserRoles
-                    .Select(rel => Convert(rolesCache
-                        .First(r => r.Id == rel.IdInclude)))
-                    .ToArray();
-            }
-            return dto;
-        }
-
-        private static PermissionDto Convert(Permission entity)
-        {
-            var dto = entity.Adapt<PermissionDto>();
-            return dto;
-        }
-
-        private static UserRole Convert(UserRoleDto dto)
-        {
-            var entity = dto.Adapt<UserRole>();
-            return entity;
+            return updatedEntity.Entity.Id;
         }
+        return 0;
     }
 
+    public Task<int> InsertRangeAsync(IEnumerable<UserRoleDto> newItems, CancellationToken token)
+    {
+        throw new NotImplementedException();
+    }
+
+    public async Task<IEnumerable<UserRoleDto>> GetAllAsync(CancellationToken token)
+    {
+        var entities = await  GetCacheUserRoleAsync(token)
+            .ConfigureAwait(false);
+
+        return entities.Select(Convert);
+    }
+
+    public UserRoleDto? GetOrDefault(int id)
+    {
+        var entity = GetCacheUserRole().FirstOrDefault(x => x.Id == id);
+        if (entity is null)
+            return null;
+        return Convert(entity);
+    }
+
+    public async Task<UserRoleDto?> GetOrDefaultAsync(int id, CancellationToken token)
+    {
+        var entity = (await GetCacheUserRoleAsync(token)
+            .ConfigureAwait(false)).FirstOrDefault(r => r.Id == id);
+        if (entity is null)
+            return null;
+        return Convert(entity);
+    }
+
+    public async Task<IEnumerable<UserRoleDto>> GetByNamesAsync(IEnumerable<string> names, CancellationToken token)
+    {
+        if (names?.Any() != true)
+            return Enumerable.Empty<UserRoleDto>();
+
+        var entities = (await GetCacheUserRoleAsync(token))
+            .Where(r => names.Contains(r.Caption));
+
+        if (entities?.Count() != names.Count())
+            throw new ArgumentInvalidException(nameof(names), "Invalid role names");
+
+        return entities.Select(Convert);
+    }
+
+    public async Task<int> UpdateAsync(UserRoleDto dto, CancellationToken token)
+    {
+        await UpdatePermissionsAsync(dto, token);
+        await UpdateIncludedRolesAsync(dto, token);
+
+        var entity = Convert(dto);
+        var result = dbContext.UserRoles.Upsert(entity);
+        await dbContext.SaveChangesAsync(token);
+        DropCacheUserRole();
+        return result.Entity.Id;
+    }
+
+    public IEnumerable<UserRoleDto> GetNestedById(int id, int recursionLevel = 7)
+    {
+        var role = GetCacheUserRole()
+            .FirstOrDefault(r => r.Id == id);
+        if (role is null)
+            return Enumerable.Empty<UserRoleDto>();
+
+        var roles = new SortedSet<UserRoleDto>(ComparerIId.GetInstance()) { Convert(role) };
+
+        if (recursionLevel <= 0 || role.RelationUserRoleUserRoles?.Any() != true)
+            return roles;
+
+        foreach (var relation in role.RelationUserRoleUserRoles)
+        {
+            var nestedRoles = GetNestedById(relation.IdInclude, --recursionLevel);
+            if (nestedRoles?.Any() != true)
+                continue;
+            foreach (var nestedRole in nestedRoles)
+                roles.Add(nestedRole);
+        }
+        return roles;
+    }
+
+    public async Task<int> DeleteAsync(int id, CancellationToken token)
+    {
+        var entity = (await GetCacheUserRoleAsync(token)).FirstOrDefault(r => r.Id == id);
+
+        if (entity is not null)
+        {
+            var removeEntity = dbContext.UserRoles.Remove(entity);
+            await dbContext.SaveChangesAsync(token);
+            DropCacheUserRole();
+            return removeEntity.Entity.Id;
+        }
+        else return 0;
+    }
+
+    public bool HasPermission(IEnumerable<int> rolesIds, string permissionName)
+    {
+        var permissionInfo = GetCacheRelationUserRolePermissions()
+            .FirstOrDefault(p => p. Permission?.Name.ToLower() == permissionName.ToLower())
+            ?.Permission;
+
+        if (permissionInfo is null)
+            return false;
+
+        if (rolesIds.Contains(1))
+            return true;
+
+        var idPermissionInfo = permissionInfo.Id;
+        var entities = GetCacheUserRole()
+            .Where(r => rolesIds.Contains(r.Id));
+
+        foreach (var role in entities)
+            if (HasPermission(role, idPermissionInfo))
+                return true;
+        return false;
+    }
+
+    private bool HasPermission(UserRole userRole, int idPermission, int recursionLevel = 7)
+    {
+        if (userRole.RelationUserRolePermissions.Any(p => p.IdPermission == idPermission))
+            return true;
+
+        if (recursionLevel <= 0 || userRole.RelationUserRoleUserRoles?.Any() != true)
+            return false;
+
+        foreach (var relation in userRole.RelationUserRoleUserRoles)
+        {
+            var entity = GetCacheUserRole()
+                .First(p => p.Id == relation.IdInclude);
+            if (HasPermission(entity, idPermission, --recursionLevel))
+                return true;
+        }
+        return false;
+    }
+
+    private IEnumerable<UserRoleDto> GetNestedByIds(IEnumerable<int> ids, int recursionLevel = 7)
+    { 
+        var roles = new List<UserRoleDto>();
+        foreach (var id in ids)
+            roles.AddRange(GetNestedById(id, recursionLevel));
+
+        return roles;
+    }
+
+    private async Task UpdateIncludedRolesAsync(UserRoleDto dto, CancellationToken token)
+    {
+        if (!dto.Roles.Any())
+            return;
+
+        var idsIncludeRole = GetNestedByIds(dto.Roles.Select(x => x.Id)).Select(x => x.Id);
+
+        if (idsIncludeRole.Any(x => x == dto.Id))
+            throw new ArgumentInvalidException(nameof(dto), "Invalid include role (self reference)");
+
+        var removeRelationsQuery = dbContext.RelationUserRoleUserRoles
+            .Where(r => r.Id == dto.Id);
+
+        dbContext.RelationUserRoleUserRoles.RemoveRange(removeRelationsQuery);
+        var newRelations = dto.Roles.Select(r => new RelationUserRoleUserRole 
+        { 
+            Id = dto.Id, 
+            IdInclude = r.Id,
+        });
+        dbContext.RelationUserRoleUserRoles.AddRange(newRelations);
+        await dbContext.SaveChangesAsync(token);
+        DropCacheRelationUserRoleUserRole();
+    }
+
+    private async Task UpdatePermissionsAsync(UserRoleDto dto, CancellationToken token)
+    {
+        if (dto?.Permissions is null)
+            return;
+
+        var relations = await dbContext.RelationUserRolePermissions
+            .Where(r => r.IdUserRole == dto.Id)
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+        dbContext.RelationUserRolePermissions.RemoveRange(relations);
+
+        if (dto.Permissions.Any())
+        {
+            var newRelations = dto.Permissions.Select(p => new RelationUserRolePermission
+            {
+                IdPermission = p.Id,
+                IdUserRole = dto.Id,
+            });
+
+            await dbContext.RelationUserRolePermissions.AddRangeAsync(newRelations, token);
+            await dbContext.SaveChangesAsync(token);
+        }
+        DropCacheRelationUserRolePermissions();
+    }
+
+    private Task<IEnumerable<UserRole>> GetCacheUserRoleAsync(CancellationToken token)
+        => memoryCache.GetOrCreateBasicAsync(dbContext.Set<UserRole>()
+        .Include(r => r.RelationUserRolePermissions)
+        .Include(r => r.RelationUserRoleUserRoles)
+        .Include(r => r.RelationUsersUserRoles), token);
+
+    private IEnumerable<UserRole> GetCacheUserRole()
+        => memoryCache.GetOrCreateBasic(dbContext.Set<UserRole>()
+        .Include(r => r.RelationUserRolePermissions)
+        .Include(r => r.RelationUserRoleUserRoles)
+        .Include(r => r.RelationUsersUserRoles));
+
+    private void DropCacheUserRole()
+        => memoryCache.DropBasic<UserRole>();
+
+    private void DropCacheRelationUserRoleUserRole()
+        => memoryCache.DropBasic<RelationUserUserRole>();
+
+    private IEnumerable<RelationUserRolePermission> GetCacheRelationUserRolePermissions()
+        => memoryCache.GetOrCreateBasic(dbContext.Set<RelationUserRolePermission>()
+        .Include(r => r.UserRole)
+        .Include(r => r.Permission));
+
+    private void DropCacheRelationUserRolePermissions()
+        => memoryCache.DropBasic<RelationUserRolePermission>();
+
+    private UserRoleDto Convert(UserRole entity)
+    {
+        var dto = entity.Adapt<UserRoleDto>();
+        if (entity.RelationUserRolePermissions?.Any() == true)
+        {
+            dto.Permissions = GetCacheRelationUserRolePermissions()
+                .Where(r => entity.Id == r.IdUserRole)
+                .Select(r => Convert(r.Permission));
+        }
+
+        if (entity.RelationUserRoleUserRoles?.Any() == true)
+        {
+            var rolesCache = GetCacheUserRole();
+            dto.Roles = entity.RelationUserRoleUserRoles
+                .Select(rel => Convert(rolesCache
+                    .First(r => r.Id == rel.IdInclude)))
+                .ToArray();
+        }
+        return dto;
+    }
+
+    private static PermissionDto Convert(Permission entity)
+    {
+        var dto = entity.Adapt<PermissionDto>();
+        return dto;
+    }
+
+    private static UserRole Convert(UserRoleDto dto)
+    {
+        var entity = dto.Adapt<UserRole>();
+        return entity;
+    }
 }
diff --git a/AsbCloudInfrastructure/Repository/UserSettingsRepository.cs b/AsbCloudInfrastructure/Repository/UserSettingsRepository.cs
index 56b797ca..b0ec32c6 100644
--- a/AsbCloudInfrastructure/Repository/UserSettingsRepository.cs
+++ b/AsbCloudInfrastructure/Repository/UserSettingsRepository.cs
@@ -5,69 +5,68 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+public class UserSettingsRepository : IUserSettingsRepository
 {
-    public class UserSettingsRepository : IUserSettingsRepository
+    private readonly IAsbCloudDbContext context;
+
+    public UserSettingsRepository(IAsbCloudDbContext context)
     {
-        private readonly IAsbCloudDbContext context;
+        this.context = context;
+    }
 
-        public UserSettingsRepository(IAsbCloudDbContext context)
+    public Task<System.Text.Json.JsonDocument?> GetOrDefaultAsync(int userId, string key, CancellationToken token)
+        => context.Set<UserSetting>()
+            .Where(s => s.IdUser == userId && s.Key == key)
+            .Select(s => s.Value)
+            .FirstOrDefaultAsync(token);
+
+    public async Task<int> UpsertAsync(int userId, string key, System.Text.Json.JsonDocument value, CancellationToken token)
+    {
+        var set = context.Set<UserSetting>();
+        var updatingItem = await set
+            .FirstOrDefaultAsync(s => s.IdUser == userId && s.Key == key, token);
+
+        if (updatingItem is null)
         {
-            this.context = context;
-        }
-
-        public Task<System.Text.Json.JsonDocument?> GetOrDefaultAsync(int userId, string key, CancellationToken token)
-            => context.Set<UserSetting>()
-                .Where(s => s.IdUser == userId && s.Key == key)
-                .Select(s => s.Value)
-                .FirstOrDefaultAsync(token);
-
-        public async Task<int> UpsertAsync(int userId, string key, System.Text.Json.JsonDocument value, CancellationToken token)
-        {
-            var set = context.Set<UserSetting>();
-            var updatingItem = await set
-                .FirstOrDefaultAsync(s => s.IdUser == userId && s.Key == key, token);
-
-            if (updatingItem is null)
+            var settings = new UserSetting
             {
-                var settings = new UserSetting
-                {
-                    IdUser = userId,
-                    Key = key,
-                    Value = value,
-                };
-                set.Add(settings);
-            }
-            else
-            {
-                updatingItem.Value = value;
-                set.Update(updatingItem);
-            }
-
-            return await context.SaveChangesAsync(token);
+                IdUser = userId,
+                Key = key,
+                Value = value,
+            };
+            set.Add(settings);
         }
-        
-        public async Task<int> DeleteAsync(int userId, string key, CancellationToken token)
+        else
         {
-            var set = context.Set<UserSetting>();
-            var removingItem = await set
-                .FirstOrDefaultAsync(s => s.IdUser == userId && s.Key == key, token);
-
-            if (removingItem is null)
-                return IUserSettingsRepository.ErrorKeyNotFound;
-
-            set.Remove(removingItem);
-            return await context.SaveChangesAsync(token);
+            updatingItem.Value = value;
+            set.Update(updatingItem);
         }
-        
-        public async Task<int> DeleteAsync(int userId, CancellationToken token)
-        {
-            var set = context.Set<UserSetting>();
-            var removingItems = set
-                .Where(s => s.IdUser == userId);
 
-            set.RemoveRange(removingItems);
-            return await context.SaveChangesAsync(token);
-        }
+        return await context.SaveChangesAsync(token);
+    }
+    
+    public async Task<int> DeleteAsync(int userId, string key, CancellationToken token)
+    {
+        var set = context.Set<UserSetting>();
+        var removingItem = await set
+            .FirstOrDefaultAsync(s => s.IdUser == userId && s.Key == key, token);
+
+        if (removingItem is null)
+            return IUserSettingsRepository.ErrorKeyNotFound;
+
+        set.Remove(removingItem);
+        return await context.SaveChangesAsync(token);
+    }
+    
+    public async Task<int> DeleteAsync(int userId, CancellationToken token)
+    {
+        var set = context.Set<UserSetting>();
+        var removingItems = set
+            .Where(s => s.IdUser == userId);
+
+        set.RemoveRange(removingItems);
+        return await context.SaveChangesAsync(token);
     }
 }
diff --git a/AsbCloudInfrastructure/Repository/WellFinalDocumentsRepository.cs b/AsbCloudInfrastructure/Repository/WellFinalDocumentsRepository.cs
index 7729242a..2b14f5f7 100644
--- a/AsbCloudInfrastructure/Repository/WellFinalDocumentsRepository.cs
+++ b/AsbCloudInfrastructure/Repository/WellFinalDocumentsRepository.cs
@@ -13,129 +13,127 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+
+public class WellFinalDocumentsRepository : IWellFinalDocumentsRepository
 {
+    private readonly IAsbCloudDbContext context;
+    private readonly FileService fileService;
+    private readonly IUserRepository userRepository;
 
-    public class WellFinalDocumentsRepository : IWellFinalDocumentsRepository
+    public WellFinalDocumentsRepository(IAsbCloudDbContext context, 
+        FileService fileService,
+        IUserRepository userRepository)
     {
-        private readonly IAsbCloudDbContext context;
-        private readonly FileService fileService;
-        private readonly IUserRepository userRepository;
-
-        public WellFinalDocumentsRepository(IAsbCloudDbContext context, 
-            FileService fileService,
-            IUserRepository userRepository)
-        {
-            this.context = context;
-            this.fileService = fileService;
-            this.userRepository = userRepository;
-        }
-
-        ///<inheritdoc/>
-        public async Task<IEnumerable<WellFinalDocumentDBDto>> UpdateRangeAsync(int idWell, IEnumerable<WellFinalDocumentInputDto> dtos, CancellationToken token)
-        {
-            if (!dtos.Any())
-                throw new ArgumentInvalidException(nameof(dtos), "Данные по категориям отсутствуют.");
-
-            var entities = dtos
-                .Where(dto => dto.IdsPublishers?.Any() == true)
-                .SelectMany(dto => dto.IdsPublishers
-                    .Select(idUser => new WellFinalDocument
-                    {
-                        IdCategory = dto.IdCategory,
-                        IdWell = idWell,
-                        IdUser = idUser
-                    }));
-
-            var itemsToDelete = context.WellFinalDocuments.Where(d => d.IdWell == idWell);
-            context.WellFinalDocuments.RemoveRange(itemsToDelete);
-
-            context.WellFinalDocuments.AddRange(entities);
-            await context.SaveChangesAsync(token).ConfigureAwait(false);
-
-            return entities.Adapt<IEnumerable<WellFinalDocumentDBDto>>();
-        }
-
-        ///<inheritdoc/>
-        public async Task<WellCaseDto> GetByWellIdAsync(int idWell, int idUser, CancellationToken token)
-        {
-            var entities = await context.WellFinalDocuments
-                .Include(d => d.Category)
-                .Include(d => d.User)
-                .Where(d => d.IdWell == idWell)
-                .AsNoTracking()
-                .ToArrayAsync(token)
-                .ConfigureAwait(false);
-
-            var entitiesGroups = entities
-                .GroupBy(d => d.IdCategory);
-
-            var categoriesIds = entitiesGroups
-                .Select(g => g.Key);
-
-            var files = (await fileService
-                .GetInfosAsync(new FileRequest { IdWell = idWell }, token)
-                .ConfigureAwait(false))
-                .Where(f => categoriesIds.Contains(f.IdCategory))
-                .ToArray();
-
-            var docs = entitiesGroups.Select((g) => new WellFinalDocumentDto
-            {
-                IdCategory = g.Key,
-                FilesCount = files
-                    .Where(f => f.IdCategory == g.Key)
-                    .Count(),
-                File = files
-                    .Where(f => f.IdCategory == g.Key)
-                    .OrderBy(f => f.UploadDate)
-                    .LastOrDefault(),
-                NameCategory = g.First().Category.Name,
-                Publishers = g.Select(i => i.User.Adapt<UserDto>()),
-                PermissionToUpload = g.Any(i => i.IdUser == idUser),
-            });
-
-            var result = new WellCaseDto
-            {
-                IdWell = idWell,
-                PermissionToSetPubliher = userRepository.HasPermission(idUser, "WellFinalDocuments.editPublisher"),
-                WellFinalDocuments = docs,
-            };
-
-            return result;
-        }
-
-        ///<inheritdoc/>
-        public async Task<IEnumerable<UserDto>> GetAvailableUsersAsync(int idWell, CancellationToken token)
-        {
-            var companyIds = await context.RelationCompaniesWells
-                .AsNoTracking()
-                .Where(x => x.IdWell == idWell).Select(x => x.IdCompany)
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-
-            var allUsers = await userRepository
-                .GetAllAsync(token)
-                .ConfigureAwait(false);
-
-            return allUsers.Where(x => companyIds.Contains(x.IdCompany))
-                .OrderBy(x => x.Surname)
-                .Select(u => u as UserDto)
-                .ToArray();
-        }
-
-        ///<inheritdoc/>
-        public async Task<WellFinalDocumentDBDto> GetCategoryAsync(int idWell, int idCategory, int idUser, CancellationToken token)
-        {
-            var entity = await context.WellFinalDocuments
-                .AsNoTracking()
-                .FirstOrDefaultAsync(x => x.IdWell == idWell && x.IdCategory == idCategory && x.IdUser == idUser, token) 
-                ?? throw new ArgumentInvalidException(nameof(idUser), "Пользователь не является ответственным за загрузку файла для данной категории.");
-            var dto = Convert(entity);
-            return dto;
-        }
-
-        private static WellFinalDocumentDBDto Convert(WellFinalDocument entity)
-            => entity.Adapt<WellFinalDocumentDBDto>();
+        this.context = context;
+        this.fileService = fileService;
+        this.userRepository = userRepository;
     }
 
+    ///<inheritdoc/>
+    public async Task<IEnumerable<WellFinalDocumentDBDto>> UpdateRangeAsync(int idWell, IEnumerable<WellFinalDocumentInputDto> dtos, CancellationToken token)
+    {
+        if (!dtos.Any())
+            throw new ArgumentInvalidException(nameof(dtos), "Данные по категориям отсутствуют.");
+
+        var entities = dtos
+            .Where(dto => dto.IdsPublishers?.Any() == true)
+            .SelectMany(dto => dto.IdsPublishers
+                .Select(idUser => new WellFinalDocument
+                {
+                    IdCategory = dto.IdCategory,
+                    IdWell = idWell,
+                    IdUser = idUser
+                }));
+
+        var itemsToDelete = context.WellFinalDocuments.Where(d => d.IdWell == idWell);
+        context.WellFinalDocuments.RemoveRange(itemsToDelete);
+
+        context.WellFinalDocuments.AddRange(entities);
+        await context.SaveChangesAsync(token).ConfigureAwait(false);
+
+        return entities.Adapt<IEnumerable<WellFinalDocumentDBDto>>();
+    }
+
+    ///<inheritdoc/>
+    public async Task<WellCaseDto> GetByWellIdAsync(int idWell, int idUser, CancellationToken token)
+    {
+        var entities = await context.WellFinalDocuments
+            .Include(d => d.Category)
+            .Include(d => d.User)
+            .Where(d => d.IdWell == idWell)
+            .AsNoTracking()
+            .ToArrayAsync(token)
+            .ConfigureAwait(false);
+
+        var entitiesGroups = entities
+            .GroupBy(d => d.IdCategory);
+
+        var categoriesIds = entitiesGroups
+            .Select(g => g.Key);
+
+        var files = (await fileService
+            .GetInfosAsync(new FileRequest { IdWell = idWell }, token)
+            .ConfigureAwait(false))
+            .Where(f => categoriesIds.Contains(f.IdCategory))
+            .ToArray();
+
+        var docs = entitiesGroups.Select((g) => new WellFinalDocumentDto
+        {
+            IdCategory = g.Key,
+            FilesCount = files
+                .Where(f => f.IdCategory == g.Key)
+                .Count(),
+            File = files
+                .Where(f => f.IdCategory == g.Key)
+                .OrderBy(f => f.UploadDate)
+                .LastOrDefault(),
+            NameCategory = g.First().Category.Name,
+            Publishers = g.Select(i => i.User.Adapt<UserDto>()),
+            PermissionToUpload = g.Any(i => i.IdUser == idUser),
+        });
+
+        var result = new WellCaseDto
+        {
+            IdWell = idWell,
+            PermissionToSetPubliher = userRepository.HasPermission(idUser, "WellFinalDocuments.editPublisher"),
+            WellFinalDocuments = docs,
+        };
+
+        return result;
+    }
+
+    ///<inheritdoc/>
+    public async Task<IEnumerable<UserDto>> GetAvailableUsersAsync(int idWell, CancellationToken token)
+    {
+        var companyIds = await context.RelationCompaniesWells
+            .AsNoTracking()
+            .Where(x => x.IdWell == idWell).Select(x => x.IdCompany)
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+
+        var allUsers = await userRepository
+            .GetAllAsync(token)
+            .ConfigureAwait(false);
+
+        return allUsers.Where(x => companyIds.Contains(x.IdCompany))
+            .OrderBy(x => x.Surname)
+            .Select(u => u as UserDto)
+            .ToArray();
+    }
+
+    ///<inheritdoc/>
+    public async Task<WellFinalDocumentDBDto> GetCategoryAsync(int idWell, int idCategory, int idUser, CancellationToken token)
+    {
+        var entity = await context.WellFinalDocuments
+            .AsNoTracking()
+            .FirstOrDefaultAsync(x => x.IdWell == idWell && x.IdCategory == idCategory && x.IdUser == idUser, token) 
+            ?? throw new ArgumentInvalidException(nameof(idUser), "Пользователь не является ответственным за загрузку файла для данной категории.");
+        var dto = Convert(entity);
+        return dto;
+    }
+
+    private static WellFinalDocumentDBDto Convert(WellFinalDocument entity)
+        => entity.Adapt<WellFinalDocumentDBDto>();
 }
diff --git a/AsbCloudInfrastructure/Repository/WitsRecordRepository.cs b/AsbCloudInfrastructure/Repository/WitsRecordRepository.cs
index 46ea461a..94045173 100644
--- a/AsbCloudInfrastructure/Repository/WitsRecordRepository.cs
+++ b/AsbCloudInfrastructure/Repository/WitsRecordRepository.cs
@@ -10,160 +10,159 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Repository
+namespace AsbCloudInfrastructure.Repository;
+
+public class WitsRecordRepository<TDto, TEntity> : IWitsRecordRepository<TDto>
+    where TEntity : AsbCloudDb.Model.WITS.RecordBase, ITelemetryData
+    where TDto : AsbCloudApp.Data.ITelemetryData
 {
-    public class WitsRecordRepository<TDto, TEntity> : IWitsRecordRepository<TDto>
-        where TEntity : AsbCloudDb.Model.WITS.RecordBase, ITelemetryData
-        where TDto : AsbCloudApp.Data.ITelemetryData
+    private static readonly Random random = new Random((int)(DateTime.Now.Ticks % 0xFFFFFFFF));
+    private readonly DbSet<TEntity> dbset;
+    private readonly IAsbCloudDbContext db;
+    private readonly ITelemetryService telemetryService;
+
+    private static readonly ConcurrentDictionary<int, TDto> cache = new();
+
+    public WitsRecordRepository(IAsbCloudDbContext db, ITelemetryService telemetryService)
     {
-        private static readonly Random random = new Random((int)(DateTime.Now.Ticks % 0xFFFFFFFF));
-        private readonly DbSet<TEntity> dbset;
-        private readonly IAsbCloudDbContext db;
-        private readonly ITelemetryService telemetryService;
+        dbset = db.Set<TEntity>();
+        this.db = db;
+        this.telemetryService = telemetryService;
+    }
 
-        private static readonly ConcurrentDictionary<int, TDto> cache = new();
+    public async Task<(DateTime begin, DateTime end, int count)?> GetStatAsync(int idTelemetry, CancellationToken token)
+    {
+        var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours;
+        var stat = await dbset.Where(d => d.IdTelemetry == idTelemetry)
+            .GroupBy(d => d.IdTelemetry)
+            .Select(g => new Tuple<DateTimeOffset, DateTimeOffset, int>(g.Min(d => d.DateTime), g.Max(d => d.DateTime), g.Count()))
+            .FirstOrDefaultAsync(token);
 
-        public WitsRecordRepository(IAsbCloudDbContext db, ITelemetryService telemetryService)
+        if (stat is null || stat.Item3 == 0)
+            return null;
+
+        return (
+            stat.Item1.ToRemoteDateTime(timezoneHours),
+            stat.Item2.ToRemoteDateTime(timezoneHours),
+            stat.Item3);
+    }
+
+    public async Task<IEnumerable<TDto>> GetAsync(int idTelemetry, DateTime begin, DateTime end, CancellationToken token)
+    {
+        var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours;
+        var query = dbset
+            .Where(d => d.IdTelemetry == idTelemetry)
+            .Where(d => d.DateTime >= begin)
+            .Where(d => d.DateTime <= end)
+            .AsNoTracking();
+        var data = await query.ToListAsync(token);
+        return data.Select(d => Convert(d, timezoneHours));
+    }
+
+    private IQueryable<TEntity> BuildQuery(TelemetryPartDeleteRequest request)
+    {
+        var query = db.Set<TEntity>()
+            .Where(o => o.IdTelemetry == request.IdTelemetry);
+
+        if (request.LeDate is not null)
         {
-            dbset = db.Set<TEntity>();
-            this.db = db;
-            this.telemetryService = telemetryService;
+            var leDate = request.LeDate.Value.ToUniversalTime();
+            query = query.Where(o => o.DateTime <= leDate);
         }
 
-        public async Task<(DateTime begin, DateTime end, int count)?> GetStatAsync(int idTelemetry, CancellationToken token)
+        if (request.GeDate is not null)
         {
-            var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours;
-            var stat = await dbset.Where(d => d.IdTelemetry == idTelemetry)
-                .GroupBy(d => d.IdTelemetry)
-                .Select(g => new Tuple<DateTimeOffset, DateTimeOffset, int>(g.Min(d => d.DateTime), g.Max(d => d.DateTime), g.Count()))
-                .FirstOrDefaultAsync(token);
-
-            if (stat is null || stat.Item3 == 0)
-                return null;
-
-            return (
-                stat.Item1.ToRemoteDateTime(timezoneHours),
-                stat.Item2.ToRemoteDateTime(timezoneHours),
-                stat.Item3);
+            var geDate = request.GeDate.Value.ToUniversalTime();
+            query = query.Where(o => o.DateTime >= geDate);
         }
 
-        public async Task<IEnumerable<TDto>> GetAsync(int idTelemetry, DateTime begin, DateTime end, CancellationToken token)
-        {
-            var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours;
-            var query = dbset
-                .Where(d => d.IdTelemetry == idTelemetry)
-                .Where(d => d.DateTime >= begin)
-                .Where(d => d.DateTime <= end)
-                .AsNoTracking();
-            var data = await query.ToListAsync(token);
-            return data.Select(d => Convert(d, timezoneHours));
-        }
+        return query;
+    }
 
-        private IQueryable<TEntity> BuildQuery(TelemetryPartDeleteRequest request)
-        {
-            var query = db.Set<TEntity>()
-                .Where(o => o.IdTelemetry == request.IdTelemetry);
+    public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
+    {
+        var query = BuildQuery(request);
+        dbset.RemoveRange(query);
+        return await db.SaveChangesAsync(token);
+    }
 
-            if (request.LeDate is not null)
+    public TDto? GetLastOrDefault(int idTelemetry)
+        => cache.GetValueOrDefault(idTelemetry);
+
+    public async Task SaveDataAsync(int idTelemetry, IEnumerable<TDto> dtos, CancellationToken token)
+    {
+        if (!dtos.Any())
+            return;
+
+        cache.AddOrUpdate(idTelemetry, dtos.Last(), (_, _) => dtos.OrderBy(r => r.DateTime).Last());
+
+        var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours;
+        var entities = dtos
+            .DistinctBy(d => d.DateTime)
+            .Select(dto => Convert(dto, idTelemetry, timezoneHours));
+
+        var dateMin = entities.Min(e => e.DateTime);
+        var dateMax = entities.Max(e => e.DateTime);
+        var existingEntities = await db.Set<AsbCloudDb.Model.WITS.RecordBase>()
+            .Where(e => e.IdTelemetry == idTelemetry)
+            .Where(e => e.DateTime >= dateMin && e.DateTime <= dateMax)
+            .Select(e => e.DateTime)
+            .OrderBy(d => d)
+            .ToArrayAsync(token);
+
+        foreach (var entity in entities)
+        {
+            if (!existingEntities.Any(e => e == entity.DateTime))
             {
-                var leDate = request.LeDate.Value.ToUniversalTime();
-                query = query.Where(o => o.DateTime <= leDate);
+                dbset.Add(entity);
             }
-
-            if (request.GeDate is not null)
+            else
             {
-                var geDate = request.GeDate.Value.ToUniversalTime();
-                query = query.Where(o => o.DateTime >= geDate);
+                var dt = entity.DateTime;
+                entity.DateTime = new DateTimeOffset(
+                    dt.Year,
+                    dt.Month,
+                    dt.Day,
+                    dt.Hour,
+                    dt.Minute,
+                    dt.Second,
+                    (dt.Millisecond + random.Next(1, 283)) % 1000,
+                    dt.Offset);
+                dbset.Add(entity);
             }
-
-            return query;
         }
 
-        public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
+        await db.SaveChangesAsync(token);
+    }
+
+    private static short GetRecId(TDto dto)
+    {
+        var recid = dto switch
         {
-            var query = BuildQuery(request);
-            dbset.RemoveRange(query);
-            return await db.SaveChangesAsync(token);
-        }
+            AsbCloudApp.Data.WITS.Record1Dto _ => 1,
+            AsbCloudApp.Data.WITS.Record7Dto _ => 7,
+            AsbCloudApp.Data.WITS.Record8Dto _ => 8,
+            AsbCloudApp.Data.WITS.Record50Dto _ => 50,
+            AsbCloudApp.Data.WITS.Record60Dto _ => 60,
+            AsbCloudApp.Data.WITS.Record61Dto _ => 61,
+            _ => 0,
+        };
+        return (short)recid;
+    }
 
-        public TDto? GetLastOrDefault(int idTelemetry)
-            => cache.GetValueOrDefault(idTelemetry);
+    private static TEntity Convert(TDto dto, int idTelemetry, double timezoneHours)
+    {
+        var entity = dto.Adapt<TEntity>();
+        entity.Recid = GetRecId(dto);
+        entity.IdTelemetry = idTelemetry;
+        entity.DateTime = dto.DateTime.ToUtcDateTimeOffset(timezoneHours);
+        return entity;
+    }
 
-        public async Task SaveDataAsync(int idTelemetry, IEnumerable<TDto> dtos, CancellationToken token)
-        {
-            if (!dtos.Any())
-                return;
-
-            cache.AddOrUpdate(idTelemetry, dtos.Last(), (_, _) => dtos.OrderBy(r => r.DateTime).Last());
-
-            var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours;
-            var entities = dtos
-                .DistinctBy(d => d.DateTime)
-                .Select(dto => Convert(dto, idTelemetry, timezoneHours));
-
-            var dateMin = entities.Min(e => e.DateTime);
-            var dateMax = entities.Max(e => e.DateTime);
-            var existingEntities = await db.Set<AsbCloudDb.Model.WITS.RecordBase>()
-                .Where(e => e.IdTelemetry == idTelemetry)
-                .Where(e => e.DateTime >= dateMin && e.DateTime <= dateMax)
-                .Select(e => e.DateTime)
-                .OrderBy(d => d)
-                .ToArrayAsync(token);
-
-            foreach (var entity in entities)
-            {
-                if (!existingEntities.Any(e => e == entity.DateTime))
-                {
-                    dbset.Add(entity);
-                }
-                else
-                {
-                    var dt = entity.DateTime;
-                    entity.DateTime = new DateTimeOffset(
-                        dt.Year,
-                        dt.Month,
-                        dt.Day,
-                        dt.Hour,
-                        dt.Minute,
-                        dt.Second,
-                        (dt.Millisecond + random.Next(1, 283)) % 1000,
-                        dt.Offset);
-                    dbset.Add(entity);
-                }
-            }
-
-            await db.SaveChangesAsync(token);
-        }
-
-        private static short GetRecId(TDto dto)
-        {
-            var recid = dto switch
-            {
-                AsbCloudApp.Data.WITS.Record1Dto _ => 1,
-                AsbCloudApp.Data.WITS.Record7Dto _ => 7,
-                AsbCloudApp.Data.WITS.Record8Dto _ => 8,
-                AsbCloudApp.Data.WITS.Record50Dto _ => 50,
-                AsbCloudApp.Data.WITS.Record60Dto _ => 60,
-                AsbCloudApp.Data.WITS.Record61Dto _ => 61,
-                _ => 0,
-            };
-            return (short)recid;
-        }
-
-        private static TEntity Convert(TDto dto, int idTelemetry, double timezoneHours)
-        {
-            var entity = dto.Adapt<TEntity>();
-            entity.Recid = GetRecId(dto);
-            entity.IdTelemetry = idTelemetry;
-            entity.DateTime = dto.DateTime.ToUtcDateTimeOffset(timezoneHours);
-            return entity;
-        }
-
-        private static TDto Convert(TEntity entity, double timezoneHours)
-        {
-            var data = entity.Adapt<TDto>();
-            data.DateTime = entity.DateTime.ToRemoteDateTime(timezoneHours);
-            return data;
-        }
+    private static TDto Convert(TEntity entity, double timezoneHours)
+    {
+        var data = entity.Adapt<TDto>();
+        data.DateTime = entity.DateTime.ToRemoteDateTime(timezoneHours);
+        return data;
     }
 }
diff --git a/AsbCloudInfrastructure/Services/AuthService.cs b/AsbCloudInfrastructure/Services/AuthService.cs
index 91b6f22b..3d17f5fd 100644
--- a/AsbCloudInfrastructure/Services/AuthService.cs
+++ b/AsbCloudInfrastructure/Services/AuthService.cs
@@ -17,212 +17,211 @@ using System.Threading;
 using System.Threading.Tasks;
 
 
-namespace AsbCloudInfrastructure.Services
+namespace AsbCloudInfrastructure.Services;
+
+/// <inheritdoc/>
+public class AuthService : IAuthService
 {
-    /// <inheritdoc/>
-    public class AuthService : IAuthService
+    private readonly IAsbCloudDbContext db;
+    private readonly IUserRepository userRepository;
+
+    public const string issuer = "a";
+    public const string audience = "a";
+    public static readonly SymmetricSecurityKey securityKey = new(Encoding.ASCII.GetBytes("супер секретный ключ для шифрования"));
+    private const string algorithms = SecurityAlgorithms.HmacSha256;
+
+    private static readonly TimeSpan expiresTimespan = TimeSpan.FromDays(365.25);
+    private static readonly Encoding encoding = Encoding.UTF8;
+    private const int PasswordSaltLength = 5;
+    private const string claimIdUser = "id";
+    private const string claimNameIdCompany = "idCompany";
+    private readonly HashAlgorithm hashAlgorithm;
+    private readonly Random rnd;
+
+    public AuthService(IAsbCloudDbContext db, IUserRepository userRepository)
     {
-        private readonly IAsbCloudDbContext db;
-        private readonly IUserRepository userRepository;
+        this.db = db;
+        this.userRepository = userRepository;
+        hashAlgorithm = SHA384.Create();
+        rnd = new Random((int)(DateTime.Now.Ticks % 2147480161));
+    }
 
-        public const string issuer = "a";
-        public const string audience = "a";
-        public static readonly SymmetricSecurityKey securityKey = new(Encoding.ASCII.GetBytes("супер секретный ключ для шифрования"));
-        private const string algorithms = SecurityAlgorithms.HmacSha256;
+    /// <inheritdoc/>
+    public async Task<UserTokenDto?> LoginAsync(string login, string password,
+        CancellationToken token)
+    {
+        var user = await GetUserByLoginAsync(login, token);
+        if (user is null)
+            return null;
 
-        private static readonly TimeSpan expiresTimespan = TimeSpan.FromDays(365.25);
-        private static readonly Encoding encoding = Encoding.UTF8;
-        private const int PasswordSaltLength = 5;
-        private const string claimIdUser = "id";
-        private const string claimNameIdCompany = "idCompany";
-        private readonly HashAlgorithm hashAlgorithm;
-        private readonly Random rnd;
+        if (!CheckPassword(user.PasswordHash, password))
+            return null;
 
-        public AuthService(IAsbCloudDbContext db, IUserRepository userRepository)
+        return await MakeUserTokenDto(user, token);
+    }
+
+    /// <inheritdoc/>
+    public async Task<UserTokenDto?> RefreshAsync(ClaimsPrincipal identity,
+        CancellationToken token)
+    {
+        var login = identity.FindFirst(ClaimsIdentity.DefaultNameClaimType)?.Value;
+        if (string.IsNullOrEmpty(login))
+            return null;
+
+        var user = await GetUserByLoginAsync(login, token);
+        if (user is null)
+            return null;
+
+        var dto = await MakeUserTokenDto(user, token);
+        return dto;
+    }
+
+    /// <inheritdoc/>
+    public void Register(UserRegistrationDto userDto)
+    {
+        var user = db.Users.FirstOrDefault(u => u.Login == userDto.Login) 
+            ?? throw new ArgumentInvalidException(nameof(userDto.Login), "Логин уже занят");
+
+        var salt = GenerateSalt();
+
+        var newUser = new User
         {
-            this.db = db;
-            this.userRepository = userRepository;
-            hashAlgorithm = SHA384.Create();
-            rnd = new Random((int)(DateTime.Now.Ticks % 2147480161));
-        }
+            IdCompany = userDto.IdCompany,
+            IdState = 0,
+            Name = userDto.Name,
+            Surname = userDto.Surname,
+            Patronymic = userDto.Patronymic,
+            Email = userDto.Email,
+            Phone = userDto.Phone,
+            Position = userDto.Position,
+            Login = userDto.Login,
+            PasswordHash = salt + ComputeHash(salt, userDto.Password),
+        };
 
-        /// <inheritdoc/>
-        public async Task<UserTokenDto?> LoginAsync(string login, string password,
-            CancellationToken token)
+        db.Users.Add(newUser);
+        db.SaveChanges();
+        db.RelationUserUserRoles.Add(new RelationUserUserRole
         {
-            var user = await GetUserByLoginAsync(login, token);
-            if (user is null)
-                return null;
+            IdUser = newUser.Id,
+            IdUserRole = 2
+        });
+        db.SaveChanges();
+    }
 
-            if (!CheckPassword(user.PasswordHash, password))
-                return null;
+    /// <inheritdoc/>
+    public void ChangePassword(string userLogin, string newPassword)
+    {
+        var user = db.Users.FirstOrDefault(u => u.Login == userLogin) 
+            ?? throw new ArgumentInvalidException(nameof(userLogin), "Логин не зарегистрирован");
 
-            return await MakeUserTokenDto(user, token);
-        }
+        var salt = GenerateSalt();
+        user.PasswordHash = salt + ComputeHash(salt, newPassword);
+        db.SaveChanges();
+    }
 
-        /// <inheritdoc/>
-        public async Task<UserTokenDto?> RefreshAsync(ClaimsPrincipal identity,
-            CancellationToken token)
-        {
-            var login = identity.FindFirst(ClaimsIdentity.DefaultNameClaimType)?.Value;
-            if (string.IsNullOrEmpty(login))
-                return null;
+    /// <inheritdoc/>
+    public void ChangePassword(int idUser, string newPassword)
+    {
+        var user = db.Users.FirstOrDefault(u => u.Id == idUser) 
+            ?? throw new ArgumentInvalidException(nameof(idUser), $"Пользователь с idUser:{idUser} не зарегистрирован");
 
-            var user = await GetUserByLoginAsync(login, token);
-            if (user is null)
-                return null;
+        var salt = GenerateSalt();
+        user.PasswordHash = salt + ComputeHash(salt, newPassword);
+        db.SaveChanges();
+    }
 
-            var dto = await MakeUserTokenDto(user, token);
-            return dto;
-        }
+    private async Task<UserTokenDto?> MakeUserTokenDto(User user, CancellationToken token)
+    {
+        var identity = MakeClaims(user);
+        if (identity is null || user.IdState == 0)
+            return null;
 
-        /// <inheritdoc/>
-        public void Register(UserRegistrationDto userDto)
-        {
-            var user = db.Users.FirstOrDefault(u => u.Login == userDto.Login) 
-                ?? throw new ArgumentInvalidException(nameof(userDto.Login), "Логин уже занят");
+        var userDto = await userRepository.GetOrDefaultAsync(user.Id, token);
+        if (userDto is null)
+            return null;
 
-            var salt = GenerateSalt();
+        var dto = userDto.Adapt<UserTokenDto>();
+        dto.Permissions = userRepository.GetNestedPermissions(userDto.Id);
+        dto.Token = MakeToken(identity.Claims);
+        return dto;
+    }
 
-            var newUser = new User
+    private static string MakeToken(IEnumerable<Claim> claims)
+    {
+        var now = DateTime.Now;
+
+        var jwt = new JwtSecurityToken(
+                issuer,
+                audience,
+                notBefore: now,
+                claims: claims,
+                expires: now.Add(expiresTimespan),
+                signingCredentials: new SigningCredentials(securityKey, algorithms));
+
+        return new JwtSecurityTokenHandler().WriteToken(jwt);
+    }
+
+    private async Task<User?> GetUserByLoginAsync(string login, CancellationToken token = default)
+    {
+        var user = await db.Users
+            .Include(e => e.Company)
+            .Where(e => e.Login == login)
+            .AsNoTracking()
+            .FirstOrDefaultAsync(token)
+            .ConfigureAwait(false);
+        return user;
+    }
+
+    private ClaimsIdentity MakeClaims(User user)
+    {
+        var claims = new List<Claim>
             {
-                IdCompany = userDto.IdCompany,
-                IdState = 0,
-                Name = userDto.Name,
-                Surname = userDto.Surname,
-                Patronymic = userDto.Patronymic,
-                Email = userDto.Email,
-                Phone = userDto.Phone,
-                Position = userDto.Position,
-                Login = userDto.Login,
-                PasswordHash = salt + ComputeHash(salt, userDto.Password),
+                new (claimIdUser, user.Id.ToString()),
+                new (ClaimsIdentity.DefaultNameClaimType, user.Login),
+                new (claimNameIdCompany, user.IdCompany.ToString()),
             };
+        var roles = userRepository.GetRolesByIdUser(user.Id);
+        if (roles is not null)
+            foreach (var role in roles)
+                claims.Add(new Claim(ClaimsIdentity.DefaultRoleClaimType, role.Caption));
 
-            db.Users.Add(newUser);
-            db.SaveChanges();
-            db.RelationUserUserRoles.Add(new RelationUserUserRole
-            {
-                IdUser = newUser.Id,
-                IdUserRole = 2
-            });
-            db.SaveChanges();
-        }
+        var claimsIdentity = new ClaimsIdentity(claims, "Token", ClaimsIdentity.DefaultNameClaimType, ClaimsIdentity.DefaultRoleClaimType);
+        return claimsIdentity;
+    }
 
-        /// <inheritdoc/>
-        public void ChangePassword(string userLogin, string newPassword)
-        {
-            var user = db.Users.FirstOrDefault(u => u.Login == userLogin) 
-                ?? throw new ArgumentInvalidException(nameof(userLogin), "Логин не зарегистрирован");
+    private bool CheckPassword(string passwordHash, string password)
+    {
+        if (passwordHash?.Length == 0 && password.Length == 0)
+            return true;
 
-            var salt = GenerateSalt();
-            user.PasswordHash = salt + ComputeHash(salt, newPassword);
-            db.SaveChanges();
-        }
+        if (passwordHash?.Length < PasswordSaltLength)
+            return false;
 
-        /// <inheritdoc/>
-        public void ChangePassword(int idUser, string newPassword)
-        {
-            var user = db.Users.FirstOrDefault(u => u.Id == idUser) 
-                ?? throw new ArgumentInvalidException(nameof(idUser), $"Пользователь с idUser:{idUser} не зарегистрирован");
+        if (passwordHash is null)
+            return false;
 
-            var salt = GenerateSalt();
-            user.PasswordHash = salt + ComputeHash(salt, newPassword);
-            db.SaveChanges();
-        }
+        var salt = passwordHash[0..PasswordSaltLength];
+        var hashDb = passwordHash[PasswordSaltLength..];
 
-        private async Task<UserTokenDto?> MakeUserTokenDto(User user, CancellationToken token)
-        {
-            var identity = MakeClaims(user);
-            if (identity is null || user.IdState == 0)
-                return null;
+        return hashDb == ComputeHash(salt, password);
+    }
 
-            var userDto = await userRepository.GetOrDefaultAsync(user.Id, token);
-            if (userDto is null)
-                return null;
+    private string ComputeHash(string salt, string password)
+    {
+        var hashBytes = hashAlgorithm.ComputeHash(encoding.GetBytes(salt + password));
+        var hashString = BitConverter.ToString(hashBytes)
+                .Replace("-", "")
+                .ToLower();
+        return hashString;
+    }
 
-            var dto = userDto.Adapt<UserTokenDto>();
-            dto.Permissions = userRepository.GetNestedPermissions(userDto.Id);
-            dto.Token = MakeToken(identity.Claims);
-            return dto;
-        }
-
-        private static string MakeToken(IEnumerable<Claim> claims)
-        {
-            var now = DateTime.Now;
-
-            var jwt = new JwtSecurityToken(
-                    issuer,
-                    audience,
-                    notBefore: now,
-                    claims: claims,
-                    expires: now.Add(expiresTimespan),
-                    signingCredentials: new SigningCredentials(securityKey, algorithms));
-
-            return new JwtSecurityTokenHandler().WriteToken(jwt);
-        }
-
-        private async Task<User?> GetUserByLoginAsync(string login, CancellationToken token = default)
-        {
-            var user = await db.Users
-                .Include(e => e.Company)
-                .Where(e => e.Login == login)
-                .AsNoTracking()
-                .FirstOrDefaultAsync(token)
-                .ConfigureAwait(false);
-            return user;
-        }
-
-        private ClaimsIdentity MakeClaims(User user)
-        {
-            var claims = new List<Claim>
-                {
-                    new (claimIdUser, user.Id.ToString()),
-                    new (ClaimsIdentity.DefaultNameClaimType, user.Login),
-                    new (claimNameIdCompany, user.IdCompany.ToString()),
-                };
-            var roles = userRepository.GetRolesByIdUser(user.Id);
-            if (roles is not null)
-                foreach (var role in roles)
-                    claims.Add(new Claim(ClaimsIdentity.DefaultRoleClaimType, role.Caption));
-
-            var claimsIdentity = new ClaimsIdentity(claims, "Token", ClaimsIdentity.DefaultNameClaimType, ClaimsIdentity.DefaultRoleClaimType);
-            return claimsIdentity;
-        }
-
-        private bool CheckPassword(string passwordHash, string password)
-        {
-            if (passwordHash?.Length == 0 && password.Length == 0)
-                return true;
-
-            if (passwordHash?.Length < PasswordSaltLength)
-                return false;
-
-            if (passwordHash is null)
-                return false;
-
-            var salt = passwordHash[0..PasswordSaltLength];
-            var hashDb = passwordHash[PasswordSaltLength..];
-
-            return hashDb == ComputeHash(salt, password);
-        }
-
-        private string ComputeHash(string salt, string password)
-        {
-            var hashBytes = hashAlgorithm.ComputeHash(encoding.GetBytes(salt + password));
-            var hashString = BitConverter.ToString(hashBytes)
-                    .Replace("-", "")
-                    .ToLower();
-            return hashString;
-        }
-
-        private string GenerateSalt()
-        {
-            const string saltChars = "sHwiaX7kZT1QRp0cPILGUuK2Sz=9q8lmejDNfoYCE3B_WtgyVv6M5OxAJ4Frbhnd";
-            var salt = "";
-            for (var i = 0; i < PasswordSaltLength - 1; i++)
-                salt += saltChars[rnd.Next(0, saltChars.Length)];
-            salt += "|";
-            return salt;
-        }
+    private string GenerateSalt()
+    {
+        const string saltChars = "sHwiaX7kZT1QRp0cPILGUuK2Sz=9q8lmejDNfoYCE3B_WtgyVv6M5OxAJ4Frbhnd";
+        var salt = "";
+        for (var i = 0; i < PasswordSaltLength - 1; i++)
+            salt += saltChars[rnd.Next(0, saltChars.Length)];
+        salt += "|";
+        return salt;
     }
 }
diff --git a/AsbCloudInfrastructure/Services/DataSaubStatService.cs b/AsbCloudInfrastructure/Services/DataSaubStatService.cs
index e54a380d..bdeaf6eb 100644
--- a/AsbCloudInfrastructure/Services/DataSaubStatService.cs
+++ b/AsbCloudInfrastructure/Services/DataSaubStatService.cs
@@ -11,227 +11,225 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services
+namespace AsbCloudInfrastructure.Services;
+
+
+public class DataSaubStatService : IDataSaubStatService
 {
+    private IDataSaubStatRepository dataSaubStatRepository;
+    private ITelemetryDataCache<TelemetryDataSaubDto> telemetryDataCache;
+    private ITelemetryDataSaubService dataSaubService;
+    private IDetectedOperationRepository detectedOperationRepository;
 
-    public class DataSaubStatService : IDataSaubStatService
+    public DataSaubStatService(
+        IDataSaubStatRepository dataSaubStatRepository,
+        ITelemetryDataCache<TelemetryDataSaubDto> telemetryDataCache,
+        ITelemetryDataSaubService dataSaubService,
+        IDetectedOperationRepository detectedOperationRepository)
     {
-        private IDataSaubStatRepository dataSaubStatRepository;
-        private ITelemetryDataCache<TelemetryDataSaubDto> telemetryDataCache;
-        private ITelemetryDataSaubService dataSaubService;
-        private IDetectedOperationRepository detectedOperationRepository;
+        this.dataSaubStatRepository = dataSaubStatRepository;
+        this.telemetryDataCache = telemetryDataCache;
+        this.dataSaubService = dataSaubService;
+        this.detectedOperationRepository = detectedOperationRepository;
+    }
 
-        public DataSaubStatService(
-            IDataSaubStatRepository dataSaubStatRepository,
-            ITelemetryDataCache<TelemetryDataSaubDto> telemetryDataCache,
-            ITelemetryDataSaubService dataSaubService,
-            IDetectedOperationRepository detectedOperationRepository)
+    public async Task CreateStatAsync(int lastDaysFilter, Action<string, double?> onProgressCallback, CancellationToken token)
+    {
+        var cacheRequest = new TelemetryDataRequest()
         {
-            this.dataSaubStatRepository = dataSaubStatRepository;
-            this.telemetryDataCache = telemetryDataCache;
-            this.dataSaubService = dataSaubService;
-            this.detectedOperationRepository = detectedOperationRepository;
-        }
+            GeDate = DateTime.UtcNow.AddDays(-lastDaysFilter)
+        };
+        var idTelemetries = telemetryDataCache.GetIds(cacheRequest).ToArray();
 
-        public async Task CreateStatAsync(int lastDaysFilter, Action<string, double?> onProgressCallback, CancellationToken token)
+        if (!idTelemetries.Any())
+            return;
+
+        var stats = await dataSaubStatRepository.GetLastsAsync(idTelemetries, token);
+
+        for (var i = 0; i < idTelemetries.Length; i++)
         {
-            var cacheRequest = new TelemetryDataRequest()
-            {
-                GeDate = DateTime.UtcNow.AddDays(-lastDaysFilter)
-            };
-            var idTelemetries = telemetryDataCache.GetIds(cacheRequest).ToArray();
-
-            if (!idTelemetries.Any())
-                return;
-
-            var stats = await dataSaubStatRepository.GetLastsAsync(idTelemetries, token);
-
-            for (var i = 0; i < idTelemetries.Length; i++)
-            {
-                var idTelemetry = idTelemetries[i];
-                var lastDate = stats.FirstOrDefault(s => s.IdTelemetry == idTelemetry)?.DateEnd.ToUniversalTime() ?? DateTimeOffset.UnixEpoch;
-                var statsCount = await CreateStatForTelemetryFromDate(idTelemetry, lastDate, token);
-                if(onProgressCallback != null)
-                    onProgressCallback($"Calculate stat for telemetry: {idTelemetry}; from {lastDate}; results count: {statsCount};", 1d * i / idTelemetries.Length);
-            }
-        }
-
-        private async Task<int> CreateStatForTelemetryFromDate(
-            int idTelemetry,
-            DateTimeOffset begin,
-            CancellationToken token)
-        {
-            var detectedOperationRequest = new DetectedOperationByTelemetryRequest
-            {
-                GeDateStart = begin,
-                IdTelemetry = idTelemetry,
-                IdsCategories = WellOperationCategory.MechanicalDrillingSubIds,
-                SortFields = new[] { nameof(DetectedOperation.DateStart) },
-                Take = 250,
-            };
-
-            var detectedOperations = await detectedOperationRepository.Get(detectedOperationRequest, token);
-
-            if (!detectedOperations.Any())
-                return 0;
-
-            var geDate = detectedOperations.First().DateStart;
-            var leDate = detectedOperations.OrderByDescending(d => d.DateEnd).First().DateEnd;
-
-            var dataSaub = await dataSaubService.Get(idTelemetry, true, geDate, leDate, 100_000, token);
-
-            if (!dataSaub.Any())
-                return 0;
-
-            if (dataSaub is not TelemetryDataSaubDto[] dataSaubArray)
-                dataSaubArray = dataSaub.ToArray();
-
-            var dataSaubStats = CreateDataSaubStat(detectedOperations, dataSaubArray);
-
-            return await dataSaubStatRepository.InsertRangeAsync(dataSaubStats, token);
-        }
-
-        private static IEnumerable<DataSaubStatDto> CreateDataSaubStat(IEnumerable<DetectedOperationDto> detectedOperations, TelemetryDataSaubDto[] dataSaub)
-        {
-            var indexStart = 0;
-            var indexEnd = 0;
-            var result = new List<DataSaubStatDto>();
-
-            if (!dataSaub.Any())
-                return result;
-
-            foreach (var operation in detectedOperations)
-            {
-                indexStart = Array.FindIndex(dataSaub, indexEnd, t => t.DateTime >= operation.DateStart);
-                if (indexStart < 0)
-                    break;
-
-                indexEnd = Array.FindIndex(dataSaub, indexStart, t => t.DateTime > operation.DateEnd);
-
-                if (indexEnd < 0)
-                    indexEnd = dataSaub.Length - 1;
-
-                if (indexEnd == indexStart)
-                    continue;
-
-                var length = indexEnd - indexStart + 1;
-
-                var subset = dataSaub.AsSpan(indexStart, length);
-                var stats = CalcStats(operation, subset);
-                result.AddRange(stats);
-            }
-            return result;
-        }
-
-        private static IEnumerable<DataSaubStatDto> CalcStats(DetectedOperationDto operation, Span<TelemetryDataSaubDto> dataSaub)
-        {
-            var result = new List<DataSaubStatDto>();
-
-            var indexStart = 0;
-            for (var i = 1; i < dataSaub.Length; i++)
-            {
-                var previous = dataSaub[i - 1];
-                var current = dataSaub[i];
-
-                if (IsNewCacheItem(previous, current) || i == dataSaub.Length - 1)
-                {
-                    var length = i - indexStart + 1;
-                    var span = dataSaub.Slice(indexStart, length);
-                    indexStart = i;
-                    if (length <= 2 || (span[^1].WellDepth - span[0].WellDepth) < 0.001)
-                        continue; // мелкие выборки не учитываем.
-                    var stat = CalcStat(operation, span);
-                    result.Add(stat);
-                }
-            }
-
-            return result;
-        }
-
-        private static DataSaubStatDto CalcStat(DetectedOperationDto operation, Span<TelemetryDataSaubDto> span)
-        {
-            var aggregatedValues = CalcAggregate(span);
-            var dateStart = span[0].DateTime;
-            var dateEnd = span[^1].DateTime;
-            var depthStart = span[0].WellDepth;
-            var depthEnd = span[^1].WellDepth;
-            var speed = ((depthEnd - depthStart) / (dateEnd - dateStart).TotalHours);
-
-            var processMapDrillingCacheItem = new DataSaubStatDto
-            {
-                DateStart = dateStart,
-                DateEnd = dateEnd,
-                DepthStart = depthStart,
-                DepthEnd = depthEnd,
-                Speed = speed,
-                BlockSpeedSp = span[0].BlockSpeedSp,
-                Pressure = aggregatedValues.Pressure,
-                PressureIdle = span[0].PressureIdle,
-                PressureSp = span[0].PressureSp,
-                AxialLoad = aggregatedValues.AxialLoad,
-                AxialLoadSp = span[0].AxialLoadSp,
-                AxialLoadLimitMax = span[0].AxialLoadLimitMax,
-                RotorTorque = aggregatedValues.RotorTorque,
-                RotorTorqueSp = span[0].RotorTorqueSp,
-                RotorTorqueLimitMax = span[0].RotorTorqueLimitMax,
-                IdFeedRegulator = span[0].IdFeedRegulator,
-                RotorSpeed = aggregatedValues.RotorSpeed,
-                IdCategory = operation.IdCategory,
-                EnabledSubsystems = operation.EnabledSubsystems,
-                HasOscillation = operation.EnabledSubsystems.IsAutoOscillation,
-                IdTelemetry = operation.IdTelemetry,
-                Flow = aggregatedValues.Flow
-            };
-            return processMapDrillingCacheItem;
-        }
-
-        private static (
-            double Pressure,
-            double AxialLoad,
-            double RotorTorque,
-            double RotorSpeed,
-            double Flow
-            ) CalcAggregate(Span<TelemetryDataSaubDto> span)
-        {
-            var sumPressure = 0.0;
-            var sumAxialLoad = 0.0;
-            var sumRotorTorque = 0.0;
-            var sumRotorSpeed = 0.0;
-            var flow = span[0].Flow ?? 0.0;
-            var diffDepthTotal = span[^1].WellDepth - span[0].WellDepth;
-            for (var i = 0; i < span.Length - 1; i++)
-            {
-                var diffDepth = span[i + 1].WellDepth - span[i].WellDepth;
-                sumPressure += diffDepth * span[i].Pressure;
-                sumAxialLoad += diffDepth * span[i].AxialLoad;
-                sumRotorTorque += diffDepth * span[i].RotorTorque;
-                sumRotorSpeed += diffDepth * span[i].RotorSpeed;
-                flow = span[i + 1].Flow > flow ? span[i + 1].Flow ?? 0.0 : flow;
-            }
-            return (
-                Pressure: sumPressure / diffDepthTotal,
-                AxialLoad: sumAxialLoad / diffDepthTotal,
-                RotorTorque: sumRotorTorque / diffDepthTotal,
-                RotorSpeed: sumRotorSpeed / diffDepthTotal,
-                Flow: flow
-            );
-        }
-
-        private static bool IsNewCacheItem(TelemetryDataSaubDto previous, TelemetryDataSaubDto current)
-        {
-            return !(current.Mode == previous.Mode)
-                 || !(current.WellDepth >= previous.WellDepth)
-                 || !(current.BlockSpeedSp == previous.BlockSpeedSp)
-                 || !(current.PressureIdle == previous.PressureIdle)
-                 || !(current.PressureSp == previous.PressureSp)
-                 || !(current.AxialLoadSp == previous.AxialLoadSp)
-                 || !(current.AxialLoadLimitMax == previous.AxialLoadLimitMax)
-                 || !(current.HookWeightIdle == previous.HookWeightIdle)
-                 || !(current.RotorTorqueIdle == previous.RotorTorqueIdle)
-                 || !(current.RotorTorqueSp == previous.RotorTorqueSp)
-                 || !(current.RotorTorqueLimitMax == previous.RotorTorqueLimitMax)
-                 || !(current.IdFeedRegulator == previous.IdFeedRegulator);
+            var idTelemetry = idTelemetries[i];
+            var lastDate = stats.FirstOrDefault(s => s.IdTelemetry == idTelemetry)?.DateEnd.ToUniversalTime() ?? DateTimeOffset.UnixEpoch;
+            var statsCount = await CreateStatForTelemetryFromDate(idTelemetry, lastDate, token);
+            if(onProgressCallback != null)
+                onProgressCallback($"Calculate stat for telemetry: {idTelemetry}; from {lastDate}; results count: {statsCount};", 1d * i / idTelemetries.Length);
         }
     }
 
+    private async Task<int> CreateStatForTelemetryFromDate(
+        int idTelemetry,
+        DateTimeOffset begin,
+        CancellationToken token)
+    {
+        var detectedOperationRequest = new DetectedOperationByTelemetryRequest
+        {
+            GeDateStart = begin,
+            IdTelemetry = idTelemetry,
+            IdsCategories = WellOperationCategory.MechanicalDrillingSubIds,
+            SortFields = new[] { nameof(DetectedOperation.DateStart) },
+            Take = 250,
+        };
+
+        var detectedOperations = await detectedOperationRepository.Get(detectedOperationRequest, token);
+
+        if (!detectedOperations.Any())
+            return 0;
+
+        var geDate = detectedOperations.First().DateStart;
+        var leDate = detectedOperations.OrderByDescending(d => d.DateEnd).First().DateEnd;
+
+        var dataSaub = await dataSaubService.Get(idTelemetry, true, geDate, leDate, 100_000, token);
+
+        if (!dataSaub.Any())
+            return 0;
+
+        if (dataSaub is not TelemetryDataSaubDto[] dataSaubArray)
+            dataSaubArray = dataSaub.ToArray();
+
+        var dataSaubStats = CreateDataSaubStat(detectedOperations, dataSaubArray);
+
+        return await dataSaubStatRepository.InsertRangeAsync(dataSaubStats, token);
+    }
+
+    private static IEnumerable<DataSaubStatDto> CreateDataSaubStat(IEnumerable<DetectedOperationDto> detectedOperations, TelemetryDataSaubDto[] dataSaub)
+    {
+        var indexStart = 0;
+        var indexEnd = 0;
+        var result = new List<DataSaubStatDto>();
+
+        if (!dataSaub.Any())
+            return result;
+
+        foreach (var operation in detectedOperations)
+        {
+            indexStart = Array.FindIndex(dataSaub, indexEnd, t => t.DateTime >= operation.DateStart);
+            if (indexStart < 0)
+                break;
+
+            indexEnd = Array.FindIndex(dataSaub, indexStart, t => t.DateTime > operation.DateEnd);
+
+            if (indexEnd < 0)
+                indexEnd = dataSaub.Length - 1;
+
+            if (indexEnd == indexStart)
+                continue;
+
+            var length = indexEnd - indexStart + 1;
+
+            var subset = dataSaub.AsSpan(indexStart, length);
+            var stats = CalcStats(operation, subset);
+            result.AddRange(stats);
+        }
+        return result;
+    }
+
+    private static IEnumerable<DataSaubStatDto> CalcStats(DetectedOperationDto operation, Span<TelemetryDataSaubDto> dataSaub)
+    {
+        var result = new List<DataSaubStatDto>();
+
+        var indexStart = 0;
+        for (var i = 1; i < dataSaub.Length; i++)
+        {
+            var previous = dataSaub[i - 1];
+            var current = dataSaub[i];
+
+            if (IsNewCacheItem(previous, current) || i == dataSaub.Length - 1)
+            {
+                var length = i - indexStart + 1;
+                var span = dataSaub.Slice(indexStart, length);
+                indexStart = i;
+                if (length <= 2 || (span[^1].WellDepth - span[0].WellDepth) < 0.001)
+                    continue; // мелкие выборки не учитываем.
+                var stat = CalcStat(operation, span);
+                result.Add(stat);
+            }
+        }
+
+        return result;
+    }
+
+    private static DataSaubStatDto CalcStat(DetectedOperationDto operation, Span<TelemetryDataSaubDto> span)
+    {
+        var aggregatedValues = CalcAggregate(span);
+        var dateStart = span[0].DateTime;
+        var dateEnd = span[^1].DateTime;
+        var depthStart = span[0].WellDepth;
+        var depthEnd = span[^1].WellDepth;
+        var speed = ((depthEnd - depthStart) / (dateEnd - dateStart).TotalHours);
+
+        var processMapDrillingCacheItem = new DataSaubStatDto
+        {
+            DateStart = dateStart,
+            DateEnd = dateEnd,
+            DepthStart = depthStart,
+            DepthEnd = depthEnd,
+            Speed = speed,
+            BlockSpeedSp = span[0].BlockSpeedSp,
+            Pressure = aggregatedValues.Pressure,
+            PressureIdle = span[0].PressureIdle,
+            PressureSp = span[0].PressureSp,
+            AxialLoad = aggregatedValues.AxialLoad,
+            AxialLoadSp = span[0].AxialLoadSp,
+            AxialLoadLimitMax = span[0].AxialLoadLimitMax,
+            RotorTorque = aggregatedValues.RotorTorque,
+            RotorTorqueSp = span[0].RotorTorqueSp,
+            RotorTorqueLimitMax = span[0].RotorTorqueLimitMax,
+            IdFeedRegulator = span[0].IdFeedRegulator,
+            RotorSpeed = aggregatedValues.RotorSpeed,
+            IdCategory = operation.IdCategory,
+            EnabledSubsystems = operation.EnabledSubsystems,
+            HasOscillation = operation.EnabledSubsystems.IsAutoOscillation,
+            IdTelemetry = operation.IdTelemetry,
+            Flow = aggregatedValues.Flow
+        };
+        return processMapDrillingCacheItem;
+    }
+
+    private static (
+        double Pressure,
+        double AxialLoad,
+        double RotorTorque,
+        double RotorSpeed,
+        double Flow
+        ) CalcAggregate(Span<TelemetryDataSaubDto> span)
+    {
+        var sumPressure = 0.0;
+        var sumAxialLoad = 0.0;
+        var sumRotorTorque = 0.0;
+        var sumRotorSpeed = 0.0;
+        var flow = span[0].Flow ?? 0.0;
+        var diffDepthTotal = span[^1].WellDepth - span[0].WellDepth;
+        for (var i = 0; i < span.Length - 1; i++)
+        {
+            var diffDepth = span[i + 1].WellDepth - span[i].WellDepth;
+            sumPressure += diffDepth * span[i].Pressure;
+            sumAxialLoad += diffDepth * span[i].AxialLoad;
+            sumRotorTorque += diffDepth * span[i].RotorTorque;
+            sumRotorSpeed += diffDepth * span[i].RotorSpeed;
+            flow = span[i + 1].Flow > flow ? span[i + 1].Flow ?? 0.0 : flow;
+        }
+        return (
+            Pressure: sumPressure / diffDepthTotal,
+            AxialLoad: sumAxialLoad / diffDepthTotal,
+            RotorTorque: sumRotorTorque / diffDepthTotal,
+            RotorSpeed: sumRotorSpeed / diffDepthTotal,
+            Flow: flow
+        );
+    }
+
+    private static bool IsNewCacheItem(TelemetryDataSaubDto previous, TelemetryDataSaubDto current)
+    {
+        return !(current.Mode == previous.Mode)
+             || !(current.WellDepth >= previous.WellDepth)
+             || !(current.BlockSpeedSp == previous.BlockSpeedSp)
+             || !(current.PressureIdle == previous.PressureIdle)
+             || !(current.PressureSp == previous.PressureSp)
+             || !(current.AxialLoadSp == previous.AxialLoadSp)
+             || !(current.AxialLoadLimitMax == previous.AxialLoadLimitMax)
+             || !(current.HookWeightIdle == previous.HookWeightIdle)
+             || !(current.RotorTorqueIdle == previous.RotorTorqueIdle)
+             || !(current.RotorTorqueSp == previous.RotorTorqueSp)
+             || !(current.RotorTorqueLimitMax == previous.RotorTorqueLimitMax)
+             || !(current.IdFeedRegulator == previous.IdFeedRegulator);
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorConditioning.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorConditioning.cs
index 6ef413ef..b33eda75 100644
--- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorConditioning.cs
+++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorConditioning.cs
@@ -6,50 +6,49 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors
+namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors;
+
+public class DetectorConditioning : DetectorAbstract
 {
-    public class DetectorConditioning : DetectorAbstract
+    protected override double CalcValue(DetectableTelemetry[] telemetry, int begin, int end) =>
+        CalcDeltaMinutes(telemetry, begin, end);
+
+    protected override bool DetectBegin(DetectableTelemetry[] telemetry, int position, DetectedOperationDto? previousOperation)
     {
-        protected override double CalcValue(DetectableTelemetry[] telemetry, int begin, int end) =>
-            CalcDeltaMinutes(telemetry, begin, end);
+        var currentPoint = telemetry[position];
+        if (currentPoint.Pressure < 10)
+            return false;
 
-        protected override bool DetectBegin(DetectableTelemetry[] telemetry, int position, DetectedOperationDto? previousOperation)
-        {
-            var currentPoint = telemetry[position];
-            if (currentPoint.Pressure < 10)
-                return false;
+        if (currentPoint.RotorSpeed <= 8)
+            return false;
 
-            if (currentPoint.RotorSpeed <= 8)
-                return false;
+        var delta = currentPoint.WellDepth - currentPoint.BitDepth;
+        if (delta < 0.03d)
+            return false;
 
-            var delta = currentPoint.WellDepth - currentPoint.BitDepth;
-            if (delta < 0.03d)
-                return false;
+        if (currentPoint.BitDepth < 150)
+            return false;            
 
-            if (currentPoint.BitDepth < 150)
-                return false;            
+        return true;
+    }
 
-            return true;
-        }
+    protected override int DetectEnd(DetectableTelemetry[] telemetry, int position, DetectedOperationDto? previousOperation)
+    {
+        var currentPoint = telemetry[position];
 
-        protected override int DetectEnd(DetectableTelemetry[] telemetry, int position, DetectedOperationDto? previousOperation)
-        {
-            var currentPoint = telemetry[position];
+        if (currentPoint.Pressure < 10)
+            return IdReasonOfEnd_PressureIsLo;
+        if (currentPoint.RotorSpeed <=8)
+            return IdReasonOfEnd_RotorSpeedIsHi;
+        if ((currentPoint.WellDepth - currentPoint.BitDepth) < 0.03d)
+            return IdReasonOfEnd_DeltaWellDepthAndBitDepthIsLo;
+        if (currentPoint.BitDepth < 150)
+            return IdReasonOfEnd_BitDepthIsLo;
+        return IdReasonOfEnd_NotDetected;
+    }
 
-            if (currentPoint.Pressure < 10)
-                return IdReasonOfEnd_PressureIsLo;
-            if (currentPoint.RotorSpeed <=8)
-                return IdReasonOfEnd_RotorSpeedIsHi;
-            if ((currentPoint.WellDepth - currentPoint.BitDepth) < 0.03d)
-                return IdReasonOfEnd_DeltaWellDepthAndBitDepthIsLo;
-            if (currentPoint.BitDepth < 150)
-                return IdReasonOfEnd_BitDepthIsLo;
-            return IdReasonOfEnd_NotDetected;
-        }
-
-        protected override (int IdCategory, IDictionary<string, object> ExtraData) GetSpecificInformation(DetectableTelemetry[] telemetry, int begin, int end)
-        {
-            return (WellOperationCategory.IdConditioning, new Dictionary<string, object>());
-        }
+    protected override (int IdCategory, IDictionary<string, object> ExtraData) GetSpecificInformation(DetectableTelemetry[] telemetry, int begin, int end)
+    {
+        return (WellOperationCategory.IdConditioning, new Dictionary<string, object>());
     }
 }
diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorFlashing.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorFlashing.cs
index f300f1c5..f30403a9 100644
--- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorFlashing.cs
+++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorFlashing.cs
@@ -3,65 +3,64 @@ using AsbCloudDb.Model;
 using System;
 using System.Collections.Generic;
 
-namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors
+namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors;
+
+
+/// <summary>
+/// Промывка
+/// </summary>
+public class DetectorFlashing : DetectorAbstract
 {
 
-    /// <summary>
-    /// Промывка
-    /// </summary>
-    public class DetectorFlashing : DetectorAbstract
+    protected override double CalcValue(DetectableTelemetry[] telemetry, int begin, int end)
+        => CalcDeltaMinutes(telemetry, begin, end);
+
+    protected override bool DetectBegin(DetectableTelemetry[] telemetry, int position, DetectedOperationDto? previousOperation)
     {
 
-        protected override double CalcValue(DetectableTelemetry[] telemetry, int begin, int end)
-            => CalcDeltaMinutes(telemetry, begin, end);
+        var currentPoint = telemetry[position];
+        if (currentPoint.Pressure < 10)
+            return false;
 
-        protected override bool DetectBegin(DetectableTelemetry[] telemetry, int position, DetectedOperationDto? previousOperation)
-        {
+        var delta = currentPoint.WellDepth - currentPoint.BitDepth;
+        if (delta < 0.01d)
+            return false;
 
-            var currentPoint = telemetry[position];
-            if (currentPoint.Pressure < 10)
-                return false;
+        if (currentPoint.RotorSpeed > 8)
+            return false;
 
-            var delta = currentPoint.WellDepth - currentPoint.BitDepth;
-            if (delta < 0.01d)
-                return false;
+        var nextIndexPoint = telemetry.Length <= position ? position : position + 1;
+        var nextPoint = telemetry[nextIndexPoint];
+        if (Math.Abs(currentPoint.WellDepth - nextPoint.WellDepth) > 0)
+            return false;
 
-            if (currentPoint.RotorSpeed > 8)
-                return false;
+        if (currentPoint.BitDepth < 150)
+            return false;
 
-            var nextIndexPoint = telemetry.Length <= position ? position : position + 1;
-            var nextPoint = telemetry[nextIndexPoint];
-            if (Math.Abs(currentPoint.WellDepth - nextPoint.WellDepth) > 0)
-                return false;
+        return true;
 
-            if (currentPoint.BitDepth < 150)
-                return false;
+    }
 
-            return true;
+    protected override int DetectEnd(DetectableTelemetry[] telemetry, int position, DetectedOperationDto? previousOperation)
+    {
+        var currentPoint = telemetry[position];
 
-        }
+        if (currentPoint.Pressure < 10)
+            return IdReasonOfEnd_PressureIsLo;
+        if ((currentPoint.WellDepth - currentPoint.BitDepth) < 0.01d)
+            return IdReasonOfEnd_DeltaWellDepthAndBitDepthIsLo;
+        if (currentPoint.RotorSpeed > 8)
+            return IdReasonOfEnd_RotorSpeedIsHi;
+        if (currentPoint.BitDepth < 150)
+            return IdReasonOfEnd_BitDepthIsLo;
+        return IdReasonOfEnd_NotDetected;
+    }
 
-        protected override int DetectEnd(DetectableTelemetry[] telemetry, int position, DetectedOperationDto? previousOperation)
-        {
-            var currentPoint = telemetry[position];
-
-            if (currentPoint.Pressure < 10)
-                return IdReasonOfEnd_PressureIsLo;
-            if ((currentPoint.WellDepth - currentPoint.BitDepth) < 0.01d)
-                return IdReasonOfEnd_DeltaWellDepthAndBitDepthIsLo;
-            if (currentPoint.RotorSpeed > 8)
-                return IdReasonOfEnd_RotorSpeedIsHi;
-            if (currentPoint.BitDepth < 150)
-                return IdReasonOfEnd_BitDepthIsLo;
-            return IdReasonOfEnd_NotDetected;
-        }
-
-        protected override (int IdCategory, IDictionary<string, object> ExtraData) GetSpecificInformation(DetectableTelemetry[] telemetry,
-            int begin,
-            int end)
-        {
-            return (WellOperationCategory.IdFlashing, new Dictionary<string, object>());
-        }
+    protected override (int IdCategory, IDictionary<string, object> ExtraData) GetSpecificInformation(DetectableTelemetry[] telemetry,
+        int begin,
+        int end)
+    {
+        return (WellOperationCategory.IdFlashing, new Dictionary<string, object>());
     }
 }
 
diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/OperationDetectorResult.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/OperationDetectorResult.cs
index 453a7fab..f29b8f32 100644
--- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/OperationDetectorResult.cs
+++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/OperationDetectorResult.cs
@@ -1,12 +1,11 @@
 using AsbCloudApp.Data.DetectedOperation;
 
-namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors
-{
+namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors;
 
-   public class OperationDetectorResult
-   {
-      public int TelemetryBegin { get; set; }
-      public int TelemetryEnd { get; set; }
-      public DetectedOperationDto Operation { get; set; } = null!;
-   }
+
+public class OperationDetectorResult
+{
+  public int TelemetryBegin { get; set; }
+  public int TelemetryEnd { get; set; }
+  public DetectedOperationDto Operation { get; set; } = null!;
 }
diff --git a/AsbCloudInfrastructure/Services/DetectOperations/InterpolationLine.cs b/AsbCloudInfrastructure/Services/DetectOperations/InterpolationLine.cs
index a6880881..094f7235 100644
--- a/AsbCloudInfrastructure/Services/DetectOperations/InterpolationLine.cs
+++ b/AsbCloudInfrastructure/Services/DetectOperations/InterpolationLine.cs
@@ -1,57 +1,55 @@
 using System.Collections.Generic;
 
-namespace AsbCloudInfrastructure.Services.DetectOperations
+namespace AsbCloudInfrastructure.Services.DetectOperations;
+
+
+public class InterpolationLine
 {
+    private readonly double xSum;
+    private readonly double ySum;
+    private readonly double xySum;
+    private readonly double x2Sum;
+    private readonly int count;
 
-    public class InterpolationLine
+    public InterpolationLine(IEnumerable<(double Y, double X)> rawData)
     {
-        private readonly double xSum;
-        private readonly double ySum;
-        private readonly double xySum;
-        private readonly double x2Sum;
-        private readonly int count;
-
-        public InterpolationLine(IEnumerable<(double Y, double X)> rawData)
+        var iterator = rawData.GetEnumerator();
+        while (iterator.MoveNext())
         {
-            var iterator = rawData.GetEnumerator();
-            while (iterator.MoveNext())
-            {
-                xSum += iterator.Current.X;
-                ySum += iterator.Current.Y;
-                xySum += iterator.Current.X * iterator.Current.Y;
-                x2Sum += iterator.Current.X * iterator.Current.X;
-                count++;
-            }
+            xSum += iterator.Current.X;
+            ySum += iterator.Current.Y;
+            xySum += iterator.Current.X * iterator.Current.Y;
+            x2Sum += iterator.Current.X * iterator.Current.X;
+            count++;
         }
-
-        /// <summary>
-        /// tan(alpha)
-        /// </summary>
-        public double A =>
-            (xSum * ySum - count * xySum) /
-            (xSum * xSum - count * x2Sum);
-
-        /// <summary>
-        /// y offset
-        /// </summary>
-        public double B =>
-            (xSum * xySum - x2Sum * ySum) /
-            (xSum * xSum - count * x2Sum);
-
-        public bool IsYNotChanges(double upperBound = 0d, double lowerBound = 0d) =>
-                A < upperBound && A > lowerBound;
-
-        public bool IsYIncreases(double bound = 0d) =>
-            A > bound;
-
-        public bool IsYDecreases(double bound = 0d) =>
-            A < bound;
-
-        public bool IsAverageYLessThan(double bound) =>
-                (ySum / count) < bound;
-
-        public bool IsAverageYGreaterThan(double bound) =>
-                (ySum / count) >= bound;
     }
 
+    /// <summary>
+    /// tan(alpha)
+    /// </summary>
+    public double A =>
+        (xSum * ySum - count * xySum) /
+        (xSum * xSum - count * x2Sum);
+
+    /// <summary>
+    /// y offset
+    /// </summary>
+    public double B =>
+        (xSum * xySum - x2Sum * ySum) /
+        (xSum * xSum - count * x2Sum);
+
+    public bool IsYNotChanges(double upperBound = 0d, double lowerBound = 0d) =>
+            A < upperBound && A > lowerBound;
+
+    public bool IsYIncreases(double bound = 0d) =>
+        A > bound;
+
+    public bool IsYDecreases(double bound = 0d) =>
+        A < bound;
+
+    public bool IsAverageYLessThan(double bound) =>
+            (ySum / count) < bound;
+
+    public bool IsAverageYGreaterThan(double bound) =>
+            (ySum / count) >= bound;
 }
diff --git a/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportMakerService.cs b/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportMakerService.cs
index f110a2e2..a42e32b5 100644
--- a/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportMakerService.cs
+++ b/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportMakerService.cs
@@ -8,72 +8,71 @@ using System.Threading;
 using System.Threading.Tasks;
 using AsbCloudApp.Services;
 
-namespace AsbCloudInfrastructure.Services.DrillTestReport
+namespace AsbCloudInfrastructure.Services.DrillTestReport;
+
+public class DrillTestReportMakerService : IReportMakerService<DrillTestReportDataDto>
 {
-    public class DrillTestReportMakerService : IReportMakerService<DrillTestReportDataDto>
+    private readonly string templateName = "DrillTestReportTemplate.xlsx";
+    private readonly string sheetName = "Лист1";
+    private readonly int startRowNumber = 8;
+
+    public Stream MakeReport(DrillTestReportDataDto report)
     {
-        private readonly string templateName = "DrillTestReportTemplate.xlsx";
-        private readonly string sheetName = "Лист1";
-        private readonly int startRowNumber = 8;
+        using var excelTemplateStream = Assembly.GetExecutingAssembly().GetTemplateCopyStream(templateName);
 
-        public Stream MakeReport(DrillTestReportDataDto report)
-        {
-            using var excelTemplateStream = Assembly.GetExecutingAssembly().GetTemplateCopyStream(templateName);
+        using var workbook = new XLWorkbook(excelTemplateStream);
 
-            using var workbook = new XLWorkbook(excelTemplateStream);
+        AddToWorkbook(workbook, report);
 
-            AddToWorkbook(workbook, report);
+        MemoryStream memoryStream = new MemoryStream();
+        workbook.SaveAs(memoryStream, new SaveOptions { });
+        memoryStream.Seek(0, SeekOrigin.Begin);
 
-            MemoryStream memoryStream = new MemoryStream();
-            workbook.SaveAs(memoryStream, new SaveOptions { });
-            memoryStream.Seek(0, SeekOrigin.Begin);
-
-            return memoryStream;
-        }
+        return memoryStream;
+    }
+    
+    private void AddToWorkbook(XLWorkbook workbook, DrillTestReportDataDto report)
+    {
+        var drillTests = report.Data.Params;
         
-        private void AddToWorkbook(XLWorkbook workbook, DrillTestReportDataDto report)
+        if (!drillTests.Any())
+            return;
+
+        var sheet = workbook.GetWorksheet(sheetName);
+
+        sheet.Cell(4, 2).SetCellValue(report.Caption);
+        sheet.Cell(5, 2).SetCellValue(report.Date);
+        
+        var stepWithMaxDepthSpeed = drillTests.MaxBy(p => p.DepthSpeed)!.Step;
+        var startDepth = report.Data.DepthStart;
+        var startDate = report.Data.TimeStampStart;
+
+        var rowNumber = startRowNumber;
+        
+        foreach (var drillTestEntity in drillTests)
         {
-            var drillTests = report.Data.Params;
+            var endDepth = startDepth + (drillTestEntity.DepthDrillStep ?? 0);
+            var endDateTime = startDate.AddSeconds(drillTestEntity.TimeDrillStep ?? 0);
             
-            if (!drillTests.Any())
-                return;
+            sheet.Cell(rowNumber, 2).SetCellValue(startDepth);
+            sheet.Cell(rowNumber, 3).SetCellValue(endDepth);
+            sheet.Cell(rowNumber, 4).SetCellValue(drillTestEntity.DepthDrillStep);
+            sheet.Cell(rowNumber, 5).SetCellValue(drillTestEntity.Workload);
+            sheet.Cell(rowNumber, 6).SetCellValue(drillTestEntity.Speed);
+            sheet.Cell(rowNumber, 7).SetCellValue(startDate.DateTime);
+            sheet.Cell(rowNumber, 8).SetCellValue(endDateTime.DateTime);
+            sheet.Cell(rowNumber, 9).SetCellValue(Math.Round((drillTestEntity.TimeDrillStep ?? 0) / (60 * 60), 2));
+            sheet.Cell(rowNumber, 10).SetCellValue(drillTestEntity.DepthSpeed);
 
-            var sheet = workbook.GetWorksheet(sheetName);
-
-            sheet.Cell(4, 2).SetCellValue(report.Caption);
-            sheet.Cell(5, 2).SetCellValue(report.Date);
-            
-            var stepWithMaxDepthSpeed = drillTests.MaxBy(p => p.DepthSpeed)!.Step;
-            var startDepth = report.Data.DepthStart;
-            var startDate = report.Data.TimeStampStart;
-
-            var rowNumber = startRowNumber;
-            
-            foreach (var drillTestEntity in drillTests)
+            if (drillTestEntity.Step == stepWithMaxDepthSpeed)
             {
-                var endDepth = startDepth + (drillTestEntity.DepthDrillStep ?? 0);
-                var endDateTime = startDate.AddSeconds(drillTestEntity.TimeDrillStep ?? 0);
-                
-                sheet.Cell(rowNumber, 2).SetCellValue(startDepth);
-                sheet.Cell(rowNumber, 3).SetCellValue(endDepth);
-                sheet.Cell(rowNumber, 4).SetCellValue(drillTestEntity.DepthDrillStep);
-                sheet.Cell(rowNumber, 5).SetCellValue(drillTestEntity.Workload);
-                sheet.Cell(rowNumber, 6).SetCellValue(drillTestEntity.Speed);
-                sheet.Cell(rowNumber, 7).SetCellValue(startDate.DateTime);
-                sheet.Cell(rowNumber, 8).SetCellValue(endDateTime.DateTime);
-                sheet.Cell(rowNumber, 9).SetCellValue(Math.Round((drillTestEntity.TimeDrillStep ?? 0) / (60 * 60), 2));
-                sheet.Cell(rowNumber, 10).SetCellValue(drillTestEntity.DepthSpeed);
-
-                if (drillTestEntity.Step == stepWithMaxDepthSpeed)
-                {
-                    var currentCells = sheet.Row(rowNumber).Cells(1, 10);
-                    currentCells.Style.Fill.BackgroundColor = XLColor.Yellow;
-                }
-
-                startDepth = endDepth;
-                startDate = endDateTime;
-                rowNumber++;
+                var currentCells = sheet.Row(rowNumber).Cells(1, 10);
+                currentCells.Style.Fill.BackgroundColor = XLColor.Yellow;
             }
+
+            startDepth = endDepth;
+            startDate = endDateTime;
+            rowNumber++;
         }
     }
 }
diff --git a/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportService.cs b/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportService.cs
index c5f43855..e74f0b1f 100644
--- a/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportService.cs
+++ b/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportService.cs
@@ -11,89 +11,88 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services.DrillTestReport
+namespace AsbCloudInfrastructure.Services.DrillTestReport;
+
+public class DrillTestReportService : IDrillTestReportService
 {
-    public class DrillTestReportService : IDrillTestReportService
+    private readonly IWellService wellService;
+    private readonly IDrillTestRepository drillTestRepository;
+    private readonly ITelemetryService telemetryService;
+    private readonly IReportMakerService<DrillTestReportDataDto> drillTestReportMakerService;
+
+    public DrillTestReportService(
+        IWellService wellService,
+        IDrillTestRepository drillTestRepository,
+        ITelemetryService telemetryService,
+        IReportMakerService<DrillTestReportDataDto> drillTestReportMakerService)
     {
-        private readonly IWellService wellService;
-        private readonly IDrillTestRepository drillTestRepository;
-        private readonly ITelemetryService telemetryService;
-        private readonly IReportMakerService<DrillTestReportDataDto> drillTestReportMakerService;
+        this.wellService = wellService;
+        this.drillTestRepository = drillTestRepository;
+        this.telemetryService = telemetryService;
+        this.drillTestReportMakerService = drillTestReportMakerService;
+    }
 
-        public DrillTestReportService(
-            IWellService wellService,
-            IDrillTestRepository drillTestRepository,
-            ITelemetryService telemetryService,
-            IReportMakerService<DrillTestReportDataDto> drillTestReportMakerService)
+    public async Task<(string fileName, Stream stream)> GenerateAsync(int idWell, int id, CancellationToken cancellationToken)
+    {
+        var well = wellService.GetOrDefault(idWell);
+        if (well is null)
+            throw new ArgumentInvalidException(nameof(idWell), $"Well with id: {idWell} does not exist.");
+        if (well.IdTelemetry is null)
+            throw new ArgumentInvalidException(nameof(well.IdTelemetry), $"Well with id: {idWell} does not have telemetry.");
+
+        var dto = await drillTestRepository.GetAsync(well.IdTelemetry.Value, id, cancellationToken);
+       
+        var report = new DrillTestReportDataDto()
         {
-            this.wellService = wellService;
-            this.drillTestRepository = drillTestRepository;
-            this.telemetryService = telemetryService;
-            this.drillTestReportMakerService = drillTestReportMakerService;
+            Data = dto,
+            Caption = string.Format("Месторождение: {0}, куст: {1}, скважина: {2}", 
+                well.Deposit ?? "-", 
+                well.Cluster ?? "-", 
+                well.Caption ?? "-"),
+            Date = DateTimeOffset.Now,
+        };
+
+        var fileName = string.Format("Drill_test_{0}.xlsx", dto.TimeStampStart.ToString("dd.mm.yyyy_HH_MM_ss"));
+        var stream = drillTestReportMakerService.MakeReport(report);
+
+        return (fileName, stream);
+    }
+
+
+    public async Task<PaginationContainer<DrillTestReportInfoDto>> GetListAsync(int idWell, FileReportRequest request, CancellationToken cancellationToken)
+    {
+        var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
+        if (telemetry is null)
+            throw new Exception($"Telemetry with idWell: {idWell} does not exist.");
+
+        var result = new PaginationContainer<DrillTestReportInfoDto>
+        {
+            Skip = request.Skip ?? 0,
+            Take = request.Take ?? 10,
+            Items = Enumerable.Empty<DrillTestReportInfoDto>()
+        };
+
+        var reports = new List<DrillTestReportInfoDto>();
+        var timezone = telemetryService.GetTimezone(telemetry.Id);
+
+        var dtos = await drillTestRepository.GetAllAsync(telemetry.Id, request, cancellationToken);
+        foreach (var dto in dtos)
+        {
+            var remoteDateTime = dto.TimeStampStart.ToOffset(TimeSpan.FromHours(timezone.Hours));
+
+            reports.Add(new DrillTestReportInfoDto
+            {
+                FileName = string.Format("Drill_test_{0}", remoteDateTime),
+                DrillDepth = (dto.Params
+                    .Where(p => p.DepthDrillStep.HasValue)
+                    .Sum(x => x.DepthDrillStep) ?? 0) + dto.DepthStart,
+                DateTime = remoteDateTime,
+                Id = dto.Id,
+            });
         }
 
-        public async Task<(string fileName, Stream stream)> GenerateAsync(int idWell, int id, CancellationToken cancellationToken)
-        {
-            var well = wellService.GetOrDefault(idWell);
-            if (well is null)
-                throw new ArgumentInvalidException(nameof(idWell), $"Well with id: {idWell} does not exist.");
-            if (well.IdTelemetry is null)
-                throw new ArgumentInvalidException(nameof(well.IdTelemetry), $"Well with id: {idWell} does not have telemetry.");
+        result.Items = reports;
 
-            var dto = await drillTestRepository.GetAsync(well.IdTelemetry.Value, id, cancellationToken);
-           
-            var report = new DrillTestReportDataDto()
-            {
-                Data = dto,
-                Caption = string.Format("Месторождение: {0}, куст: {1}, скважина: {2}", 
-                    well.Deposit ?? "-", 
-                    well.Cluster ?? "-", 
-                    well.Caption ?? "-"),
-                Date = DateTimeOffset.Now,
-            };
-
-            var fileName = string.Format("Drill_test_{0}.xlsx", dto.TimeStampStart.ToString("dd.mm.yyyy_HH_MM_ss"));
-            var stream = drillTestReportMakerService.MakeReport(report);
-
-            return (fileName, stream);
-        }
-
-
-        public async Task<PaginationContainer<DrillTestReportInfoDto>> GetListAsync(int idWell, FileReportRequest request, CancellationToken cancellationToken)
-        {
-            var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
-            if (telemetry is null)
-                throw new Exception($"Telemetry with idWell: {idWell} does not exist.");
-
-            var result = new PaginationContainer<DrillTestReportInfoDto>
-            {
-                Skip = request.Skip ?? 0,
-                Take = request.Take ?? 10,
-                Items = Enumerable.Empty<DrillTestReportInfoDto>()
-            };
-
-            var reports = new List<DrillTestReportInfoDto>();
-            var timezone = telemetryService.GetTimezone(telemetry.Id);
-
-            var dtos = await drillTestRepository.GetAllAsync(telemetry.Id, request, cancellationToken);
-            foreach (var dto in dtos)
-            {
-                var remoteDateTime = dto.TimeStampStart.ToOffset(TimeSpan.FromHours(timezone.Hours));
-
-                reports.Add(new DrillTestReportInfoDto
-                {
-                    FileName = string.Format("Drill_test_{0}", remoteDateTime),
-                    DrillDepth = (dto.Params
-                        .Where(p => p.DepthDrillStep.HasValue)
-                        .Sum(x => x.DepthDrillStep) ?? 0) + dto.DepthStart,
-                    DateTime = remoteDateTime,
-                    Id = dto.Id,
-                });
-            }
-
-            result.Items = reports;
-
-            return result;
-        }
+        return result;
     }
 }
diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/ContentListSheet.cs b/AsbCloudInfrastructure/Services/DrillingProgram/ContentListSheet.cs
index 627cec0c..971f524b 100644
--- a/AsbCloudInfrastructure/Services/DrillingProgram/ContentListSheet.cs
+++ b/AsbCloudInfrastructure/Services/DrillingProgram/ContentListSheet.cs
@@ -4,38 +4,36 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AsbCloudInfrastructure.Services.DrillingProgram
+namespace AsbCloudInfrastructure.Services.DrillingProgram;
+
+
+public class ContentListSheet
 {
+    private readonly List<DrillingProgramPartDto> parts;
 
-    public class ContentListSheet
+    public ContentListSheet(IEnumerable<DrillingProgramPartDto> parts)
     {
-        private readonly List<DrillingProgramPartDto> parts;
-
-        public ContentListSheet(IEnumerable<DrillingProgramPartDto> parts)
-        {
-            this.parts = parts.ToList();
-        }
-
-        public void Draw(IXLWorksheet sheet)
-        {
-            sheet.Style.Font.FontName = "Calibri";
-            sheet.Style.Font.FontSize = 12;
-
-            sheet.Cell(2, 2)
-                .SetValue("Содержание")
-                .Style
-                    .Font.SetBold(true)
-                    .Font.SetFontSize(14);
-
-            for (int i = 0; i < parts.Count; i++)
-            {
-                sheet.Cell(4 + i, 1)
-                    .SetValue(i + 1);
-
-                sheet.Cell(4 + i, 2)
-                    .SetValue(parts[i].Name);
-            }                
-        }
+        this.parts = parts.ToList();
     }
 
+    public void Draw(IXLWorksheet sheet)
+    {
+        sheet.Style.Font.FontName = "Calibri";
+        sheet.Style.Font.FontSize = 12;
+
+        sheet.Cell(2, 2)
+            .SetValue("Содержание")
+            .Style
+                .Font.SetBold(true)
+                .Font.SetFontSize(14);
+
+        for (int i = 0; i < parts.Count; i++)
+        {
+            sheet.Cell(4 + i, 1)
+                .SetValue(i + 1);
+
+            sheet.Cell(4 + i, 2)
+                .SetValue(parts[i].Name);
+        }                
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/Convert/ConvertToPdf.cs b/AsbCloudInfrastructure/Services/DrillingProgram/Convert/ConvertToPdf.cs
index 4c789698..a2720657 100644
--- a/AsbCloudInfrastructure/Services/DrillingProgram/Convert/ConvertToPdf.cs
+++ b/AsbCloudInfrastructure/Services/DrillingProgram/Convert/ConvertToPdf.cs
@@ -8,82 +8,80 @@ using System;
 using iText.Kernel.Pdf;
 using iText.Kernel.Utils;
 
-namespace AsbCloudInfrastructure.Services.DrillingProgram.Convert
+namespace AsbCloudInfrastructure.Services.DrillingProgram.Convert;
+
+
+sealed internal class ConvertToPdf
 {
+    internal static readonly string[] filesExtensions = { ".xlsx", ".xls", ".ods", ".odt", ".doc", ".docx", ".pdf" };
 
-    sealed internal class ConvertToPdf
+    private static void MergeFiles(IEnumerable<string> inputFiles, string outFile)
     {
-        internal static readonly string[] filesExtensions = { ".xlsx", ".xls", ".ods", ".odt", ".doc", ".docx", ".pdf" };
-
-        private static void MergeFiles(IEnumerable<string> inputFiles, string outFile)
+        using var docResult = new PdfDocument(new PdfWriter(outFile));
+        var merger = new PdfMerger(docResult);
+        
+        foreach (var fileName in inputFiles)
         {
-            using var docResult = new PdfDocument(new PdfWriter(outFile));
-            var merger = new PdfMerger(docResult);
-            
-            foreach (var fileName in inputFiles)
-            {
-                using var doc = new PdfDocument(new PdfReader(fileName));
-                merger.Merge(doc, 1, doc.GetNumberOfPages());
-                doc.Close();             
-            };
-            
-            docResult.Close();
-        }
-
-        private static (string programFile, string programArg) GetOptionsStartupProcess (string inputFileName, string resultFileDir)
-        {
-            (string programFile, string programArg) startupOptions;
-            if (OperatingSystem.IsWindows())
-            {
-                startupOptions.programFile = "C:\\Program Files\\LibreOffice\\program\\soffice.exe";
-                startupOptions.programArg = $"-headless -convert-to pdf {inputFileName} --outdir {resultFileDir}";
-                return startupOptions;
-            }
-            if(OperatingSystem.IsLinux())
-            {
-                startupOptions.programFile = "/usr/bin/soffice";
-                startupOptions.programArg = $"--headless --convert-to pdf {inputFileName} --outdir {resultFileDir}";
-                return (startupOptions);
-            }
-
-            throw new NotSupportedException ("Вызов процесса в текущей операционной системе не возможен");
-        }
-
-        private static async Task StartConvertProcessAsync(string inputFileName, string resultFileDir, CancellationToken token)
-        {
-            var (programFile, programArg) = GetOptionsStartupProcess(inputFileName, resultFileDir);
-            var command = Cli.Wrap(programFile)
-                .WithArguments(programArg);
-            await command.ExecuteAsync(token);
-        }
-
-        public static async Task GetConverteAndMergedFileAsync(IEnumerable<string> files, string resultPath, string convertedFilesDir, CancellationToken token)
-        {
-            var badFiles = files.Where(f => !filesExtensions.Contains(Path.GetExtension(f)));
-            if (badFiles.Any())
-            {
-                throw new FileFormatException($"Файлы: {string.Join(", ", badFiles)} - неподдерживаемого формата. " +
-                    $"Они не могут быть добавлены в список файлов для конвертации и слияния в общий файл программы бурения.");
-            }
-            var listFiles = files
-                .Distinct()
-                .Select(f => new
-                {
-                    inputFile = f,
-                    convertedFile = Path.Combine(convertedFilesDir, "pdf", Path.ChangeExtension(Path.GetFileName(f), ".pdf"))
-                })
-                .ToList();
-            foreach (var file in listFiles)
-            {
-                var fileExt = Path.GetExtension(file.inputFile).ToLower();
-                if (fileExt != ".pdf")
-                {
-                    await StartConvertProcessAsync(file.inputFile, Path.GetDirectoryName(file.convertedFile)!, token);
-                }
-            }
-            MergeFiles(listFiles.Select(c => c.convertedFile), resultPath);
-            Directory.Delete(Path.Combine(convertedFilesDir, "pdf"), true);
-        }
+            using var doc = new PdfDocument(new PdfReader(fileName));
+            merger.Merge(doc, 1, doc.GetNumberOfPages());
+            doc.Close();             
+        };
+        
+        docResult.Close();
     }
 
+    private static (string programFile, string programArg) GetOptionsStartupProcess (string inputFileName, string resultFileDir)
+    {
+        (string programFile, string programArg) startupOptions;
+        if (OperatingSystem.IsWindows())
+        {
+            startupOptions.programFile = "C:\\Program Files\\LibreOffice\\program\\soffice.exe";
+            startupOptions.programArg = $"-headless -convert-to pdf {inputFileName} --outdir {resultFileDir}";
+            return startupOptions;
+        }
+        if(OperatingSystem.IsLinux())
+        {
+            startupOptions.programFile = "/usr/bin/soffice";
+            startupOptions.programArg = $"--headless --convert-to pdf {inputFileName} --outdir {resultFileDir}";
+            return (startupOptions);
+        }
+
+        throw new NotSupportedException ("Вызов процесса в текущей операционной системе не возможен");
+    }
+
+    private static async Task StartConvertProcessAsync(string inputFileName, string resultFileDir, CancellationToken token)
+    {
+        var (programFile, programArg) = GetOptionsStartupProcess(inputFileName, resultFileDir);
+        var command = Cli.Wrap(programFile)
+            .WithArguments(programArg);
+        await command.ExecuteAsync(token);
+    }
+
+    public static async Task GetConverteAndMergedFileAsync(IEnumerable<string> files, string resultPath, string convertedFilesDir, CancellationToken token)
+    {
+        var badFiles = files.Where(f => !filesExtensions.Contains(Path.GetExtension(f)));
+        if (badFiles.Any())
+        {
+            throw new FileFormatException($"Файлы: {string.Join(", ", badFiles)} - неподдерживаемого формата. " +
+                $"Они не могут быть добавлены в список файлов для конвертации и слияния в общий файл программы бурения.");
+        }
+        var listFiles = files
+            .Distinct()
+            .Select(f => new
+            {
+                inputFile = f,
+                convertedFile = Path.Combine(convertedFilesDir, "pdf", Path.ChangeExtension(Path.GetFileName(f), ".pdf"))
+            })
+            .ToList();
+        foreach (var file in listFiles)
+        {
+            var fileExt = Path.GetExtension(file.inputFile).ToLower();
+            if (fileExt != ".pdf")
+            {
+                await StartConvertProcessAsync(file.inputFile, Path.GetDirectoryName(file.convertedFile)!, token);
+            }
+        }
+        MergeFiles(listFiles.Select(c => c.convertedFile), resultPath);
+        Directory.Delete(Path.Combine(convertedFilesDir, "pdf"), true);
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs b/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs
index 06058d4d..5130a50a 100644
--- a/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs
+++ b/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs
@@ -20,556 +20,554 @@ using AsbCloudApp.Requests;
 using AsbCloudApp.Services.Notifications;
 using AsbCloudInfrastructure.Services.Email;
 
-namespace AsbCloudInfrastructure.Services.DrillingProgram
-{
+namespace AsbCloudInfrastructure.Services.DrillingProgram;
+
 # nullable enable
-    public class DrillingProgramService : IDrillingProgramService
+public class DrillingProgramService : IDrillingProgramService
+{
+    private static readonly Dictionary<string, DrillingProgramCreateError> drillingProgramCreateErrors = new Dictionary<string, DrillingProgramCreateError>();
+    
+    private readonly IAsbCloudDbContext context;
+    private readonly FileService fileService;
+    private readonly IUserRepository userRepository;
+    private readonly IWellService wellService;
+    private readonly IConfiguration configuration;
+    private readonly BackgroundWorker backgroundWorker;
+    private readonly NotificationService notificationService;
+    
+    private const int idTransportType = 1;
+    
+    private const int idFileCategoryDrillingProgram = 1000;
+    private const int idFileCategoryDrillingProgramPartsStart = 1001;
+    private const int idFileCategoryDrillingProgramPartsEnd = 1100;
+
+    private const int idPartStateNoFile = 0;
+    private const int idPartStateApproving = 1;
+    private const int idPartStateApproved = 2;
+
+    private const int idMarkTypeReject = 0;
+    private const int idMarkTypeApprove = 1;
+
+    private const int idUserRolePublisher = 1;
+    private const int idUserRoleApprover = 2;
+
+    private const int idStateNotInitialized = 0;
+    private const int idStateApproving = 1;
+    private const int idStateCreating = 2;
+    private const int idStateReady = 3;
+    private const int idStateError = 4;
+
+    private static readonly string[] validFileExtensions = ConvertToPdf.filesExtensions;
+
+    public DrillingProgramService(
+        IAsbCloudDbContext context,
+        FileService fileService,
+        IUserRepository userRepository,
+        IWellService wellService,
+        IConfiguration configuration,
+        BackgroundWorker backgroundWorker,
+        NotificationService notificationService)
     {
-        private static readonly Dictionary<string, DrillingProgramCreateError> drillingProgramCreateErrors = new Dictionary<string, DrillingProgramCreateError>();
-        
-        private readonly IAsbCloudDbContext context;
-        private readonly FileService fileService;
-        private readonly IUserRepository userRepository;
-        private readonly IWellService wellService;
-        private readonly IConfiguration configuration;
-        private readonly BackgroundWorker backgroundWorker;
-        private readonly NotificationService notificationService;
-        
-        private const int idTransportType = 1;
-        
-        private const int idFileCategoryDrillingProgram = 1000;
-        private const int idFileCategoryDrillingProgramPartsStart = 1001;
-        private const int idFileCategoryDrillingProgramPartsEnd = 1100;
-
-        private const int idPartStateNoFile = 0;
-        private const int idPartStateApproving = 1;
-        private const int idPartStateApproved = 2;
-
-        private const int idMarkTypeReject = 0;
-        private const int idMarkTypeApprove = 1;
-
-        private const int idUserRolePublisher = 1;
-        private const int idUserRoleApprover = 2;
-
-        private const int idStateNotInitialized = 0;
-        private const int idStateApproving = 1;
-        private const int idStateCreating = 2;
-        private const int idStateReady = 3;
-        private const int idStateError = 4;
-
-        private static readonly string[] validFileExtensions = ConvertToPdf.filesExtensions;
-
-        public DrillingProgramService(
-            IAsbCloudDbContext context,
-            FileService fileService,
-            IUserRepository userRepository,
-            IWellService wellService,
-            IConfiguration configuration,
-            BackgroundWorker backgroundWorker,
-            NotificationService notificationService)
-        {
-            this.context = context;
-            this.fileService = fileService;
-            this.userRepository = userRepository;
-            this.wellService = wellService;
-            this.configuration = configuration;
-            this.backgroundWorker = backgroundWorker;
-            this.notificationService = notificationService;
-        }
-
-        public async Task<IEnumerable<UserDto>> GetAvailableUsers(int idWell, CancellationToken token = default)
-        {
-            var users = await context.RelationCompaniesWells
-                .Include(r => r.Company)
-                .ThenInclude(c => c.Users)
-                .Where(r => r.IdWell == idWell)
-                .SelectMany(r => r.Company.Users)
-                .Where(u => u != null && !string.IsNullOrEmpty(u.Email))
-                .ToListAsync(token);
-            var usersDto = users.Adapt<IEnumerable<UserDto>>();
-            return usersDto;
-        }
-
-        public async Task<IEnumerable<FileCategoryDto>> GetCategoriesAsync(CancellationToken token = default)
-        {
-            var result = await context.FileCategories
-                .Where(c => c.Id > idFileCategoryDrillingProgramPartsStart && c.Id < idFileCategoryDrillingProgramPartsEnd)
-                .ToListAsync(token);
-            return result.Select(c => c.Adapt<FileCategoryDto>());
-        }
-
-        public async Task<DrillingProgramStateDto> GetStateAsync(int idWell, int idUser, CancellationToken token = default)
-        {
-            var fileCategories = await context.FileCategories
-                .Where(c => c.Id >= idFileCategoryDrillingProgramPartsStart &&
-                    c.Id < idFileCategoryDrillingProgramPartsEnd)
-                .ToListAsync(token);
-
-            var files = await context.Files
-                .Include(f => f.FileMarks)
-                .ThenInclude(m => m.User)
-                .Include(f => f.Author)
-                .Include(f => f.FileCategory)
-                .Where(f => f.IdWell == idWell &&
-                    f.IdCategory >= idFileCategoryDrillingProgram &&
-                    f.IdCategory < idFileCategoryDrillingProgramPartsEnd &&
-                    f.IsDeleted == false)
-                .OrderBy(f => f.UploadDate)
-                .ToListAsync(token);
-
-            var partEntities = await context.DrillingProgramParts
-                .Include(p => p.RelatedUsers)
-                .ThenInclude(r => r.User)
-                .ThenInclude(u => u.Company)
-                .Where(p => p.IdWell == idWell)
-                .ToListAsync(token);
-
-            var parts = new List<DrillingProgramPartDto>(partEntities.Count);
-            var timezoneOffset = wellService.GetTimezone(idWell)?.Hours ?? 5;
-            foreach (var partEntity in partEntities)
-            {
-                var part = ConvertPart(idUser, fileCategories, files, partEntity, timezoneOffset);
-                parts.Add(part);
-            }
-
-            var state = new DrillingProgramStateDto
-            {
-                Parts = parts,
-                Program = files.FirstOrDefault(f => f.IdCategory == idFileCategoryDrillingProgram)
-                    ?.Adapt<FileInfoDto>(),
-                PermissionToEdit = userRepository.HasPermission(idUser, "DrillingProgram.edit"),
-            };
-
-            if (parts.Any())
-            {
-                if (parts.All(p => p.IdState == idPartStateApproved))
-                {
-                    if (state.Program is not null)
-                    {
-                        state.IdState = idStateReady;
-                    }
-                    else
-                    {
-                        var workId = MakeWorkId(idWell);
-                        if (drillingProgramCreateErrors.ContainsKey(workId))
-                        {
-                            state.IdState = idStateError;
-                            state.Error = drillingProgramCreateErrors[workId];
-                        }
-                        else
-                            state.IdState = idStateCreating;
-                    }
-                }
-                else
-                    state.IdState = idStateApproving;
-            }
-            else
-                state.IdState = idStateNotInitialized;
-
-            await EnqueueMakeProgramWorkAsync(idWell, state, token);
-            return state;
-        }
-
-        private static bool IsFileExtensionValid(string file)
-        {
-            var fileExt = Path.GetExtension(file).ToLower();
-            return validFileExtensions.Contains(fileExt);
-        }
-
-        public async Task<int> AddFile(int idWell, int idFileCategory, int idUser, string fileFullName, Stream fileStream, CancellationToken token = default)
-        {
-            if (!IsFileExtensionValid(fileFullName))
-                throw new FileFormatException($"Файл {fileFullName} - не поддерживаемого формата. Файл не может быть загружен.");
-
-            var part = await context.DrillingProgramParts
-                    .Include(p => p.RelatedUsers)
-                    .ThenInclude(r => r.User)
-                    .FirstOrDefaultAsync(p => p.IdWell == idWell && p.IdFileCategory == idFileCategory, token)
-                    ?? throw new ArgumentInvalidException(nameof(idFileCategory), $"DrillingProgramPart id == {idFileCategory} does not exist");
-
-            if (!part.RelatedUsers.Any(r => r.IdUser == idUser && r.IdUserRole == idUserRolePublisher))
-                throw new ForbidException($"User {idUser} is not in the publisher list.");
-
-            var result = await fileService.SaveAsync(
-                part.IdWell,
-                idUser,
-                part.IdFileCategory,
-                fileFullName,
-                fileStream,
-                token);
-
-            await RemoveDrillingProgramAsync(part.IdWell, token);
-
-            await NotifyApproversAsync(part, result.Id, fileFullName, token);
-
-            return result.Id;
-        }
-
-        public async Task<int> AddPartsAsync(int idWell, IEnumerable<int> idFileCategories, CancellationToken token = default)
-        {
-            if (!idFileCategories.Any())
-                return 0;
-
-            var existingCategories = await context.DrillingProgramParts
-                .Where(p => p.IdWell == idWell)
-                .Select(p => p.IdFileCategory)
-                .ToListAsync(token);
-
-            var newParts = idFileCategories
-                .Where(c => !existingCategories.Any(e => e == c))
-                .Select(c => new DrillingProgramPart
-                {
-                    IdWell = idWell,
-                    IdFileCategory = c,
-                });
-
-            context.DrillingProgramParts.AddRange(newParts);
-            var affected = await context.SaveChangesAsync(token);
-
-            await RemoveDrillingProgramAsync(idWell, token);
-            return affected;
-        }
-
-        public async Task<int> RemovePartsAsync(int idWell, IEnumerable<int> idFileCategories, CancellationToken token = default)
-        {
-            var whereQuery = context.DrillingProgramParts
-                .Where(p => p.IdWell == idWell && idFileCategories.Contains(p.IdFileCategory));
-
-            context.DrillingProgramParts.RemoveRange(whereQuery);
-
-            await RemoveDrillingProgramAsync(idWell, token);
-            return await context.SaveChangesAsync(token);
-        }
-
-        public async Task<int> AddUserAsync(int idWell, int idFileCategory, int idUser, int idUserRole, CancellationToken token = default)
-        {
-            var user = await userRepository.GetOrDefaultAsync(idUser, token)
-                ?? throw new ArgumentInvalidException(nameof(idUser), $"User id: {idUser} does not exist");
-
-            var part = await context.DrillingProgramParts
-                .Include(p => p.FileCategory)
-                .FirstOrDefaultAsync(p => p.IdWell == idWell && p.IdFileCategory == idFileCategory, token)
-                ?? throw new ArgumentInvalidException(nameof(idFileCategory), $"DrillingProgramPart idFileCategory: {idFileCategory} does not exist");
-
-            if (idUserRole != idUserRoleApprover && idUserRole != idUserRolePublisher)
-                throw new ArgumentInvalidException(nameof(idUserRole), $"idUserRole ({idUserRole}), should be approver ({idUserRoleApprover}) or publisher ({idUserRolePublisher})");
-
-            var oldRelation = await context.RelationDrillingProgramPartUsers
-                .FirstOrDefaultAsync(r => r.IdUser == idUser && r.IdDrillingProgramPart == part.Id, token);
-
-            if (oldRelation is not null)
-                context.RelationDrillingProgramPartUsers.Remove(oldRelation);
-
-            var newRelation = new RelationUserDrillingProgramPart
-            {
-                IdUser = idUser,
-                IdDrillingProgramPart = part.Id,
-                IdUserRole = idUserRole,
-            };
-            context.RelationDrillingProgramPartUsers.Add(newRelation);
-            if (idUserRole == idUserRoleApprover)
-                await RemoveDrillingProgramAsync(part.IdWell, token);
-
-            if (idUserRole == idUserRolePublisher)
-                await NotifyNewPublisherAsync(idWell, user, part.FileCategory.Name, token);
-
-            return await context.SaveChangesAsync(token);
-        }
-
-        public async Task<int> RemoveUserAsync(int idWell, int idFileCategory, int idUser, int idUserRole, CancellationToken token = default)
-        {
-            var whereQuery = context.RelationDrillingProgramPartUsers
-                .Include(r => r.DrillingProgramPart)
-                .Where(r => r.IdUser == idUser &&
-                    r.IdUserRole == idUserRole &&
-                    r.DrillingProgramPart.IdWell == idWell &&
-                    r.DrillingProgramPart.IdFileCategory == idFileCategory);
-
-            context.RelationDrillingProgramPartUsers.RemoveRange(whereQuery);
-
-            return await context.SaveChangesAsync(token);
-        }
-
-        public async Task<int> AddOrReplaceFileMarkAsync(FileMarkDto fileMarkDto, int idUser, CancellationToken token)
-        {
-            if (fileMarkDto.IdMarkType != idMarkTypeApprove &&
-                fileMarkDto.IdMarkType != idMarkTypeReject)
-                throw new ArgumentInvalidException(nameof(fileMarkDto), $"В этом методе допустимы только отметки о принятии или отклонении.");
-
-            var fileInfo = await fileService.GetOrDefaultAsync(fileMarkDto.IdFile, token)
-                ?? throw new ArgumentInvalidException(nameof(fileMarkDto), $"Файла для такой отметки не существует.");
-
-            if (fileInfo.IdCategory < idFileCategoryDrillingProgramPartsStart ||
-                fileInfo.IdCategory > idFileCategoryDrillingProgramPartsEnd)
-                throw new ArgumentInvalidException(nameof(fileMarkDto), $"Этот метод допустим только для файлов-частей программы бурения.");
-
-            var part = await context.DrillingProgramParts
-                .Include(p => p.RelatedUsers)
-                .ThenInclude(r => r.User)
-                .AsNoTracking()
-                .FirstOrDefaultAsync(p => p.IdWell == fileInfo.IdWell && p.IdFileCategory == fileInfo.IdCategory, token);
-
-            var user = part?.RelatedUsers.FirstOrDefault(r => r.IdUser == idUser && r.IdUserRole == idUserRoleApprover)?.User
-                ?? throw new ForbidException($"User {idUser} is not in the approvers list.");
-
-            fileMarkDto.User = user.Adapt<UserDto>();
-
-            var oldMarksIds = fileInfo.FileMarks
-                .Where(m => m.User?.Id == idUser)
-                .Select(m => m.Id);
-
-            if (oldMarksIds?.Any() == true)
-                await fileService.MarkFileMarkAsDeletedAsync(oldMarksIds, token);
-
-            var result = await fileService.CreateFileMarkAsync(fileMarkDto, idUser, token)
-                .ConfigureAwait(false);
-
-            if (fileMarkDto.IdMarkType == idMarkTypeReject)
-            {
-                await RemoveDrillingProgramAsync(fileInfo.IdWell, token);
-                await NotifyPublisherOnRejectAsync(fileMarkDto, token);
-            }
-            else
-            {
-                // если все согласованты согласовали - оповещаем публикатора
-                var approvers = part!.RelatedUsers
-                    .Where(u => u.IdUserRole == idUserRoleApprover);
-                if (approvers
-                    .All(user => fileInfo.FileMarks
-                        ?.Any(mark => (mark.IdMarkType == idMarkTypeApprove && mark.User?.Id == user.IdUser && !mark.IsDeleted)) == true ||
-                        (fileMarkDto.IdMarkType == idMarkTypeApprove && user.IdUser == idUser)))
-                {
-                    await NotifyPublisherOnFullAccepAsync(fileMarkDto, token);
-                }
-            }
-            return result;
-        }
-
-        public async Task<int> MarkAsDeletedFileMarkAsync(int idMark,
-            CancellationToken token)
-        {
-            var fileInfo = await fileService.GetByMarkId(idMark, token)
-                .ConfigureAwait(false);
-
-            if (fileInfo.IdCategory < idFileCategoryDrillingProgramPartsStart ||
-                fileInfo.IdCategory > idFileCategoryDrillingProgramPartsEnd)
-                throw new ArgumentInvalidException(nameof(idMark), $"Этот метод допустим только для файлов-частей программы бурения.");
-
-            var result = await fileService.MarkFileMarkAsDeletedAsync(idMark, token)
-                .ConfigureAwait(false);
-
-            await RemoveDrillingProgramAsync(fileInfo.IdWell, token);
-            return result;
-        }
-
-        private async Task NotifyPublisherOnFullAccepAsync(FileMarkDto fileMark, CancellationToken token)
-        {
-            var file = await fileService.GetOrDefaultAsync(fileMark.IdFile, token);
-            var well = await wellService.GetOrDefaultAsync(file!.IdWell, token)
-                ?? throw new ArgumentInvalidException(nameof(file.IdWell), "idWell doesn`t exist");
-
-            var user = file.Author!;
-            var factory = new DrillingMailBodyFactory(configuration);
-            var subject = factory.MakeSubject(well, "Загруженный вами документ полностью согласован");
-            var body = factory.MakeMailBodyForPublisherOnFullAccept(well, user.Name ?? string.Empty, file.Id, file.Name);
-
-            await notificationService.NotifyAsync(new NotifyRequest
-            {
-                IdUser = user.Id,
-                IdNotificationCategory = NotificationCategory.IdSystemNotificationCategory,
-                Title = subject,
-                Message = body,
-                IdTransportType = idTransportType
-            }, token);
-        }
-
-        private async Task NotifyPublisherOnRejectAsync(FileMarkDto fileMark, CancellationToken token)
-        {
-            var file = await fileService.GetOrDefaultAsync(fileMark.IdFile, token);
-            var well = await wellService.GetOrDefaultAsync(file!.IdWell, token)
-                ?? throw new ArgumentInvalidException(nameof(file.IdWell), "idWell doesn`t exist");
-
-            var user = file.Author!;
-            var factory = new DrillingMailBodyFactory(configuration);
-            var subject = factory.MakeSubject(well, "Загруженный вами документ отклонен");
-            var body = factory.MakeMailBodyForPublisherOnReject(well, user.Name ?? string.Empty, file.Id, file.Name, fileMark);
-
-            await notificationService.NotifyAsync(new NotifyRequest
-            {
-                IdUser = user.Id,
-                IdNotificationCategory = NotificationCategory.IdSystemNotificationCategory,
-                Title = subject,
-                Message = body,
-                IdTransportType = idTransportType
-            }, token);
-        }
-
-        private async Task NotifyApproversAsync(DrillingProgramPart part, int idFile, string fileName, CancellationToken token)
-        {
-            var well = await wellService.GetOrDefaultAsync(part.IdWell, token)
-                ?? throw new ArgumentInvalidException(nameof(part.IdWell), "idWell doesn`t exist");
-
-            var factory = new DrillingMailBodyFactory(configuration);
-            var subject = factory.MakeSubject(well, "Загружен новый документ для согласования.");
-            var users = part.RelatedUsers
-                .Where(r => r.IdUserRole == idUserRoleApprover)
-                .Select(r => r.User);
-
-            foreach (var user in users)
-            {
-                var body = factory.MakeMailBodyForApproverNewFile(well, user.Name ?? string.Empty, idFile, fileName);
-                await notificationService.NotifyAsync(new NotifyRequest
-                {
-                    IdUser = user.Id,
-                    IdNotificationCategory = NotificationCategory.IdSystemNotificationCategory,
-                    Title = subject,
-                    Message = body,
-                    IdTransportType = idTransportType
-                }, token);
-            }
-        }
-
-        private async Task NotifyNewPublisherAsync(int idWell, UserDto user, string documentCategory, CancellationToken token)
-        {
-            var well = await wellService.GetOrDefaultAsync(idWell, token)
-                ?? throw new ArgumentInvalidException(nameof(idWell), "idWell doesn`t exist");
-
-            var factory = new DrillingMailBodyFactory(configuration);
-            var subject = factory.MakeSubject(well, $"От вас ожидается загрузка на портал документа «{documentCategory}»");
-            var body = factory.MakeMailBodyForNewPublisher(well, user.Name ?? string.Empty, documentCategory);
-            
-            await notificationService.NotifyAsync(new NotifyRequest
-            {
-                IdUser = user.Id,
-                IdNotificationCategory = NotificationCategory.IdSystemNotificationCategory,
-                Title = subject,
-                Message = body,
-                IdTransportType = idTransportType
-            }, token);
-        }
-
-        private static DrillingProgramPartDto ConvertPart(int idUser, List<FileCategory> fileCategories, List<AsbCloudDb.Model.FileInfo> files, DrillingProgramPart partEntity, double timezoneOffset)
-        {
-            var part = new DrillingProgramPartDto
-            {
-                IdFileCategory = partEntity.IdFileCategory,
-                Name = fileCategories.FirstOrDefault(c => c.Id == partEntity.IdFileCategory)!.Name,
-                Approvers = partEntity.RelatedUsers
-                                .Where(r => r.IdUserRole == idUserRoleApprover)
-                                .Select(r => r.User.Adapt<UserDto>()),
-                Publishers = partEntity.RelatedUsers
-                                .Where(r => r.IdUserRole == idUserRolePublisher)
-                                .Select(r => r.User.Adapt<UserDto>()),
-                PermissionToApprove = partEntity.RelatedUsers
-                                .Any(r => r.IdUserRole == idUserRoleApprover && r.IdUser == idUser),
-                PermissionToUpload = partEntity.RelatedUsers
-                                .Any(r => r.IdUserRole == idUserRolePublisher && r.IdUser == idUser),
-            };
-
-            var fileEntity = files.LastOrDefault(f => f.IdCategory == partEntity.IdFileCategory);
-
-            if (fileEntity is not null)
-            {
-                part.IdState = idPartStateApproving;
-                part.File = new FileInfoDto
-                {
-                    Id = fileEntity.Id,
-                    Author = fileEntity.Author?.Adapt<UserDto>(),
-                    IdAuthor = fileEntity.Author?.Id,
-                    IdCategory = fileEntity.IdCategory,
-                    IdWell = fileEntity.IdWell,
-                    Name = fileEntity.Name,
-                    Size = fileEntity.Size,
-                    UploadDate = fileEntity.UploadDate.ToOffset(TimeSpan.FromHours(timezoneOffset)),
-                };
-
-                var marks = fileEntity.FileMarks?.Where(m => !m.IsDeleted);
-                if (marks?.Any() == true)
-                {
-                    part.File.FileMarks = marks.Select(m =>
-                    {
-                        var mark = m.Adapt<FileMarkDto>();
-                        mark.DateCreated = m.DateCreated.ToOffset(TimeSpan.FromHours(timezoneOffset));
-                        return mark;
-                    });
-                    var hasReject = marks.Any(m => m.IdMarkType == idMarkTypeReject);
-                    if (!hasReject)
-                    {
-                        var allAproved = part.Approvers.All(a => marks.Any(m => m.IdUser == a.Id && m.IdMarkType == idMarkTypeApprove));
-                        if (allAproved)
-                            part.IdState = idPartStateApproved;
-                    }
-                }
-            }
-            else
-                part.IdState = idPartStateNoFile;
-
-            return part;
-        }
-
-        private async Task EnqueueMakeProgramWorkAsync(int idWell, DrillingProgramStateDto state, CancellationToken token)
-        {
-            if (state.IdState == idStateCreating)
-            {
-                var workId = MakeWorkId(idWell);
-                if (!backgroundWorker.Works.Any(w => w.Id == workId))
-                {
-                    var well = (await wellService.GetOrDefaultAsync(idWell, token))!;
-                    var resultFileName = $"Программа бурения {well.Cluster} {well.Caption}.pdf";                     
-                    var convertedFilesDir = Path.Combine(Path.GetTempPath(), "drillingProgram", $"{well.Cluster}_{well.Caption}");                                        
-                    var tempResultFilePath = Path.Combine(convertedFilesDir, resultFileName);
-                    var workAction = async (string workId, IServiceProvider serviceProvider, Action<string, double?> onProgress, CancellationToken token) =>
-                    {
-                        var context = serviceProvider.GetRequiredService<IAsbCloudDbContext>();
-                        var fileService = serviceProvider.GetRequiredService<FileService>();
-                        var files = state.Parts.Select(p => fileService.GetUrl(p.File!));
-                        onProgress($"Start converting {files.Count()} files to PDF.", null);
-                        await ConvertToPdf.GetConverteAndMergedFileAsync(files, tempResultFilePath, convertedFilesDir, token);
-                        await fileService.MoveAsync(idWell, null, idFileCategoryDrillingProgram, resultFileName, tempResultFilePath, token);
-                    };
-
-                    var onErrorAction = (string workId, Exception exception, CancellationToken token) =>
-                    {
-                        var message = $"Не удалось сформировать программу бурения по скважине {well?.Caption}";
-                        drillingProgramCreateErrors[workId] = new()
-                        {
-                            Message = message,
-                            Exception = exception.Message,
-                        };
-                        return Task.CompletedTask;
-                    };
-
-                    var work = Work.CreateByDelegate(workId, workAction);
-                    work.OnErrorAsync = onErrorAction;
-                    backgroundWorker.Enqueue(work);
-                }
-            }
-        }
-
-        public void ClearError(int idWell)
-        {
-            var workId = MakeWorkId(idWell);
-            drillingProgramCreateErrors.Remove(workId);
-        }
-
-        private async Task<int> RemoveDrillingProgramAsync(int idWell, CancellationToken token)
-        {
-            var workId = MakeWorkId(idWell);
-            backgroundWorker.TryRemoveFromQueue(workId);
-
-            var filesIds = await context.Files
-                .Where(f => f.IdWell == idWell &&
-                    f.IdCategory == idFileCategoryDrillingProgram)
-                .Select(f => f.Id)
-                .ToListAsync(token);
-            if (filesIds.Any())
-                return await fileService.DeleteAsync(filesIds, token);
-            else
-                return 0;
-        }
-
-        private static string MakeWorkId(int idWell)
-            => $"Make drilling program for wellId {idWell}";
+        this.context = context;
+        this.fileService = fileService;
+        this.userRepository = userRepository;
+        this.wellService = wellService;
+        this.configuration = configuration;
+        this.backgroundWorker = backgroundWorker;
+        this.notificationService = notificationService;
     }
 
+    public async Task<IEnumerable<UserDto>> GetAvailableUsers(int idWell, CancellationToken token = default)
+    {
+        var users = await context.RelationCompaniesWells
+            .Include(r => r.Company)
+            .ThenInclude(c => c.Users)
+            .Where(r => r.IdWell == idWell)
+            .SelectMany(r => r.Company.Users)
+            .Where(u => u != null && !string.IsNullOrEmpty(u.Email))
+            .ToListAsync(token);
+        var usersDto = users.Adapt<IEnumerable<UserDto>>();
+        return usersDto;
+    }
+
+    public async Task<IEnumerable<FileCategoryDto>> GetCategoriesAsync(CancellationToken token = default)
+    {
+        var result = await context.FileCategories
+            .Where(c => c.Id > idFileCategoryDrillingProgramPartsStart && c.Id < idFileCategoryDrillingProgramPartsEnd)
+            .ToListAsync(token);
+        return result.Select(c => c.Adapt<FileCategoryDto>());
+    }
+
+    public async Task<DrillingProgramStateDto> GetStateAsync(int idWell, int idUser, CancellationToken token = default)
+    {
+        var fileCategories = await context.FileCategories
+            .Where(c => c.Id >= idFileCategoryDrillingProgramPartsStart &&
+                c.Id < idFileCategoryDrillingProgramPartsEnd)
+            .ToListAsync(token);
+
+        var files = await context.Files
+            .Include(f => f.FileMarks)
+            .ThenInclude(m => m.User)
+            .Include(f => f.Author)
+            .Include(f => f.FileCategory)
+            .Where(f => f.IdWell == idWell &&
+                f.IdCategory >= idFileCategoryDrillingProgram &&
+                f.IdCategory < idFileCategoryDrillingProgramPartsEnd &&
+                f.IsDeleted == false)
+            .OrderBy(f => f.UploadDate)
+            .ToListAsync(token);
+
+        var partEntities = await context.DrillingProgramParts
+            .Include(p => p.RelatedUsers)
+            .ThenInclude(r => r.User)
+            .ThenInclude(u => u.Company)
+            .Where(p => p.IdWell == idWell)
+            .ToListAsync(token);
+
+        var parts = new List<DrillingProgramPartDto>(partEntities.Count);
+        var timezoneOffset = wellService.GetTimezone(idWell)?.Hours ?? 5;
+        foreach (var partEntity in partEntities)
+        {
+            var part = ConvertPart(idUser, fileCategories, files, partEntity, timezoneOffset);
+            parts.Add(part);
+        }
+
+        var state = new DrillingProgramStateDto
+        {
+            Parts = parts,
+            Program = files.FirstOrDefault(f => f.IdCategory == idFileCategoryDrillingProgram)
+                ?.Adapt<FileInfoDto>(),
+            PermissionToEdit = userRepository.HasPermission(idUser, "DrillingProgram.edit"),
+        };
+
+        if (parts.Any())
+        {
+            if (parts.All(p => p.IdState == idPartStateApproved))
+            {
+                if (state.Program is not null)
+                {
+                    state.IdState = idStateReady;
+                }
+                else
+                {
+                    var workId = MakeWorkId(idWell);
+                    if (drillingProgramCreateErrors.ContainsKey(workId))
+                    {
+                        state.IdState = idStateError;
+                        state.Error = drillingProgramCreateErrors[workId];
+                    }
+                    else
+                        state.IdState = idStateCreating;
+                }
+            }
+            else
+                state.IdState = idStateApproving;
+        }
+        else
+            state.IdState = idStateNotInitialized;
+
+        await EnqueueMakeProgramWorkAsync(idWell, state, token);
+        return state;
+    }
+
+    private static bool IsFileExtensionValid(string file)
+    {
+        var fileExt = Path.GetExtension(file).ToLower();
+        return validFileExtensions.Contains(fileExt);
+    }
+
+    public async Task<int> AddFile(int idWell, int idFileCategory, int idUser, string fileFullName, Stream fileStream, CancellationToken token = default)
+    {
+        if (!IsFileExtensionValid(fileFullName))
+            throw new FileFormatException($"Файл {fileFullName} - не поддерживаемого формата. Файл не может быть загружен.");
+
+        var part = await context.DrillingProgramParts
+                .Include(p => p.RelatedUsers)
+                .ThenInclude(r => r.User)
+                .FirstOrDefaultAsync(p => p.IdWell == idWell && p.IdFileCategory == idFileCategory, token)
+                ?? throw new ArgumentInvalidException(nameof(idFileCategory), $"DrillingProgramPart id == {idFileCategory} does not exist");
+
+        if (!part.RelatedUsers.Any(r => r.IdUser == idUser && r.IdUserRole == idUserRolePublisher))
+            throw new ForbidException($"User {idUser} is not in the publisher list.");
+
+        var result = await fileService.SaveAsync(
+            part.IdWell,
+            idUser,
+            part.IdFileCategory,
+            fileFullName,
+            fileStream,
+            token);
+
+        await RemoveDrillingProgramAsync(part.IdWell, token);
+
+        await NotifyApproversAsync(part, result.Id, fileFullName, token);
+
+        return result.Id;
+    }
+
+    public async Task<int> AddPartsAsync(int idWell, IEnumerable<int> idFileCategories, CancellationToken token = default)
+    {
+        if (!idFileCategories.Any())
+            return 0;
+
+        var existingCategories = await context.DrillingProgramParts
+            .Where(p => p.IdWell == idWell)
+            .Select(p => p.IdFileCategory)
+            .ToListAsync(token);
+
+        var newParts = idFileCategories
+            .Where(c => !existingCategories.Any(e => e == c))
+            .Select(c => new DrillingProgramPart
+            {
+                IdWell = idWell,
+                IdFileCategory = c,
+            });
+
+        context.DrillingProgramParts.AddRange(newParts);
+        var affected = await context.SaveChangesAsync(token);
+
+        await RemoveDrillingProgramAsync(idWell, token);
+        return affected;
+    }
+
+    public async Task<int> RemovePartsAsync(int idWell, IEnumerable<int> idFileCategories, CancellationToken token = default)
+    {
+        var whereQuery = context.DrillingProgramParts
+            .Where(p => p.IdWell == idWell && idFileCategories.Contains(p.IdFileCategory));
+
+        context.DrillingProgramParts.RemoveRange(whereQuery);
+
+        await RemoveDrillingProgramAsync(idWell, token);
+        return await context.SaveChangesAsync(token);
+    }
+
+    public async Task<int> AddUserAsync(int idWell, int idFileCategory, int idUser, int idUserRole, CancellationToken token = default)
+    {
+        var user = await userRepository.GetOrDefaultAsync(idUser, token)
+            ?? throw new ArgumentInvalidException(nameof(idUser), $"User id: {idUser} does not exist");
+
+        var part = await context.DrillingProgramParts
+            .Include(p => p.FileCategory)
+            .FirstOrDefaultAsync(p => p.IdWell == idWell && p.IdFileCategory == idFileCategory, token)
+            ?? throw new ArgumentInvalidException(nameof(idFileCategory), $"DrillingProgramPart idFileCategory: {idFileCategory} does not exist");
+
+        if (idUserRole != idUserRoleApprover && idUserRole != idUserRolePublisher)
+            throw new ArgumentInvalidException(nameof(idUserRole), $"idUserRole ({idUserRole}), should be approver ({idUserRoleApprover}) or publisher ({idUserRolePublisher})");
+
+        var oldRelation = await context.RelationDrillingProgramPartUsers
+            .FirstOrDefaultAsync(r => r.IdUser == idUser && r.IdDrillingProgramPart == part.Id, token);
+
+        if (oldRelation is not null)
+            context.RelationDrillingProgramPartUsers.Remove(oldRelation);
+
+        var newRelation = new RelationUserDrillingProgramPart
+        {
+            IdUser = idUser,
+            IdDrillingProgramPart = part.Id,
+            IdUserRole = idUserRole,
+        };
+        context.RelationDrillingProgramPartUsers.Add(newRelation);
+        if (idUserRole == idUserRoleApprover)
+            await RemoveDrillingProgramAsync(part.IdWell, token);
+
+        if (idUserRole == idUserRolePublisher)
+            await NotifyNewPublisherAsync(idWell, user, part.FileCategory.Name, token);
+
+        return await context.SaveChangesAsync(token);
+    }
+
+    public async Task<int> RemoveUserAsync(int idWell, int idFileCategory, int idUser, int idUserRole, CancellationToken token = default)
+    {
+        var whereQuery = context.RelationDrillingProgramPartUsers
+            .Include(r => r.DrillingProgramPart)
+            .Where(r => r.IdUser == idUser &&
+                r.IdUserRole == idUserRole &&
+                r.DrillingProgramPart.IdWell == idWell &&
+                r.DrillingProgramPart.IdFileCategory == idFileCategory);
+
+        context.RelationDrillingProgramPartUsers.RemoveRange(whereQuery);
+
+        return await context.SaveChangesAsync(token);
+    }
+
+    public async Task<int> AddOrReplaceFileMarkAsync(FileMarkDto fileMarkDto, int idUser, CancellationToken token)
+    {
+        if (fileMarkDto.IdMarkType != idMarkTypeApprove &&
+            fileMarkDto.IdMarkType != idMarkTypeReject)
+            throw new ArgumentInvalidException(nameof(fileMarkDto), $"В этом методе допустимы только отметки о принятии или отклонении.");
+
+        var fileInfo = await fileService.GetOrDefaultAsync(fileMarkDto.IdFile, token)
+            ?? throw new ArgumentInvalidException(nameof(fileMarkDto), $"Файла для такой отметки не существует.");
+
+        if (fileInfo.IdCategory < idFileCategoryDrillingProgramPartsStart ||
+            fileInfo.IdCategory > idFileCategoryDrillingProgramPartsEnd)
+            throw new ArgumentInvalidException(nameof(fileMarkDto), $"Этот метод допустим только для файлов-частей программы бурения.");
+
+        var part = await context.DrillingProgramParts
+            .Include(p => p.RelatedUsers)
+            .ThenInclude(r => r.User)
+            .AsNoTracking()
+            .FirstOrDefaultAsync(p => p.IdWell == fileInfo.IdWell && p.IdFileCategory == fileInfo.IdCategory, token);
+
+        var user = part?.RelatedUsers.FirstOrDefault(r => r.IdUser == idUser && r.IdUserRole == idUserRoleApprover)?.User
+            ?? throw new ForbidException($"User {idUser} is not in the approvers list.");
+
+        fileMarkDto.User = user.Adapt<UserDto>();
+
+        var oldMarksIds = fileInfo.FileMarks
+            .Where(m => m.User?.Id == idUser)
+            .Select(m => m.Id);
+
+        if (oldMarksIds?.Any() == true)
+            await fileService.MarkFileMarkAsDeletedAsync(oldMarksIds, token);
+
+        var result = await fileService.CreateFileMarkAsync(fileMarkDto, idUser, token)
+            .ConfigureAwait(false);
+
+        if (fileMarkDto.IdMarkType == idMarkTypeReject)
+        {
+            await RemoveDrillingProgramAsync(fileInfo.IdWell, token);
+            await NotifyPublisherOnRejectAsync(fileMarkDto, token);
+        }
+        else
+        {
+            // если все согласованты согласовали - оповещаем публикатора
+            var approvers = part!.RelatedUsers
+                .Where(u => u.IdUserRole == idUserRoleApprover);
+            if (approvers
+                .All(user => fileInfo.FileMarks
+                    ?.Any(mark => (mark.IdMarkType == idMarkTypeApprove && mark.User?.Id == user.IdUser && !mark.IsDeleted)) == true ||
+                    (fileMarkDto.IdMarkType == idMarkTypeApprove && user.IdUser == idUser)))
+            {
+                await NotifyPublisherOnFullAccepAsync(fileMarkDto, token);
+            }
+        }
+        return result;
+    }
+
+    public async Task<int> MarkAsDeletedFileMarkAsync(int idMark,
+        CancellationToken token)
+    {
+        var fileInfo = await fileService.GetByMarkId(idMark, token)
+            .ConfigureAwait(false);
+
+        if (fileInfo.IdCategory < idFileCategoryDrillingProgramPartsStart ||
+            fileInfo.IdCategory > idFileCategoryDrillingProgramPartsEnd)
+            throw new ArgumentInvalidException(nameof(idMark), $"Этот метод допустим только для файлов-частей программы бурения.");
+
+        var result = await fileService.MarkFileMarkAsDeletedAsync(idMark, token)
+            .ConfigureAwait(false);
+
+        await RemoveDrillingProgramAsync(fileInfo.IdWell, token);
+        return result;
+    }
+
+    private async Task NotifyPublisherOnFullAccepAsync(FileMarkDto fileMark, CancellationToken token)
+    {
+        var file = await fileService.GetOrDefaultAsync(fileMark.IdFile, token);
+        var well = await wellService.GetOrDefaultAsync(file!.IdWell, token)
+            ?? throw new ArgumentInvalidException(nameof(file.IdWell), "idWell doesn`t exist");
+
+        var user = file.Author!;
+        var factory = new DrillingMailBodyFactory(configuration);
+        var subject = factory.MakeSubject(well, "Загруженный вами документ полностью согласован");
+        var body = factory.MakeMailBodyForPublisherOnFullAccept(well, user.Name ?? string.Empty, file.Id, file.Name);
+
+        await notificationService.NotifyAsync(new NotifyRequest
+        {
+            IdUser = user.Id,
+            IdNotificationCategory = NotificationCategory.IdSystemNotificationCategory,
+            Title = subject,
+            Message = body,
+            IdTransportType = idTransportType
+        }, token);
+    }
+
+    private async Task NotifyPublisherOnRejectAsync(FileMarkDto fileMark, CancellationToken token)
+    {
+        var file = await fileService.GetOrDefaultAsync(fileMark.IdFile, token);
+        var well = await wellService.GetOrDefaultAsync(file!.IdWell, token)
+            ?? throw new ArgumentInvalidException(nameof(file.IdWell), "idWell doesn`t exist");
+
+        var user = file.Author!;
+        var factory = new DrillingMailBodyFactory(configuration);
+        var subject = factory.MakeSubject(well, "Загруженный вами документ отклонен");
+        var body = factory.MakeMailBodyForPublisherOnReject(well, user.Name ?? string.Empty, file.Id, file.Name, fileMark);
+
+        await notificationService.NotifyAsync(new NotifyRequest
+        {
+            IdUser = user.Id,
+            IdNotificationCategory = NotificationCategory.IdSystemNotificationCategory,
+            Title = subject,
+            Message = body,
+            IdTransportType = idTransportType
+        }, token);
+    }
+
+    private async Task NotifyApproversAsync(DrillingProgramPart part, int idFile, string fileName, CancellationToken token)
+    {
+        var well = await wellService.GetOrDefaultAsync(part.IdWell, token)
+            ?? throw new ArgumentInvalidException(nameof(part.IdWell), "idWell doesn`t exist");
+
+        var factory = new DrillingMailBodyFactory(configuration);
+        var subject = factory.MakeSubject(well, "Загружен новый документ для согласования.");
+        var users = part.RelatedUsers
+            .Where(r => r.IdUserRole == idUserRoleApprover)
+            .Select(r => r.User);
+
+        foreach (var user in users)
+        {
+            var body = factory.MakeMailBodyForApproverNewFile(well, user.Name ?? string.Empty, idFile, fileName);
+            await notificationService.NotifyAsync(new NotifyRequest
+            {
+                IdUser = user.Id,
+                IdNotificationCategory = NotificationCategory.IdSystemNotificationCategory,
+                Title = subject,
+                Message = body,
+                IdTransportType = idTransportType
+            }, token);
+        }
+    }
+
+    private async Task NotifyNewPublisherAsync(int idWell, UserDto user, string documentCategory, CancellationToken token)
+    {
+        var well = await wellService.GetOrDefaultAsync(idWell, token)
+            ?? throw new ArgumentInvalidException(nameof(idWell), "idWell doesn`t exist");
+
+        var factory = new DrillingMailBodyFactory(configuration);
+        var subject = factory.MakeSubject(well, $"От вас ожидается загрузка на портал документа «{documentCategory}»");
+        var body = factory.MakeMailBodyForNewPublisher(well, user.Name ?? string.Empty, documentCategory);
+        
+        await notificationService.NotifyAsync(new NotifyRequest
+        {
+            IdUser = user.Id,
+            IdNotificationCategory = NotificationCategory.IdSystemNotificationCategory,
+            Title = subject,
+            Message = body,
+            IdTransportType = idTransportType
+        }, token);
+    }
+
+    private static DrillingProgramPartDto ConvertPart(int idUser, List<FileCategory> fileCategories, List<AsbCloudDb.Model.FileInfo> files, DrillingProgramPart partEntity, double timezoneOffset)
+    {
+        var part = new DrillingProgramPartDto
+        {
+            IdFileCategory = partEntity.IdFileCategory,
+            Name = fileCategories.FirstOrDefault(c => c.Id == partEntity.IdFileCategory)!.Name,
+            Approvers = partEntity.RelatedUsers
+                            .Where(r => r.IdUserRole == idUserRoleApprover)
+                            .Select(r => r.User.Adapt<UserDto>()),
+            Publishers = partEntity.RelatedUsers
+                            .Where(r => r.IdUserRole == idUserRolePublisher)
+                            .Select(r => r.User.Adapt<UserDto>()),
+            PermissionToApprove = partEntity.RelatedUsers
+                            .Any(r => r.IdUserRole == idUserRoleApprover && r.IdUser == idUser),
+            PermissionToUpload = partEntity.RelatedUsers
+                            .Any(r => r.IdUserRole == idUserRolePublisher && r.IdUser == idUser),
+        };
+
+        var fileEntity = files.LastOrDefault(f => f.IdCategory == partEntity.IdFileCategory);
+
+        if (fileEntity is not null)
+        {
+            part.IdState = idPartStateApproving;
+            part.File = new FileInfoDto
+            {
+                Id = fileEntity.Id,
+                Author = fileEntity.Author?.Adapt<UserDto>(),
+                IdAuthor = fileEntity.Author?.Id,
+                IdCategory = fileEntity.IdCategory,
+                IdWell = fileEntity.IdWell,
+                Name = fileEntity.Name,
+                Size = fileEntity.Size,
+                UploadDate = fileEntity.UploadDate.ToOffset(TimeSpan.FromHours(timezoneOffset)),
+            };
+
+            var marks = fileEntity.FileMarks?.Where(m => !m.IsDeleted);
+            if (marks?.Any() == true)
+            {
+                part.File.FileMarks = marks.Select(m =>
+                {
+                    var mark = m.Adapt<FileMarkDto>();
+                    mark.DateCreated = m.DateCreated.ToOffset(TimeSpan.FromHours(timezoneOffset));
+                    return mark;
+                });
+                var hasReject = marks.Any(m => m.IdMarkType == idMarkTypeReject);
+                if (!hasReject)
+                {
+                    var allAproved = part.Approvers.All(a => marks.Any(m => m.IdUser == a.Id && m.IdMarkType == idMarkTypeApprove));
+                    if (allAproved)
+                        part.IdState = idPartStateApproved;
+                }
+            }
+        }
+        else
+            part.IdState = idPartStateNoFile;
+
+        return part;
+    }
+
+    private async Task EnqueueMakeProgramWorkAsync(int idWell, DrillingProgramStateDto state, CancellationToken token)
+    {
+        if (state.IdState == idStateCreating)
+        {
+            var workId = MakeWorkId(idWell);
+            if (!backgroundWorker.Works.Any(w => w.Id == workId))
+            {
+                var well = (await wellService.GetOrDefaultAsync(idWell, token))!;
+                var resultFileName = $"Программа бурения {well.Cluster} {well.Caption}.pdf";                     
+                var convertedFilesDir = Path.Combine(Path.GetTempPath(), "drillingProgram", $"{well.Cluster}_{well.Caption}");                                        
+                var tempResultFilePath = Path.Combine(convertedFilesDir, resultFileName);
+                var workAction = async (string workId, IServiceProvider serviceProvider, Action<string, double?> onProgress, CancellationToken token) =>
+                {
+                    var context = serviceProvider.GetRequiredService<IAsbCloudDbContext>();
+                    var fileService = serviceProvider.GetRequiredService<FileService>();
+                    var files = state.Parts.Select(p => fileService.GetUrl(p.File!));
+                    onProgress($"Start converting {files.Count()} files to PDF.", null);
+                    await ConvertToPdf.GetConverteAndMergedFileAsync(files, tempResultFilePath, convertedFilesDir, token);
+                    await fileService.MoveAsync(idWell, null, idFileCategoryDrillingProgram, resultFileName, tempResultFilePath, token);
+                };
+
+                var onErrorAction = (string workId, Exception exception, CancellationToken token) =>
+                {
+                    var message = $"Не удалось сформировать программу бурения по скважине {well?.Caption}";
+                    drillingProgramCreateErrors[workId] = new()
+                    {
+                        Message = message,
+                        Exception = exception.Message,
+                    };
+                    return Task.CompletedTask;
+                };
+
+                var work = Work.CreateByDelegate(workId, workAction);
+                work.OnErrorAsync = onErrorAction;
+                backgroundWorker.Enqueue(work);
+            }
+        }
+    }
+
+    public void ClearError(int idWell)
+    {
+        var workId = MakeWorkId(idWell);
+        drillingProgramCreateErrors.Remove(workId);
+    }
+
+    private async Task<int> RemoveDrillingProgramAsync(int idWell, CancellationToken token)
+    {
+        var workId = MakeWorkId(idWell);
+        backgroundWorker.TryRemoveFromQueue(workId);
+
+        var filesIds = await context.Files
+            .Where(f => f.IdWell == idWell &&
+                f.IdCategory == idFileCategoryDrillingProgram)
+            .Select(f => f.Id)
+            .ToListAsync(token);
+        if (filesIds.Any())
+            return await fileService.DeleteAsync(filesIds, token);
+        else
+            return 0;
+    }
+
+    private static string MakeWorkId(int idWell)
+        => $"Make drilling program for wellId {idWell}";
 }
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/ImageInfo.cs b/AsbCloudInfrastructure/Services/DrillingProgram/ImageInfo.cs
index bbeaa71b..2203f6da 100644
--- a/AsbCloudInfrastructure/Services/DrillingProgram/ImageInfo.cs
+++ b/AsbCloudInfrastructure/Services/DrillingProgram/ImageInfo.cs
@@ -1,17 +1,15 @@
 using ClosedXML.Excel;
 
-namespace AsbCloudInfrastructure.Services.DrillingProgram
+namespace AsbCloudInfrastructure.Services.DrillingProgram;
+
+
+class ImageInfo
 {
-
-    class ImageInfo
-    {
-        public int Id { get; set; }
-        public byte[] Data { get; set; } = null!;
-        public int Height { get; set; }
-        public int Width { get; set; }
-        public IXLAddress TopLeftCellAddress { get; set; } = null!;
-        public int Left { get; set; }
-        public int Top { get; set; }
-    }
-
+    public int Id { get; set; }
+    public byte[] Data { get; set; } = null!;
+    public int Height { get; set; }
+    public int Width { get; set; }
+    public IXLAddress TopLeftCellAddress { get; set; } = null!;
+    public int Left { get; set; }
+    public int Top { get; set; }
 }
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/TitleListSheet.cs b/AsbCloudInfrastructure/Services/DrillingProgram/TitleListSheet.cs
index 57e37111..41308f74 100644
--- a/AsbCloudInfrastructure/Services/DrillingProgram/TitleListSheet.cs
+++ b/AsbCloudInfrastructure/Services/DrillingProgram/TitleListSheet.cs
@@ -4,161 +4,159 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AsbCloudInfrastructure.Services.DrillingProgram
+namespace AsbCloudInfrastructure.Services.DrillingProgram;
+
+
+public class TitleListSheet 
 {
+    private const string directionDirectorPositionName = "Руководитель направления по ТСБ";
 
-    public class TitleListSheet 
+    private readonly DateTimeOffset totalDate;
+    private readonly FileMarkDto? acceptDirectionDirector;
+    private readonly List<FileMarkDto> acceptsOthers;
+    private readonly WellDto well;
+
+    public TitleListSheet(IEnumerable<FileMarkDto> fileMarks, WellDto well)
     {
-        private const string directionDirectorPositionName = "Руководитель направления по ТСБ";
-
-        private readonly DateTimeOffset totalDate;
-        private readonly FileMarkDto? acceptDirectionDirector;
-        private readonly List<FileMarkDto> acceptsOthers;
-        private readonly WellDto well;
-
-        public TitleListSheet(IEnumerable<FileMarkDto> fileMarks, WellDto well)
-        {
-            totalDate = fileMarks.Max(f => f.DateCreated);
-            acceptDirectionDirector = fileMarks
-                .OrderByDescending(f => f.DateCreated)
-                .FirstOrDefault(f => f.User?.Position == directionDirectorPositionName);
-            acceptsOthers = fileMarks
-                .Where(f => f.Id != acceptDirectionDirector?.Id)
-                .OrderBy(f => f.DateCreated)
-                .ToList();
-            this.well = well;
-        }
-
-        public void Draw(IXLWorksheet sheet)
-        {
-            const double santimetr = 0.393701;
-            sheet.Style.Font.FontName = "Calibri";
-            sheet.Style.Font.FontSize = 12;
-            sheet.PageSetup.PaperSize = XLPaperSize.A4Paper;
-            sheet.PageSetup.Margins
-                .SetTop(santimetr)
-                .SetLeft(2 * santimetr)
-                .SetBottom(santimetr)
-                .SetRight(santimetr);
-
-            DrawTopRightSign(sheet);
-            DrawMainTilte(sheet);
-            DrawOtherAcceptors(sheet);
-
-            sheet.Range(51, 1, 51, 5)
-                .Merge()
-                .SetValue($"{totalDate.Year:00}")
-                .Style.Alignment.SetHorizontal(XLAlignmentHorizontalValues.Center);
-
-            var k = 4.95867768595041;
-            sheet.Column(1).Width = k*2.3;
-            sheet.Column(2).Width = k*6;
-            sheet.Column(3).Width = k*0.53; 
-            sheet.Column(4).Width = k*2.3;
-            sheet.Column(5).Width = k*6;
-        }
-
-        private void DrawTopRightSign(IXLWorksheet sheet)
-        {
-            if (acceptDirectionDirector?.User is null)
-                return;
-
-            var user = acceptDirectionDirector.User;
-
-            sheet.Cell(1, 5)
-                .SetValue("Согласовано:");
-
-            sheet.Cell(2, 5)
-                .SetValue(user.Position);
-
-            sheet.Cell(3, 5)
-                .SetValue(user.Company?.Caption);
-
-            sheet.Cell(4, 5)
-                .SetValue($"{user.Surname} {user.Name} {user.Patronymic}");
-
-            sheet.Cell(5, 5)
-                .SetValue(FormatDate(acceptDirectionDirector.DateCreated));
-
-            sheet.Range(1,5, 5,5).Style.Alignment
-                .SetHorizontal(XLAlignmentHorizontalValues.Right);
-        }
-
-        private void DrawMainTilte(IXLWorksheet sheet)
-        {
-            sheet.Range(11, 1, 11, 5)
-                .Merge()
-                .SetValue($"Программа на бурение скважины №{well.Caption}, куст №{well.Cluster}");
-
-            sheet.Range(12, 1, 12, 5)
-                .Merge()
-                .SetValue($"{well.Deposit} месторождения");
-
-            sheet.Range(11, 1, 12, 5).Style
-                .Alignment.SetHorizontal(XLAlignmentHorizontalValues.Center)
-                .Font.SetFontSize(14)
-                .Font.SetBold(true);
-        }
-
-        private void DrawOtherAcceptors(IXLWorksheet sheet)
-        {
-            const int baseRow = 16;
-            const int deltaRow = 7;
-            (int row, int col)[] addresses =
-            {
-                (baseRow + 4 * deltaRow, 4), (baseRow + 4 * deltaRow, 1),
-                (baseRow + 3 * deltaRow, 4), (baseRow + 3 * deltaRow, 1),
-                (baseRow + 2 * deltaRow, 4), (baseRow + 2 * deltaRow, 1),
-                (baseRow + 1 * deltaRow, 4), (baseRow + 1 * deltaRow, 1),
-                (baseRow + 0 * deltaRow, 4), (baseRow + 0 * deltaRow, 1),
-            };
-            var i = 0;
-            for (; i < acceptsOthers.Count && i < 10; i++)
-                DrawAccept(sheet, acceptsOthers[i], addresses[i]);
-
-            sheet.Cell(addresses[i-1].row - 2, 1)
-                .SetValue("Утверждаю:");
-        }
-
-        private static void DrawAccept(IXLWorksheet sheet, FileMarkDto mark, (int row, int col) startAddress)
-        {            
-            var user = mark.User;
-            if(user is null)
-                return;
-
-            int startRow = startAddress.row;
-            int startCol = startAddress.col;
-
-            sheet.Cell(startRow, startCol)
-                .SetValue("Должность");
-
-            sheet.Range(startRow, startCol + 1, startRow + 1, startCol + 1)
-                .Merge()
-                .SetValue(user.Position);
-               
-            sheet.Cell(startRow + 2, startCol)
-                .SetValue("Компания");
-
-            sheet.Range(startRow + 2, startCol + 1, startRow + 3, startCol + 1)
-                .Merge()
-                .SetValue(user.Company?.Caption);
-
-            sheet.Range(startRow + 4, startCol, startRow + 4, startCol + 1)
-                .Merge()
-                .SetValue($"{user.Surname} {user.Name} {user.Patronymic}");
-
-            sheet.Range(startRow + 5, startCol, startRow + 5, startCol + 1)
-                .Merge()
-                .SetValue(FormatDate(mark.DateCreated));
-
-            sheet.Range(startRow, startCol, startRow + 5, startCol + 1)
-                .Style.Border.SetOutsideBorder(XLBorderStyleValues.Thin)
-                .Alignment.SetVertical(XLAlignmentVerticalValues.Top)
-                .Alignment.SetHorizontal(XLAlignmentHorizontalValues.Left);
-        }
-
-        private static string FormatDate(DateTimeOffset dateTime)
-            => $"{dateTime.Day:00}.{dateTime.Month:00}.{dateTime.Year:00}";
+        totalDate = fileMarks.Max(f => f.DateCreated);
+        acceptDirectionDirector = fileMarks
+            .OrderByDescending(f => f.DateCreated)
+            .FirstOrDefault(f => f.User?.Position == directionDirectorPositionName);
+        acceptsOthers = fileMarks
+            .Where(f => f.Id != acceptDirectionDirector?.Id)
+            .OrderBy(f => f.DateCreated)
+            .ToList();
+        this.well = well;
     }
 
+    public void Draw(IXLWorksheet sheet)
+    {
+        const double santimetr = 0.393701;
+        sheet.Style.Font.FontName = "Calibri";
+        sheet.Style.Font.FontSize = 12;
+        sheet.PageSetup.PaperSize = XLPaperSize.A4Paper;
+        sheet.PageSetup.Margins
+            .SetTop(santimetr)
+            .SetLeft(2 * santimetr)
+            .SetBottom(santimetr)
+            .SetRight(santimetr);
+
+        DrawTopRightSign(sheet);
+        DrawMainTilte(sheet);
+        DrawOtherAcceptors(sheet);
+
+        sheet.Range(51, 1, 51, 5)
+            .Merge()
+            .SetValue($"{totalDate.Year:00}")
+            .Style.Alignment.SetHorizontal(XLAlignmentHorizontalValues.Center);
+
+        var k = 4.95867768595041;
+        sheet.Column(1).Width = k*2.3;
+        sheet.Column(2).Width = k*6;
+        sheet.Column(3).Width = k*0.53; 
+        sheet.Column(4).Width = k*2.3;
+        sheet.Column(5).Width = k*6;
+    }
+
+    private void DrawTopRightSign(IXLWorksheet sheet)
+    {
+        if (acceptDirectionDirector?.User is null)
+            return;
+
+        var user = acceptDirectionDirector.User;
+
+        sheet.Cell(1, 5)
+            .SetValue("Согласовано:");
+
+        sheet.Cell(2, 5)
+            .SetValue(user.Position);
+
+        sheet.Cell(3, 5)
+            .SetValue(user.Company?.Caption);
+
+        sheet.Cell(4, 5)
+            .SetValue($"{user.Surname} {user.Name} {user.Patronymic}");
+
+        sheet.Cell(5, 5)
+            .SetValue(FormatDate(acceptDirectionDirector.DateCreated));
+
+        sheet.Range(1,5, 5,5).Style.Alignment
+            .SetHorizontal(XLAlignmentHorizontalValues.Right);
+    }
+
+    private void DrawMainTilte(IXLWorksheet sheet)
+    {
+        sheet.Range(11, 1, 11, 5)
+            .Merge()
+            .SetValue($"Программа на бурение скважины №{well.Caption}, куст №{well.Cluster}");
+
+        sheet.Range(12, 1, 12, 5)
+            .Merge()
+            .SetValue($"{well.Deposit} месторождения");
+
+        sheet.Range(11, 1, 12, 5).Style
+            .Alignment.SetHorizontal(XLAlignmentHorizontalValues.Center)
+            .Font.SetFontSize(14)
+            .Font.SetBold(true);
+    }
+
+    private void DrawOtherAcceptors(IXLWorksheet sheet)
+    {
+        const int baseRow = 16;
+        const int deltaRow = 7;
+        (int row, int col)[] addresses =
+        {
+            (baseRow + 4 * deltaRow, 4), (baseRow + 4 * deltaRow, 1),
+            (baseRow + 3 * deltaRow, 4), (baseRow + 3 * deltaRow, 1),
+            (baseRow + 2 * deltaRow, 4), (baseRow + 2 * deltaRow, 1),
+            (baseRow + 1 * deltaRow, 4), (baseRow + 1 * deltaRow, 1),
+            (baseRow + 0 * deltaRow, 4), (baseRow + 0 * deltaRow, 1),
+        };
+        var i = 0;
+        for (; i < acceptsOthers.Count && i < 10; i++)
+            DrawAccept(sheet, acceptsOthers[i], addresses[i]);
+
+        sheet.Cell(addresses[i-1].row - 2, 1)
+            .SetValue("Утверждаю:");
+    }
+
+    private static void DrawAccept(IXLWorksheet sheet, FileMarkDto mark, (int row, int col) startAddress)
+    {            
+        var user = mark.User;
+        if(user is null)
+            return;
+
+        int startRow = startAddress.row;
+        int startCol = startAddress.col;
+
+        sheet.Cell(startRow, startCol)
+            .SetValue("Должность");
+
+        sheet.Range(startRow, startCol + 1, startRow + 1, startCol + 1)
+            .Merge()
+            .SetValue(user.Position);
+           
+        sheet.Cell(startRow + 2, startCol)
+            .SetValue("Компания");
+
+        sheet.Range(startRow + 2, startCol + 1, startRow + 3, startCol + 1)
+            .Merge()
+            .SetValue(user.Company?.Caption);
+
+        sheet.Range(startRow + 4, startCol, startRow + 4, startCol + 1)
+            .Merge()
+            .SetValue($"{user.Surname} {user.Name} {user.Patronymic}");
+
+        sheet.Range(startRow + 5, startCol, startRow + 5, startCol + 1)
+            .Merge()
+            .SetValue(FormatDate(mark.DateCreated));
+
+        sheet.Range(startRow, startCol, startRow + 5, startCol + 1)
+            .Style.Border.SetOutsideBorder(XLBorderStyleValues.Thin)
+            .Alignment.SetVertical(XLAlignmentVerticalValues.Top)
+            .Alignment.SetHorizontal(XLAlignmentHorizontalValues.Left);
+    }
+
+    private static string FormatDate(DateTimeOffset dateTime)
+        => $"{dateTime.Day:00}.{dateTime.Month:00}.{dateTime.Year:00}";
 }
diff --git a/AsbCloudInfrastructure/Services/Email/BaseFactory.cs b/AsbCloudInfrastructure/Services/Email/BaseFactory.cs
index 50570467..a138270c 100644
--- a/AsbCloudInfrastructure/Services/Email/BaseFactory.cs
+++ b/AsbCloudInfrastructure/Services/Email/BaseFactory.cs
@@ -5,69 +5,67 @@ using System;
 using System.Configuration;
 using System.IO;
 
-namespace AsbCloudInfrastructure.Services.Email
+namespace AsbCloudInfrastructure.Services.Email;
+
+
+public class BaseFactory
 {
+    protected readonly string platformName;
+    protected readonly string platformUrl;
+    protected readonly string companyName;
+    protected readonly string supportMail;
 
-    public class BaseFactory
+    public BaseFactory(IConfiguration configuration)
     {
-        protected readonly string platformName;
-        protected readonly string platformUrl;
-        protected readonly string companyName;
-        protected readonly string supportMail;
+        platformName = configuration.GetValue<string>("email:platformName")
+            ?? throw new ConfigurationErrorsException("email:platformName не определен");
 
-        public BaseFactory(IConfiguration configuration)
-        {
-            platformName = configuration.GetValue<string>("email:platformName")
-                ?? throw new ConfigurationErrorsException("email:platformName не определен");
+        platformUrl = configuration.GetValue<string>("email:platformUrl")
+            ?? throw new ConfigurationErrorsException("email:platformUrl не определен");
 
-            platformUrl = configuration.GetValue<string>("email:platformUrl")
-                ?? throw new ConfigurationErrorsException("email:platformUrl не определен");
+        companyName = configuration.GetValue<string>("email:companyName")
+            ?? throw new ConfigurationErrorsException("email:companyName не определен");
 
-            companyName = configuration.GetValue<string>("email:companyName")
-                ?? throw new ConfigurationErrorsException("email:companyName не определен");
-
-            supportMail = configuration.GetValue<string>("email:supportMail")
-                 ?? throw new ConfigurationErrorsException("email:supportMail не определен");
-        }
-
-        public static string GetOrEmptyImageBase64(string resourceFileName)
-        {
-            if (string.IsNullOrEmpty(resourceFileName))
-                throw new ArgumentInvalidException(nameof(resourceFileName), "ResourceFileName doesn`t exist");
-
-            var baseDir = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location)
-            ?? string.Empty;
-            var resourcesDir = "Res";
-
-            var logoFilePath = Path.Combine(baseDir, resourcesDir, resourceFileName);
-
-            if (!File.Exists(logoFilePath))
-            {
-                System.Diagnostics.Trace.TraceWarning($"GetOrEmptyImageBase64(). File {logoFilePath} not found.");
-                return string.Empty;
-            }
-
-            var imageBytes = File.ReadAllBytes(logoFilePath);
-            var format = Path.GetExtension(resourceFileName).Trim('.');
-            return "data:image/" + format + ";base64," + Convert.ToBase64String(imageBytes);
-        }
-
-        public static string MakeHref(string url, string text)
-            => $"<a href=\"{url}\">{text}</a>";
-
-        public string MakeSignatue()
-        {
-            var logo = GetOrEmptyImageBase64("logo_32.png");
-            var sign = $"<br><br>---<br><img src=\"{logo}\"/><br>" +
-            $"{companyName}<br>" +
-            $"Это письмо сформировано автоматически.<br>" +
-            $"Для получения помощи по работе на портале {platformName}" +
-            $"обращайтесь по адресу {supportMail}";
-            return sign;
-        }
-
-        public virtual string MakeSubject(WellDto well, string action)
-            => $"{well.Deposit}, {well.Cluster}, {well.Caption}. {action}";
+        supportMail = configuration.GetValue<string>("email:supportMail")
+             ?? throw new ConfigurationErrorsException("email:supportMail не определен");
     }
 
+    public static string GetOrEmptyImageBase64(string resourceFileName)
+    {
+        if (string.IsNullOrEmpty(resourceFileName))
+            throw new ArgumentInvalidException(nameof(resourceFileName), "ResourceFileName doesn`t exist");
+
+        var baseDir = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location)
+        ?? string.Empty;
+        var resourcesDir = "Res";
+
+        var logoFilePath = Path.Combine(baseDir, resourcesDir, resourceFileName);
+
+        if (!File.Exists(logoFilePath))
+        {
+            System.Diagnostics.Trace.TraceWarning($"GetOrEmptyImageBase64(). File {logoFilePath} not found.");
+            return string.Empty;
+        }
+
+        var imageBytes = File.ReadAllBytes(logoFilePath);
+        var format = Path.GetExtension(resourceFileName).Trim('.');
+        return "data:image/" + format + ";base64," + Convert.ToBase64String(imageBytes);
+    }
+
+    public static string MakeHref(string url, string text)
+        => $"<a href=\"{url}\">{text}</a>";
+
+    public string MakeSignatue()
+    {
+        var logo = GetOrEmptyImageBase64("logo_32.png");
+        var sign = $"<br><br>---<br><img src=\"{logo}\"/><br>" +
+        $"{companyName}<br>" +
+        $"Это письмо сформировано автоматически.<br>" +
+        $"Для получения помощи по работе на портале {platformName}" +
+        $"обращайтесь по адресу {supportMail}";
+        return sign;
+    }
+
+    public virtual string MakeSubject(WellDto well, string action)
+        => $"{well.Deposit}, {well.Cluster}, {well.Caption}. {action}";
 }
diff --git a/AsbCloudInfrastructure/Services/Email/DrillingMailBodyFactory.cs b/AsbCloudInfrastructure/Services/Email/DrillingMailBodyFactory.cs
index 1501811a..45005057 100644
--- a/AsbCloudInfrastructure/Services/Email/DrillingMailBodyFactory.cs
+++ b/AsbCloudInfrastructure/Services/Email/DrillingMailBodyFactory.cs
@@ -1,82 +1,80 @@
 using AsbCloudApp.Data;
 using Microsoft.Extensions.Configuration;
 
-namespace AsbCloudInfrastructure.Services.Email
+namespace AsbCloudInfrastructure.Services.Email;
+
+
+class DrillingMailBodyFactory : BaseFactory
 {
 
-    class DrillingMailBodyFactory : BaseFactory
+    public DrillingMailBodyFactory(IConfiguration configuration)
+        : base(configuration)
     {
-
-        public DrillingMailBodyFactory(IConfiguration configuration)
-            : base(configuration)
-        {
-        }
-
-        public override string MakeSubject(WellDto well, string action)
-        {
-            var subj = $"{well.Deposit}, {well.Cluster}, {well.Caption}. Программа бурения. {action}";
-            return subj;
-        }
-
-        public string MakeMailBodyForNewPublisher(WellDto well, string publisherName, string documentCategory)
-        {
-            var drillingProgramHref = MakeDrillingProgramHref(well);
-
-            var body = $"<html><body><h2>Здравствуйте, {publisherName}.</h2>" +
-                $"На портале {platformName} началось создание программы бурения скважины {drillingProgramHref}," +
-                $" куст {well.Cluster}, месторождение {well.Deposit}." +
-                $"<br><br>От вас ожидается загрузка на портал документа «{documentCategory}» в формате excel (*.xlsx)." +
-                MakeSignatue() +
-                $"</body></html>";
-            return body;
-        }
-
-        public string MakeMailBodyForApproverNewFile(WellDto well, string approverName, int idFile, string fileName)
-        {
-            var drillingProgramHref = MakeDrillingProgramHref(well);
-
-            var body = $"<html><body><h2>Здравствуйте, {approverName}.</h2>" +
-                $"На портал {platformName} загружен документ {fileName}" +
-                $" для согласования при создании программы бурения скважины {drillingProgramHref}, куст ({well.Cluster})" +
-                $", месторождение ({well.Deposit}).<br>" +
-                MakeSignatue() +
-                $"</body></html>";
-            return body;
-        }
-
-        public string MakeMailBodyForPublisherOnReject(WellDto well, string publisherName, int idFile, string fileName, FileMarkDto fileMark)
-        {
-            var drillingProgramHref = MakeDrillingProgramHref(well);
-
-            var body = $"<html><body><h2>Здравствуйте, {publisherName}.</h2>" +
-                $"На портале {platformName} отклонен загруженный вами документ {fileName} " +
-                $" по программе бурения скважины {drillingProgramHref}," +
-                $" куст {well.Cluster}, месторождение {well.Deposit}." +
-                $" Комментарий согласующего ({fileMark.User?.Name} {fileMark.User?.Surname}):<br>{fileMark.Comment}" +
-                MakeSignatue() +
-                $"</body></html>";
-            return body;
-        }
-
-        public string MakeMailBodyForPublisherOnFullAccept(WellDto well, string publisherName, int idFile, string fileName)
-        {
-            var drillingProgramHref = MakeDrillingProgramHref(well);
-
-            var body = $"<html><body><h2>Здравствуйте, {publisherName}.</h2>" +
-                $"На портале {platformName} полностью согласован документ {fileName} " +
-                $" по программе бурения скважины {drillingProgramHref}," +
-                $" куст {well.Cluster}, месторождение {well.Deposit}." +
-                MakeSignatue() +
-                $"</body></html>";
-            return body;
-        }
-
-        private string MakeDrillingProgramHref(WellDto well)
-        {
-            var drillingProgramUrl = $"{platformUrl}/well/{well.Id}/drillingProgram";
-            var drillingProgramHref = MakeHref(drillingProgramUrl, well.Caption);
-            return drillingProgramHref;
-        }
     }
 
+    public override string MakeSubject(WellDto well, string action)
+    {
+        var subj = $"{well.Deposit}, {well.Cluster}, {well.Caption}. Программа бурения. {action}";
+        return subj;
+    }
+
+    public string MakeMailBodyForNewPublisher(WellDto well, string publisherName, string documentCategory)
+    {
+        var drillingProgramHref = MakeDrillingProgramHref(well);
+
+        var body = $"<html><body><h2>Здравствуйте, {publisherName}.</h2>" +
+            $"На портале {platformName} началось создание программы бурения скважины {drillingProgramHref}," +
+            $" куст {well.Cluster}, месторождение {well.Deposit}." +
+            $"<br><br>От вас ожидается загрузка на портал документа «{documentCategory}» в формате excel (*.xlsx)." +
+            MakeSignatue() +
+            $"</body></html>";
+        return body;
+    }
+
+    public string MakeMailBodyForApproverNewFile(WellDto well, string approverName, int idFile, string fileName)
+    {
+        var drillingProgramHref = MakeDrillingProgramHref(well);
+
+        var body = $"<html><body><h2>Здравствуйте, {approverName}.</h2>" +
+            $"На портал {platformName} загружен документ {fileName}" +
+            $" для согласования при создании программы бурения скважины {drillingProgramHref}, куст ({well.Cluster})" +
+            $", месторождение ({well.Deposit}).<br>" +
+            MakeSignatue() +
+            $"</body></html>";
+        return body;
+    }
+
+    public string MakeMailBodyForPublisherOnReject(WellDto well, string publisherName, int idFile, string fileName, FileMarkDto fileMark)
+    {
+        var drillingProgramHref = MakeDrillingProgramHref(well);
+
+        var body = $"<html><body><h2>Здравствуйте, {publisherName}.</h2>" +
+            $"На портале {platformName} отклонен загруженный вами документ {fileName} " +
+            $" по программе бурения скважины {drillingProgramHref}," +
+            $" куст {well.Cluster}, месторождение {well.Deposit}." +
+            $" Комментарий согласующего ({fileMark.User?.Name} {fileMark.User?.Surname}):<br>{fileMark.Comment}" +
+            MakeSignatue() +
+            $"</body></html>";
+        return body;
+    }
+
+    public string MakeMailBodyForPublisherOnFullAccept(WellDto well, string publisherName, int idFile, string fileName)
+    {
+        var drillingProgramHref = MakeDrillingProgramHref(well);
+
+        var body = $"<html><body><h2>Здравствуйте, {publisherName}.</h2>" +
+            $"На портале {platformName} полностью согласован документ {fileName} " +
+            $" по программе бурения скважины {drillingProgramHref}," +
+            $" куст {well.Cluster}, месторождение {well.Deposit}." +
+            MakeSignatue() +
+            $"</body></html>";
+        return body;
+    }
+
+    private string MakeDrillingProgramHref(WellDto well)
+    {
+        var drillingProgramUrl = $"{platformUrl}/well/{well.Id}/drillingProgram";
+        var drillingProgramHref = MakeHref(drillingProgramUrl, well.Caption);
+        return drillingProgramHref;
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/Email/EmailNotificationTransportService.cs b/AsbCloudInfrastructure/Services/Email/EmailNotificationTransportService.cs
index a52cd0b1..72d3b6a5 100644
--- a/AsbCloudInfrastructure/Services/Email/EmailNotificationTransportService.cs
+++ b/AsbCloudInfrastructure/Services/Email/EmailNotificationTransportService.cs
@@ -11,86 +11,85 @@ using System.Net.Mail;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services.Email
+namespace AsbCloudInfrastructure.Services.Email;
+
+
+public class EmailNotificationTransportService : INotificationTransportService
 {
+    private readonly IUserRepository userRepository;
+    private readonly string sender;
+    private readonly string smtpPassword;
+    private readonly string smtpServer;
 
-    public class EmailNotificationTransportService : INotificationTransportService
+    public int IdTransportType => 1;
+    public bool IsConfigured { get; }
+
+    public EmailNotificationTransportService(
+        IConfiguration configuration,
+        IUserRepository userRepository)
     {
-        private readonly IUserRepository userRepository;
-        private readonly string sender;
-        private readonly string smtpPassword;
-        private readonly string smtpServer;
+        this.userRepository = userRepository;
 
-        public int IdTransportType => 1;
-        public bool IsConfigured { get; }
+        this.sender = configuration.GetValue<string>("email:sender")
+            ?? throw new ConfigurationErrorsException("email:sender не определен");
 
-        public EmailNotificationTransportService(
-            IConfiguration configuration,
-            IUserRepository userRepository)
+        this.smtpPassword = configuration.GetValue<string>("email:password")
+            ?? throw new ConfigurationErrorsException("email:password не определен");
+
+        this.smtpServer = configuration.GetValue<string>("email:smtpServer")
+            ?? throw new ConfigurationErrorsException("email:smtpServer не определен");
+
+        var configError = string.IsNullOrEmpty(this.sender) ||
+            string.IsNullOrEmpty(this.smtpPassword) ||
+            string.IsNullOrEmpty(this.smtpServer);
+
+        this.IsConfigured = !configError;
+    }
+
+    public async Task SendAsync(NotificationDto notification, CancellationToken token)
+    {
+        if (!IsConfigured)
         {
-            this.userRepository = userRepository;
-
-            this.sender = configuration.GetValue<string>("email:sender")
-                ?? throw new ConfigurationErrorsException("email:sender не определен");
-
-            this.smtpPassword = configuration.GetValue<string>("email:password")
-                ?? throw new ConfigurationErrorsException("email:password не определен");
-
-            this.smtpServer = configuration.GetValue<string>("email:smtpServer")
-                ?? throw new ConfigurationErrorsException("email:smtpServer не определен");
-
-            var configError = string.IsNullOrEmpty(this.sender) ||
-                string.IsNullOrEmpty(this.smtpPassword) ||
-                string.IsNullOrEmpty(this.smtpServer);
-
-            this.IsConfigured = !configError;
+            Trace.TraceWarning("smtp is not configured");
+            return;
         }
 
-        public async Task SendAsync(NotificationDto notification, CancellationToken token)
+        var user = await userRepository.GetOrDefaultAsync(notification.IdUser, token)
+                       ?? throw new ArgumentInvalidException(nameof(notification.IdUser), "Пользователь не найден");
+
+        if (!MailAddress.TryCreate(user.Email, out var mailAddress))
         {
-            if (!IsConfigured)
-            {
-                Trace.TraceWarning("smtp is not configured");
-                return;
-            }
-
-            var user = await userRepository.GetOrDefaultAsync(notification.IdUser, token)
-                           ?? throw new ArgumentInvalidException(nameof(notification.IdUser), "Пользователь не найден");
-
-            if (!MailAddress.TryCreate(user.Email, out var mailAddress))
-            {
-                Trace.TraceWarning($"Mail {user.Email} is not correct.");
-                throw new ArgumentInvalidException(nameof(user.Email), $"Mail {user.Email} is not null.");
-            }
-
-            var from = new MailAddress(sender);
-            var message = new MailMessage
-            {
-                From = from
-            };
-
-            message.To.Add(mailAddress.Address);
-            message.BodyEncoding = System.Text.Encoding.UTF8;
-            message.Body = notification.Message;
-            message.Subject = notification.Title;
-            message.IsBodyHtml = true;
-
-            using var client = new SmtpClient(smtpServer);
-            client.EnableSsl = true;
-            client.UseDefaultCredentials = false;
-            client.Credentials = new System.Net.NetworkCredential(sender, smtpPassword);
-
-            await client.SendMailAsync(message, token);
-
-            Trace.TraceInformation($"Send email to {user.Email} subj:{notification.Title} html body count {notification.Message.Length}");
+            Trace.TraceWarning($"Mail {user.Email} is not correct.");
+            throw new ArgumentInvalidException(nameof(user.Email), $"Mail {user.Email} is not null.");
         }
 
-        public Task SendRangeAsync(IEnumerable<NotificationDto> notifications, CancellationToken cancellationToken)
+        var from = new MailAddress(sender);
+        var message = new MailMessage
         {
-            var tasks = notifications
-                .Select(notification => SendAsync(notification, cancellationToken));
+            From = from
+        };
 
-            return Task.WhenAll(tasks);
-        }
+        message.To.Add(mailAddress.Address);
+        message.BodyEncoding = System.Text.Encoding.UTF8;
+        message.Body = notification.Message;
+        message.Subject = notification.Title;
+        message.IsBodyHtml = true;
+
+        using var client = new SmtpClient(smtpServer);
+        client.EnableSsl = true;
+        client.UseDefaultCredentials = false;
+        client.Credentials = new System.Net.NetworkCredential(sender, smtpPassword);
+
+        await client.SendMailAsync(message, token);
+
+        Trace.TraceInformation($"Send email to {user.Email} subj:{notification.Title} html body count {notification.Message.Length}");
+    }
+
+    public Task SendRangeAsync(IEnumerable<NotificationDto> notifications, CancellationToken cancellationToken)
+    {
+        var tasks = notifications
+            .Select(notification => SendAsync(notification, cancellationToken));
+
+        return Task.WhenAll(tasks);
     }
 }
diff --git a/AsbCloudInfrastructure/Services/Email/WellFinalDocumentMailBodyFactory .cs b/AsbCloudInfrastructure/Services/Email/WellFinalDocumentMailBodyFactory .cs
index f9a49329..c96312c8 100644
--- a/AsbCloudInfrastructure/Services/Email/WellFinalDocumentMailBodyFactory .cs	
+++ b/AsbCloudInfrastructure/Services/Email/WellFinalDocumentMailBodyFactory .cs	
@@ -4,30 +4,28 @@ using Microsoft.Extensions.Configuration;
 using System;
 using System.IO;
 
-namespace AsbCloudInfrastructure
+namespace AsbCloudInfrastructure;
+
+
+class WellFinalDocumentMailBodyFactory : BaseFactory
 {
 
-   class WellFinalDocumentMailBodyFactory : BaseFactory
+    public WellFinalDocumentMailBodyFactory(IConfiguration configuration)
+     : base(configuration)   
     {
+     
+  }
 
-        public WellFinalDocumentMailBodyFactory(IConfiguration configuration)
-         : base(configuration)   
-        {
-         
-      }
-
-      public override string MakeSubject(WellDto well, string action)
-         => $"{well.Deposit}, {well.Cluster}, {well.Caption}. Дело скважины. {action}";
-
-      public string MakeMailBodyForWellFinalDocument(WellDto well, string publisherName, string message)
-      {
-         var body = $"<html><body><h2>Здравствуйте, {publisherName}.</h2>" +
-            $"На портале {platformName} {message}," +
-            $" куст {well.Cluster}, месторождение {well.Deposit}." +
-            MakeSignatue() +
-            $"</body></html>";
-         return body;
-      }
-   }
+  public override string MakeSubject(WellDto well, string action)
+     => $"{well.Deposit}, {well.Cluster}, {well.Caption}. Дело скважины. {action}";
 
+  public string MakeMailBodyForWellFinalDocument(WellDto well, string publisherName, string message)
+  {
+     var body = $"<html><body><h2>Здравствуйте, {publisherName}.</h2>" +
+        $"На портале {platformName} {message}," +
+        $" куст {well.Cluster}, месторождение {well.Deposit}." +
+        MakeSignatue() +
+        $"</body></html>";
+     return body;
+  }
 }
diff --git a/AsbCloudInfrastructure/Services/FileCategoryService.cs b/AsbCloudInfrastructure/Services/FileCategoryService.cs
index 02d8be83..ef747a1d 100644
--- a/AsbCloudInfrastructure/Services/FileCategoryService.cs
+++ b/AsbCloudInfrastructure/Services/FileCategoryService.cs
@@ -8,26 +8,24 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services
+namespace AsbCloudInfrastructure.Services;
+
+
+public class FileCategoryService : CrudCacheRepositoryBase<FileCategoryDto, FileCategory>, IFileCategoryService
 {
+    public FileCategoryService(IAsbCloudDbContext context, IMemoryCache memoryCache)
+        : base(context, memoryCache) { }
 
-    public class FileCategoryService : CrudCacheRepositoryBase<FileCategoryDto, FileCategory>, IFileCategoryService
+    //TODO: Перенести в сервис "дело скважины"
+    public async Task<IEnumerable<FileCategoryDto>> GetWellCaseCategoriesAsync(CancellationToken token)
     {
-        public FileCategoryService(IAsbCloudDbContext context, IMemoryCache memoryCache)
-            : base(context, memoryCache) { }
+        var cache = await GetCacheAsync(token)
+            .ConfigureAwait(false);
+        var dtos = cache
+            .Where(f => f.Id >= 10000)
+            .Where(f => f.Id <= 20000)
+            .Select(Convert);
 
-        //TODO: Перенести в сервис "дело скважины"
-        public async Task<IEnumerable<FileCategoryDto>> GetWellCaseCategoriesAsync(CancellationToken token)
-        {
-            var cache = await GetCacheAsync(token)
-                .ConfigureAwait(false);
-            var dtos = cache
-                .Where(f => f.Id >= 10000)
-                .Where(f => f.Id <= 20000)
-                .Select(Convert);
-
-            return dtos;
-        }
+        return dtos;
     }
-
 }
diff --git a/AsbCloudInfrastructure/Services/LimitingParameterService.cs b/AsbCloudInfrastructure/Services/LimitingParameterService.cs
index da86efd9..5a0a61a3 100644
--- a/AsbCloudInfrastructure/Services/LimitingParameterService.cs
+++ b/AsbCloudInfrastructure/Services/LimitingParameterService.cs
@@ -8,112 +8,110 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services
+namespace AsbCloudInfrastructure.Services;
+
+
+public class LimitingParameterService : ILimitingParameterService
 {
-
-    public class LimitingParameterService : ILimitingParameterService
+    private readonly ILimitingParameterRepository limitingParameterRepository;
+    private readonly IWellService wellService;
+    private readonly  Dictionary<int, string> feedRegulatorData = new ()
     {
-        private readonly ILimitingParameterRepository limitingParameterRepository;
-        private readonly IWellService wellService;
-        private readonly  Dictionary<int, string> feedRegulatorData = new ()
-        {
-            { LimitingParameterDto.NoLimit, "Нет ограничения" },
-            { LimitingParameterDto.RopPlan, "Скорость блока" },
-            { LimitingParameterDto.Pressure, "Давление" },
-            { LimitingParameterDto.AxialLoad, "Осевая нагрузка" },
-            { LimitingParameterDto.RotorTorque, "Момент на роторе" }
-        };
+        { LimitingParameterDto.NoLimit, "Нет ограничения" },
+        { LimitingParameterDto.RopPlan, "Скорость блока" },
+        { LimitingParameterDto.Pressure, "Давление" },
+        { LimitingParameterDto.AxialLoad, "Осевая нагрузка" },
+        { LimitingParameterDto.RotorTorque, "Момент на роторе" }
+    };
 
-        public LimitingParameterService(ILimitingParameterRepository limitingParameterRepository,
-            IWellService wellService)
-        {
-            this.limitingParameterRepository = limitingParameterRepository;
-            this.wellService = wellService;
-        }
-
-        public async Task<IEnumerable<LimitingParameterDto>> GetStatAsync(LimitingParameterRequest request, CancellationToken token)
-        {
-            var well = await wellService.GetOrDefaultAsync(request.IdWell, token);
-            if (well?.IdTelemetry is null || well.Timezone is null)
-                return Enumerable.Empty<LimitingParameterDto>();
-
-            var data = (await limitingParameterRepository.GetLimitingParametersAsync(request, well, token))
-                .GroupBy(x => x.IdFeedRegulator);
-
-            List<LimitingParameterDto> result = new List<LimitingParameterDto>(data.Count());
-            foreach (var item in data)
-            {
-                var trimData = TrimLimitingParameters(item, request).ToArray();
-                
-                var allItemDepths = trimData.Sum(x => x.DepthEnd - x.DepthStart);
-                var allItemDates = trimData.Sum(x => (x.DateEnd - x.DateStart).TotalMinutes);
-
-                result.Add(new LimitingParameterDto
-                {
-                    IdWell = well.Id,
-                    IdFeedRegulator = item.Key,
-                    Depth = allItemDepths,
-                    TotalMinutes = (float)allItemDates,
-                    NumberInclusions = item.Count(),
-                    NameFeedRegulator = feedRegulatorData.GetValueOrDefault(item.Key) ?? $"Id: {item.Key}"
-                });
-            }
-
-            return result;
-        }
-
-        public Dictionary<int, string> GetLimitingParameteraNames() //TODO: Перенести получение ограничений в репозиторий
-        {
-            return feedRegulatorData;
-        }
-
-        private IEnumerable<LimitingParameterDataDto> TrimLimitingParameters(IEnumerable<LimitingParameterDataDto> data, LimitingParameterRequest request)
-        {
-            var result = data.Select((x) =>
-            {
-                if (request.GtDate.HasValue && x.DateStart < request.GtDate.Value)
-                {
-                    x.DepthStart = GetDepth(request.GtDate.Value, x);
-                    x.DateStart = request.GtDate.Value;
-                }
-                if (request.LtDate.HasValue && x.DateEnd > request.LtDate.Value)
-                {
-                    x.DepthEnd = GetDepth(request.LtDate.Value, x);
-                    x.DateEnd = request.LtDate.Value;
-                }
-
-                if (request.GtDepth.HasValue && x.DepthStart < request.GtDepth.Value)
-                {
-                    x.DateStart = GetDate(request.GtDepth.Value, x);
-                    x.DepthStart = (float)request.GtDepth.Value;
-                }
-                if (request.LtDepth.HasValue && x.DepthEnd > request.LtDepth.Value)
-                {
-                    x.DateEnd = GetDate(request.LtDepth.Value, x);
-                    x.DepthEnd = (float)request.LtDepth.Value;
-                }
-                return x;
-            });
-            return result;
-        }
-
-        private float GetDepth(DateTimeOffset date, LimitingParameterDataDto dto)
-        {
-            var a = (date - dto.DateStart).TotalSeconds;
-            var b = (dto.DateEnd - dto.DateStart).TotalSeconds;
-            var c = dto.DepthEnd - dto.DepthStart;
-            var result = dto.DepthStart + (a / b) * c;
-            return (float)result;
-        }
-
-        private DateTimeOffset GetDate(double depth, LimitingParameterDataDto dto)
-        {
-            var a = depth - dto.DepthStart;
-            var b = dto.DepthEnd - dto.DepthStart;
-            var c = (dto.DateEnd - dto.DateStart);
-            var result = dto.DateStart + (a / b) * c;
-            return result;
-        }
+    public LimitingParameterService(ILimitingParameterRepository limitingParameterRepository,
+        IWellService wellService)
+    {
+        this.limitingParameterRepository = limitingParameterRepository;
+        this.wellService = wellService;
     }
 
+    public async Task<IEnumerable<LimitingParameterDto>> GetStatAsync(LimitingParameterRequest request, CancellationToken token)
+    {
+        var well = await wellService.GetOrDefaultAsync(request.IdWell, token);
+        if (well?.IdTelemetry is null || well.Timezone is null)
+            return Enumerable.Empty<LimitingParameterDto>();
+
+        var data = (await limitingParameterRepository.GetLimitingParametersAsync(request, well, token))
+            .GroupBy(x => x.IdFeedRegulator);
+
+        List<LimitingParameterDto> result = new List<LimitingParameterDto>(data.Count());
+        foreach (var item in data)
+        {
+            var trimData = TrimLimitingParameters(item, request).ToArray();
+            
+            var allItemDepths = trimData.Sum(x => x.DepthEnd - x.DepthStart);
+            var allItemDates = trimData.Sum(x => (x.DateEnd - x.DateStart).TotalMinutes);
+
+            result.Add(new LimitingParameterDto
+            {
+                IdWell = well.Id,
+                IdFeedRegulator = item.Key,
+                Depth = allItemDepths,
+                TotalMinutes = (float)allItemDates,
+                NumberInclusions = item.Count(),
+                NameFeedRegulator = feedRegulatorData.GetValueOrDefault(item.Key) ?? $"Id: {item.Key}"
+            });
+        }
+
+        return result;
+    }
+
+    public Dictionary<int, string> GetLimitingParameteraNames() //TODO: Перенести получение ограничений в репозиторий
+    {
+        return feedRegulatorData;
+    }
+
+    private IEnumerable<LimitingParameterDataDto> TrimLimitingParameters(IEnumerable<LimitingParameterDataDto> data, LimitingParameterRequest request)
+    {
+        var result = data.Select((x) =>
+        {
+            if (request.GtDate.HasValue && x.DateStart < request.GtDate.Value)
+            {
+                x.DepthStart = GetDepth(request.GtDate.Value, x);
+                x.DateStart = request.GtDate.Value;
+            }
+            if (request.LtDate.HasValue && x.DateEnd > request.LtDate.Value)
+            {
+                x.DepthEnd = GetDepth(request.LtDate.Value, x);
+                x.DateEnd = request.LtDate.Value;
+            }
+
+            if (request.GtDepth.HasValue && x.DepthStart < request.GtDepth.Value)
+            {
+                x.DateStart = GetDate(request.GtDepth.Value, x);
+                x.DepthStart = (float)request.GtDepth.Value;
+            }
+            if (request.LtDepth.HasValue && x.DepthEnd > request.LtDepth.Value)
+            {
+                x.DateEnd = GetDate(request.LtDepth.Value, x);
+                x.DepthEnd = (float)request.LtDepth.Value;
+            }
+            return x;
+        });
+        return result;
+    }
+
+    private float GetDepth(DateTimeOffset date, LimitingParameterDataDto dto)
+    {
+        var a = (date - dto.DateStart).TotalSeconds;
+        var b = (dto.DateEnd - dto.DateStart).TotalSeconds;
+        var c = dto.DepthEnd - dto.DepthStart;
+        var result = dto.DepthStart + (a / b) * c;
+        return (float)result;
+    }
+
+    private DateTimeOffset GetDate(double depth, LimitingParameterDataDto dto)
+    {
+        var a = depth - dto.DepthStart;
+        var b = dto.DepthEnd - dto.DepthStart;
+        var c = (dto.DateEnd - dto.DateStart);
+        var result = dto.DateStart + (a / b) * c;
+        return result;
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/MeasureService.cs b/AsbCloudInfrastructure/Services/MeasureService.cs
index 5413390d..063b51ea 100644
--- a/AsbCloudInfrastructure/Services/MeasureService.cs
+++ b/AsbCloudInfrastructure/Services/MeasureService.cs
@@ -11,145 +11,143 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services
+namespace AsbCloudInfrastructure.Services;
+
+
+public class MeasureService : IMeasureService
 {
+    private readonly IAsbCloudDbContext db;
+    private readonly IMemoryCache memoryCache;
+    private readonly IWellService wellService;
+    private static readonly TimeSpan CacheOlescence = TimeSpan.FromMinutes(20);
 
-    public class MeasureService : IMeasureService
+    public MeasureService(IAsbCloudDbContext db, IMemoryCache memoryCache, IWellService wellService)
     {
-        private readonly IAsbCloudDbContext db;
-        private readonly IMemoryCache memoryCache;
-        private readonly IWellService wellService;
-        private static readonly TimeSpan CacheOlescence = TimeSpan.FromMinutes(20);
-
-        public MeasureService(IAsbCloudDbContext db, IMemoryCache memoryCache, IWellService wellService)
-        {
-            this.db = db;
-            this.memoryCache = memoryCache;
-            this.wellService = wellService;
-        }
-
-        public async Task<Dictionary<int, string>> GetCategoriesAsync(CancellationToken token)
-        {
-            var key = typeof(MeasureCategory).FullName;
-            var cache = await memoryCache.GetOrCreateAsync(key, async (cacheEntry) => {
-                cacheEntry.AbsoluteExpirationRelativeToNow = CacheOlescence;
-                cacheEntry.SlidingExpiration = CacheOlescence;
-                var entities = await db.Set<MeasureCategory>()
-                    .ToDictionaryAsync(e => e.Id, e => e.Name, token);
-                return entities;
-            });
-            return cache!;
-        }
-
-        public async Task<MeasureDto?> GetLastOrDefaultAsync(int idWell, int idCategory, CancellationToken token)
-        {
-            var query = db.Measures
-                .Include(m => m.Category)
-                .Where(m => m.IdWell == idWell && m.IdCategory == idCategory && !m.IsDeleted)
-                .OrderByDescending(m => m.Timestamp)
-                .Take(1);
-
-            var entity = await query
-                .AsNoTracking()
-                .FirstOrDefaultAsync(token)
-                .ConfigureAwait(false);
-
-            var timezone = wellService.GetTimezone(idWell);
-
-            if (entity is null)
-                return null;
-
-            return Convert(entity, timezone.Hours);
-        }
-
-        public async Task<IEnumerable<MeasureDto>> GetHisoryAsync(int idWell, int? idCategory = null, CancellationToken token = default)
-        {
-            var query = db.Measures.Include(m => m.Category)
-                .Where(m => m.IdWell == idWell && !m.IsDeleted);
-
-            if (idCategory is not null)
-                query = query.Where(m => m.IdCategory == idCategory);
-
-            var entities = await query
-                .OrderBy(m => m.Timestamp)
-                .AsNoTracking()
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-
-            var timezone = wellService.GetTimezone(idWell);
-            var dtos = entities.Select(e => Convert(e, timezone.Hours));
-            return dtos;
-        }
-
-        public Task<int> InsertAsync(int idWell, MeasureDto dto, CancellationToken token)
-        {
-            if (dto.IdCategory < 1)
-                throw new ArgumentInvalidException(nameof(dto), "wrong idCategory");
-            if (!dto.Data.Any())
-                throw new ArgumentInvalidException(nameof(dto), "data.data is not optional");
-            var entity = Convert(dto);
-            entity.IdWell = idWell;
-            db.Measures.Add(entity);
-            return db.SaveChangesAsync(token);
-        }
-
-        public async Task<int> UpdateAsync(int idWell, MeasureDto dto, CancellationToken token)
-        {
-            if (dto.Id < 1)
-                throw new ArgumentInvalidException(nameof(dto), "wrong id");
-            if (dto.IdCategory < 1)
-                throw new ArgumentInvalidException(nameof(dto), "wrong idCategory");
-            if (!dto.Data.Any())
-                throw new ArgumentInvalidException(nameof(dto), "data.data is not optional");
-
-            var entity = await db.Measures
-                .Where(m => m.Id == dto.Id && !m.IsDeleted)
-                .FirstOrDefaultAsync(token)
-                ?? throw new ArgumentInvalidException(nameof(dto), "id doesn't exist");
-
-            var timezone = wellService.GetTimezone(idWell);
-            entity.IdWell = idWell;
-            entity.Timestamp = dto.Timestamp.ToOffset(TimeSpan.FromHours(timezone.Hours));
-            entity.Data = dto.Data.Adapt<RawData>();
-
-            return await db.SaveChangesAsync(token).ConfigureAwait(false);
-        }
-
-        public async Task<int> MarkAsDeleteAsync(int idWell, int idData, CancellationToken token)
-        {
-            if (idData < 1)
-                throw new ArgumentInvalidException(nameof(idData), "wrong id");
-
-            var entity = await db.Measures.Where(m => m.IdWell == idWell && m.Id == idData)
-                .FirstOrDefaultAsync(token)
-                ?? throw new ArgumentInvalidException(nameof(idWell), $"Measure doesn't exist");
-
-            entity.IsDeleted = true;
-
-            return await db.SaveChangesAsync(token).ConfigureAwait(false);
-        }
-
-        public Task<int> DeleteAsync(int idWell, int idData, CancellationToken token)
-        {
-            if (idData < 1)
-                throw new ArgumentInvalidException(nameof(idData), "wrong id");
-            db.Measures.RemoveRange(db.Measures.Where(m => m.IdWell == idWell && m.Id == idData));
-            return db.SaveChangesAsync(token);
-        }
-
-        private MeasureDto Convert(Measure entity, double hours)
-        {
-            var dto = entity.Adapt<MeasureDto>();
-            dto.CategoryName = entity.Category?.Name ?? String.Empty;
-            dto.Timestamp = entity.Timestamp.ToOffset(TimeSpan.FromHours(hours));
-            return dto;
-        }
-        private Measure Convert(MeasureDto dto)
-        {
-            var entity = dto.Adapt<Measure>();
-            entity.Timestamp = dto.Timestamp.ToUniversalTime();
-            return entity;
-        }
+        this.db = db;
+        this.memoryCache = memoryCache;
+        this.wellService = wellService;
     }
 
+    public async Task<Dictionary<int, string>> GetCategoriesAsync(CancellationToken token)
+    {
+        var key = typeof(MeasureCategory).FullName;
+        var cache = await memoryCache.GetOrCreateAsync(key, async (cacheEntry) => {
+            cacheEntry.AbsoluteExpirationRelativeToNow = CacheOlescence;
+            cacheEntry.SlidingExpiration = CacheOlescence;
+            var entities = await db.Set<MeasureCategory>()
+                .ToDictionaryAsync(e => e.Id, e => e.Name, token);
+            return entities;
+        });
+        return cache!;
+    }
+
+    public async Task<MeasureDto?> GetLastOrDefaultAsync(int idWell, int idCategory, CancellationToken token)
+    {
+        var query = db.Measures
+            .Include(m => m.Category)
+            .Where(m => m.IdWell == idWell && m.IdCategory == idCategory && !m.IsDeleted)
+            .OrderByDescending(m => m.Timestamp)
+            .Take(1);
+
+        var entity = await query
+            .AsNoTracking()
+            .FirstOrDefaultAsync(token)
+            .ConfigureAwait(false);
+
+        var timezone = wellService.GetTimezone(idWell);
+
+        if (entity is null)
+            return null;
+
+        return Convert(entity, timezone.Hours);
+    }
+
+    public async Task<IEnumerable<MeasureDto>> GetHisoryAsync(int idWell, int? idCategory = null, CancellationToken token = default)
+    {
+        var query = db.Measures.Include(m => m.Category)
+            .Where(m => m.IdWell == idWell && !m.IsDeleted);
+
+        if (idCategory is not null)
+            query = query.Where(m => m.IdCategory == idCategory);
+
+        var entities = await query
+            .OrderBy(m => m.Timestamp)
+            .AsNoTracking()
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+
+        var timezone = wellService.GetTimezone(idWell);
+        var dtos = entities.Select(e => Convert(e, timezone.Hours));
+        return dtos;
+    }
+
+    public Task<int> InsertAsync(int idWell, MeasureDto dto, CancellationToken token)
+    {
+        if (dto.IdCategory < 1)
+            throw new ArgumentInvalidException(nameof(dto), "wrong idCategory");
+        if (!dto.Data.Any())
+            throw new ArgumentInvalidException(nameof(dto), "data.data is not optional");
+        var entity = Convert(dto);
+        entity.IdWell = idWell;
+        db.Measures.Add(entity);
+        return db.SaveChangesAsync(token);
+    }
+
+    public async Task<int> UpdateAsync(int idWell, MeasureDto dto, CancellationToken token)
+    {
+        if (dto.Id < 1)
+            throw new ArgumentInvalidException(nameof(dto), "wrong id");
+        if (dto.IdCategory < 1)
+            throw new ArgumentInvalidException(nameof(dto), "wrong idCategory");
+        if (!dto.Data.Any())
+            throw new ArgumentInvalidException(nameof(dto), "data.data is not optional");
+
+        var entity = await db.Measures
+            .Where(m => m.Id == dto.Id && !m.IsDeleted)
+            .FirstOrDefaultAsync(token)
+            ?? throw new ArgumentInvalidException(nameof(dto), "id doesn't exist");
+
+        var timezone = wellService.GetTimezone(idWell);
+        entity.IdWell = idWell;
+        entity.Timestamp = dto.Timestamp.ToOffset(TimeSpan.FromHours(timezone.Hours));
+        entity.Data = dto.Data.Adapt<RawData>();
+
+        return await db.SaveChangesAsync(token).ConfigureAwait(false);
+    }
+
+    public async Task<int> MarkAsDeleteAsync(int idWell, int idData, CancellationToken token)
+    {
+        if (idData < 1)
+            throw new ArgumentInvalidException(nameof(idData), "wrong id");
+
+        var entity = await db.Measures.Where(m => m.IdWell == idWell && m.Id == idData)
+            .FirstOrDefaultAsync(token)
+            ?? throw new ArgumentInvalidException(nameof(idWell), $"Measure doesn't exist");
+
+        entity.IsDeleted = true;
+
+        return await db.SaveChangesAsync(token).ConfigureAwait(false);
+    }
+
+    public Task<int> DeleteAsync(int idWell, int idData, CancellationToken token)
+    {
+        if (idData < 1)
+            throw new ArgumentInvalidException(nameof(idData), "wrong id");
+        db.Measures.RemoveRange(db.Measures.Where(m => m.IdWell == idWell && m.Id == idData));
+        return db.SaveChangesAsync(token);
+    }
+
+    private MeasureDto Convert(Measure entity, double hours)
+    {
+        var dto = entity.Adapt<MeasureDto>();
+        dto.CategoryName = entity.Category?.Name ?? String.Empty;
+        dto.Timestamp = entity.Timestamp.ToOffset(TimeSpan.FromHours(hours));
+        return dto;
+    }
+    private Measure Convert(MeasureDto dto)
+    {
+        var entity = dto.Adapt<Measure>();
+        entity.Timestamp = dto.Timestamp.ToUniversalTime();
+        return entity;
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/ReduceSamplingService.cs b/AsbCloudInfrastructure/Services/ReduceSamplingService.cs
index 6db845a5..60de2d26 100644
--- a/AsbCloudInfrastructure/Services/ReduceSamplingService.cs
+++ b/AsbCloudInfrastructure/Services/ReduceSamplingService.cs
@@ -12,326 +12,324 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services
-{
+namespace AsbCloudInfrastructure.Services;
 
-    class JobHandle
+
+class JobHandle
+{
+    public int Id => Job.Id;
+    public JobDto Job { get; set; } = null!;
+    public DateTime DateCreate { get; set; } = DateTime.Now;
+    public OnJobProgressDelagate? OnProgress { get; set; }
+}
+
+public class ReduceSamplingService : IReduceSamplingService
+{
+    private const string jobResultKeyDeleted = "deleted";
+    private const string jobResultKeyTotal = "total";
+    private static ReduceSamplingService? instance;
+    private readonly string connectionString;
+    private const int ratio = 5;
+    private readonly List<JobHandle> jobHandlers = new(5);
+    private bool isHandling;
+    private CancellationTokenSource? cancellationTokenSource;
+    private Task? task;
+
+    private ReduceSamplingService(IConfiguration configuration)
     {
-        public int Id => Job.Id;
-        public JobDto Job { get; set; } = null!;
-        public DateTime DateCreate { get; set; } = DateTime.Now;
-        public OnJobProgressDelagate? OnProgress { get; set; }
+        connectionString = configuration.GetConnectionString("DefaultConnection")
+             ?? throw new ConfigurationErrorsException("DefaultConnection не определен");
     }
 
-    public class ReduceSamplingService : IReduceSamplingService
+    ~ReduceSamplingService()
     {
-        private const string jobResultKeyDeleted = "deleted";
-        private const string jobResultKeyTotal = "total";
-        private static ReduceSamplingService? instance;
-        private readonly string connectionString;
-        private const int ratio = 5;
-        private readonly List<JobHandle> jobHandlers = new(5);
-        private bool isHandling;
-        private CancellationTokenSource? cancellationTokenSource;
-        private Task? task;
+        Stop();
+    }
 
-        private ReduceSamplingService(IConfiguration configuration)
-        {
-            connectionString = configuration.GetConnectionString("DefaultConnection")
-                 ?? throw new ConfigurationErrorsException("DefaultConnection не определен");
-        }
+    /// <summary>
+    /// Get singleton Instance 
+    /// </summary>
+    /// <param name="configuration"></param>
+    /// <returns></returns>
+    public static ReduceSamplingService GetInstance(IConfiguration configuration)
+    {
+        instance ??= new(configuration);
+        return instance;
+    }
 
-        ~ReduceSamplingService()
+    /// <inheritdoc/>
+    public bool TryEnqueueRediceSamplingJob(int idTelemetry, OnJobProgressDelagate? onProgress, out JobDto jobDto)
+    {
+        lock (jobHandlers)
         {
-            Stop();
-        }
-
-        /// <summary>
-        /// Get singleton Instance 
-        /// </summary>
-        /// <param name="configuration"></param>
-        /// <returns></returns>
-        public static ReduceSamplingService GetInstance(IConfiguration configuration)
-        {
-            instance ??= new(configuration);
-            return instance;
-        }
-
-        /// <inheritdoc/>
-        public bool TryEnqueueRediceSamplingJob(int idTelemetry, OnJobProgressDelagate? onProgress, out JobDto jobDto)
-        {
-            lock (jobHandlers)
+            var oldJob = jobHandlers.FirstOrDefault(j => j.Id == idTelemetry);
+            if (oldJob is not null)
             {
-                var oldJob = jobHandlers.FirstOrDefault(j => j.Id == idTelemetry);
-                if (oldJob is not null)
+                jobDto = oldJob.Job;
+                return false;
+            }
+
+            jobDto = new JobDto
+            {
+                Id = idTelemetry,
+                State = JobState.Waiting,
+                Results = new(),
+            };
+            var jobHandler = new JobHandle
+            {
+                Job = jobDto,
+                OnProgress = onProgress,
+            };
+
+            jobHandlers.Add(jobHandler);                
+        }
+        EnsureHandleQueueStarted();
+        return true;
+    }
+
+    /// <inheritdoc/>
+    public JobDto? GetOrDefaultState(int idTelemetry)
+    {
+        JobHandle? jobHandler;
+        lock (jobHandlers)
+        {
+            jobHandler = jobHandlers.FirstOrDefault(j => j.Id == idTelemetry);
+        }
+        return jobHandler?.Job;
+    }
+
+    /// <inheritdoc/>
+    public IEnumerable<JobDto> GetJobs() => jobHandlers.Select(j=>j.Job);
+
+    private bool TryTakeWaitingJob(out JobHandle? job)
+    {
+        lock (jobHandlers)
+        {
+            job = jobHandlers.FirstOrDefault(j => j.Job.State == JobState.Waiting);
+        }
+        return job is not null;
+    }
+
+    private void EnsureHandleQueueStarted()
+    {
+        if (isHandling)
+            return;
+        isHandling = true;
+        cancellationTokenSource = new CancellationTokenSource();
+        var token = cancellationTokenSource.Token;
+        task = Task.Run(async () => await HandleJobs(token))
+            .ContinueWith(_ => isHandling = false);
+    }
+
+    private async Task HandleJobs(CancellationToken token)
+    {
+        while (TryTakeWaitingJob(out JobHandle? jobHandler))
+        {
+            jobHandler!.Job.State = JobState.Working;
+            try
+            {
+                await RediceSamplingSaubAsync(jobHandler, token);
+                await RediceSamplingSpinAsync(jobHandler, token);
+                jobHandler.Job.State = JobState.Done;
+            }
+            catch (Exception exception)
+            {
+                jobHandler.Job.State = JobState.Fail;
+                jobHandler.Job.Results = null;
+                jobHandler.Job.Error = exception.Message;
+                jobHandler.OnProgress?.Invoke(jobHandler.Job);
+            }
+
+            if (!jobHandlers.Any(j => j.Job.State == JobState.Waiting))
+            {
+                var sw = Stopwatch.StartNew();
+                await VacuumAsync(token);
+                sw.Stop();
+                if (sw.ElapsedMilliseconds < 10_000)
                 {
-                    jobDto = oldJob.Job;
-                    return false;
-                }
-
-                jobDto = new JobDto
-                {
-                    Id = idTelemetry,
-                    State = JobState.Waiting,
-                    Results = new(),
-                };
-                var jobHandler = new JobHandle
-                {
-                    Job = jobDto,
-                    OnProgress = onProgress,
-                };
-
-                jobHandlers.Add(jobHandler);                
-            }
-            EnsureHandleQueueStarted();
-            return true;
-        }
-
-        /// <inheritdoc/>
-        public JobDto? GetOrDefaultState(int idTelemetry)
-        {
-            JobHandle? jobHandler;
-            lock (jobHandlers)
-            {
-                jobHandler = jobHandlers.FirstOrDefault(j => j.Id == idTelemetry);
-            }
-            return jobHandler?.Job;
-        }
-
-        /// <inheritdoc/>
-        public IEnumerable<JobDto> GetJobs() => jobHandlers.Select(j=>j.Job);
-
-        private bool TryTakeWaitingJob(out JobHandle? job)
-        {
-            lock (jobHandlers)
-            {
-                job = jobHandlers.FirstOrDefault(j => j.Job.State == JobState.Waiting);
-            }
-            return job is not null;
-        }
-
-        private void EnsureHandleQueueStarted()
-        {
-            if (isHandling)
-                return;
-            isHandling = true;
-            cancellationTokenSource = new CancellationTokenSource();
-            var token = cancellationTokenSource.Token;
-            task = Task.Run(async () => await HandleJobs(token))
-                .ContinueWith(_ => isHandling = false);
-        }
-
-        private async Task HandleJobs(CancellationToken token)
-        {
-            while (TryTakeWaitingJob(out JobHandle? jobHandler))
-            {
-                jobHandler!.Job.State = JobState.Working;
-                try
-                {
-                    await RediceSamplingSaubAsync(jobHandler, token);
-                    await RediceSamplingSpinAsync(jobHandler, token);
-                    jobHandler.Job.State = JobState.Done;
-                }
-                catch (Exception exception)
-                {
-                    jobHandler.Job.State = JobState.Fail;
-                    jobHandler.Job.Results = null;
-                    jobHandler.Job.Error = exception.Message;
-                    jobHandler.OnProgress?.Invoke(jobHandler.Job);
-                }
-
-                if (!jobHandlers.Any(j => j.Job.State == JobState.Waiting))
-                {
-                    var sw = Stopwatch.StartNew();
-                    await VacuumAsync(token);
-                    sw.Stop();
-                    if (sw.ElapsedMilliseconds < 10_000)
-                    {
-                        var delayMs = 10_000 - (int)sw.ElapsedMilliseconds;
-                        await Task.Delay(delayMs, token);
-                    }
-                    CleanJobs();
+                    var delayMs = 10_000 - (int)sw.ElapsedMilliseconds;
+                    await Task.Delay(delayMs, token);
                 }
+                CleanJobs();
             }
         }
+    }
 
-        private void CleanJobs()
+    private void CleanJobs()
+    {
+        lock (jobHandlers)
         {
-            lock (jobHandlers)
-            {
-                jobHandlers.RemoveAll(j => j.Job.State == JobState.Done || j.Job.State == JobState.Fail);
-            }
+            jobHandlers.RemoveAll(j => j.Job.State == JobState.Done || j.Job.State == JobState.Fail);
         }
+    }
 
-        private async Task VacuumAsync(CancellationToken token)
+    private async Task VacuumAsync(CancellationToken token)
+    {
+        using var db = MakeContext();
+        var sqlVacuum = "vacuum (SKIP_LOCKED);";
+        await db.Database.ExecuteSqlRawAsync(sqlVacuum, token);
+    }
+
+    private void Stop()
+    {
+        cancellationTokenSource?.Cancel();
+        task?.Wait(1_000);
+        task = null;
+        cancellationTokenSource?.Dispose();
+        cancellationTokenSource = null;
+    }
+
+    private Task RediceSamplingSaubAsync(JobHandle job, CancellationToken token)
+    {
+        const int ramLimit = 10 * 1024 * 1024;
+        const int dataItemSize = 345; // by profiler
+        const int chankSize = ramLimit / dataItemSize; // ~ 90_000
+        const double maxWellDepthGap = 0.1;
+
+        var maxDateGapSec = ratio;
+
+        var sqlSelectTemplate =
+            "select " +
+            "   * " +
+            "from " +
+            "   (select " +
+            "      *, " +
+            "      rank() over win1 as row_num, " +
+            "      lag(\"date\", 1) over win1 as lag_date, " +
+            "      lag(\"mode\", 1) over win1 as lag_mode, " +
+            "      lag(mse_state, 1) over win1 as lag_mse_state, " +
+            "      lag(well_depth, 1) over win1 as lag_well_depth, " +
+            "      lag(id_feed_regulator, 1) over win1 as lag_id_feed_regulator " +
+            "   from t_telemetry_data_saub " +
+            $"   where id_telemetry = {job.Id} and \"date\" > {{0}}" +
+            "   window win1 as (order by \"date\") " +
+            "   ) as t_1 " +
+            "where " +
+            $"   (row_num % {ratio}) = 0 " +
+            "   or \"mode\" != lag_mode " +
+            $"   or(\"date\" - lag_date) >= interval '{maxDateGapSec} second' " +
+            $"   or well_depth - lag_well_depth > {maxWellDepthGap:#0,0#} " +
+            "   or mse_state != lag_mse_state " +
+            "   or id_feed_regulator != lag_id_feed_regulator " +
+            "order by \"date\" ";
+
+        var sqlDeleteTemplate = "delete " +
+            "from t_telemetry_data_saub " +
+            $"where id_telemetry = {job.Id} and \"date\" between {{0}} and {{1}};";
+
+        return RediceSamplingAsync<TelemetryDataSaub>(
+            job,
+            chankSize,
+            sqlSelectTemplate,
+            sqlDeleteTemplate,
+            token);
+    }
+
+    private Task RediceSamplingSpinAsync(JobHandle job, CancellationToken token)
+    {
+        const int ramLimit = 10 * 1024 * 1024;
+        const int dataItemSize = 345; // by profiler
+        const int chankSize = ramLimit / dataItemSize; // ~ 90_000
+        var maxDateGapSec = ratio;
+
+        var sqlSelectTemplate =
+            "select " +
+            "   * " +
+            "from " +
+            "   (select " +
+            "      *, " +
+            "      rank() over win1 as row_num, " +
+            "      lag(\"date\", 1) over win1 as lag_date, " +
+            "      lag(\"mode\", 1) over win1 as lag_mode, " +
+            "      lag(state, 1) over win1 as lag_state " +
+            "   from t_telemetry_data_spin " +
+            $"   where id_telemetry = {job.Id} and \"date\" > {{0}}" +
+            "   window win1 as (order by \"date\") " +
+            "   ) as t_1 " +
+            "where " +
+            $"   (row_num % {ratio}) = 0 " +
+            "   or \"mode\" != lag_mode " +
+            $"   or(\"date\" - lag_date) >= interval '{maxDateGapSec} second' " +
+            "   or state != lag_state " +
+            "order by \"date\" ";
+
+        var sqlDeleteTemplate = "delete " +
+            "from t_telemetry_data_spin " +
+            $"where id_telemetry = {job.Id} and \"date\" between {{0}} and {{1}};";
+
+        return RediceSamplingAsync<TelemetryDataSpin>(
+            job,
+            chankSize,
+            sqlSelectTemplate,
+            sqlDeleteTemplate,
+            token);
+    }
+
+    private async Task RediceSamplingAsync<TEntity>(
+        JobHandle jobHandle,
+        int chankSize,
+        string sqlSelectTemplate,
+        string sqlDeleteTemplate,
+        CancellationToken token)
+        where TEntity : class, AsbCloudDb.Model.ITelemetryData
+    {
+        using var db = MakeContext();
+        var dbset = db.Set<TEntity>();
+
+        var deleted = 0;
+        var totalCount = await dbset.Where(t => t.IdTelemetry == jobHandle.Id).CountAsync(token);
+
+        var result = jobHandle.Job.Results!;
+        if (result[jobResultKeyDeleted] is int previousDeleted)
+            deleted += previousDeleted;
+
+        if (result[jobResultKeyTotal] is int previousCount)
+            totalCount += previousCount;
+
+        result[jobResultKeyDeleted] = deleted;
+        result[jobResultKeyTotal] = totalCount;
+
+        jobHandle.OnProgress?.Invoke(jobHandle.Job);
+        var startDate = DateTimeOffset.MinValue;
+
+        do
         {
-            using var db = MakeContext();
-            var sqlVacuum = "vacuum (SKIP_LOCKED);";
-            await db.Database.ExecuteSqlRawAsync(sqlVacuum, token);
-        }
+            var query = dbset
+                .FromSqlRaw(sqlSelectTemplate, startDate)
+                .AsNoTracking();
 
-        private void Stop()
-        {
-            cancellationTokenSource?.Cancel();
-            task?.Wait(1_000);
-            task = null;
-            cancellationTokenSource?.Dispose();
-            cancellationTokenSource = null;
-        }
+            var data = await query
+                .Take(chankSize)
+                .ToArrayAsync(token);
 
-        private Task RediceSamplingSaubAsync(JobHandle job, CancellationToken token)
-        {
-            const int ramLimit = 10 * 1024 * 1024;
-            const int dataItemSize = 345; // by profiler
-            const int chankSize = ramLimit / dataItemSize; // ~ 90_000
-            const double maxWellDepthGap = 0.1;
+            var currentDataCount = data.Length;
+            if (currentDataCount == 0)
+                break;
 
-            var maxDateGapSec = ratio;
+            var lastDate = data.Last().DateTime;
 
-            var sqlSelectTemplate =
-                "select " +
-                "   * " +
-                "from " +
-                "   (select " +
-                "      *, " +
-                "      rank() over win1 as row_num, " +
-                "      lag(\"date\", 1) over win1 as lag_date, " +
-                "      lag(\"mode\", 1) over win1 as lag_mode, " +
-                "      lag(mse_state, 1) over win1 as lag_mse_state, " +
-                "      lag(well_depth, 1) over win1 as lag_well_depth, " +
-                "      lag(id_feed_regulator, 1) over win1 as lag_id_feed_regulator " +
-                "   from t_telemetry_data_saub " +
-                $"   where id_telemetry = {job.Id} and \"date\" > {{0}}" +
-                "   window win1 as (order by \"date\") " +
-                "   ) as t_1 " +
-                "where " +
-                $"   (row_num % {ratio}) = 0 " +
-                "   or \"mode\" != lag_mode " +
-                $"   or(\"date\" - lag_date) >= interval '{maxDateGapSec} second' " +
-                $"   or well_depth - lag_well_depth > {maxWellDepthGap:#0,0#} " +
-                "   or mse_state != lag_mse_state " +
-                "   or id_feed_regulator != lag_id_feed_regulator " +
-                "order by \"date\" ";
+            var currentDeleted = await db.Database.ExecuteSqlRawAsync(sqlDeleteTemplate, new object[] { startDate, lastDate }.AsEnumerable(), token);
+            if (currentDeleted == 0)
+                break;
 
-            var sqlDeleteTemplate = "delete " +
-                "from t_telemetry_data_saub " +
-                $"where id_telemetry = {job.Id} and \"date\" between {{0}} and {{1}};";
-
-            return RediceSamplingAsync<TelemetryDataSaub>(
-                job,
-                chankSize,
-                sqlSelectTemplate,
-                sqlDeleteTemplate,
-                token);
-        }
-
-        private Task RediceSamplingSpinAsync(JobHandle job, CancellationToken token)
-        {
-            const int ramLimit = 10 * 1024 * 1024;
-            const int dataItemSize = 345; // by profiler
-            const int chankSize = ramLimit / dataItemSize; // ~ 90_000
-            var maxDateGapSec = ratio;
-
-            var sqlSelectTemplate =
-                "select " +
-                "   * " +
-                "from " +
-                "   (select " +
-                "      *, " +
-                "      rank() over win1 as row_num, " +
-                "      lag(\"date\", 1) over win1 as lag_date, " +
-                "      lag(\"mode\", 1) over win1 as lag_mode, " +
-                "      lag(state, 1) over win1 as lag_state " +
-                "   from t_telemetry_data_spin " +
-                $"   where id_telemetry = {job.Id} and \"date\" > {{0}}" +
-                "   window win1 as (order by \"date\") " +
-                "   ) as t_1 " +
-                "where " +
-                $"   (row_num % {ratio}) = 0 " +
-                "   or \"mode\" != lag_mode " +
-                $"   or(\"date\" - lag_date) >= interval '{maxDateGapSec} second' " +
-                "   or state != lag_state " +
-                "order by \"date\" ";
-
-            var sqlDeleteTemplate = "delete " +
-                "from t_telemetry_data_spin " +
-                $"where id_telemetry = {job.Id} and \"date\" between {{0}} and {{1}};";
-
-            return RediceSamplingAsync<TelemetryDataSpin>(
-                job,
-                chankSize,
-                sqlSelectTemplate,
-                sqlDeleteTemplate,
-                token);
-        }
-
-        private async Task RediceSamplingAsync<TEntity>(
-            JobHandle jobHandle,
-            int chankSize,
-            string sqlSelectTemplate,
-            string sqlDeleteTemplate,
-            CancellationToken token)
-            where TEntity : class, AsbCloudDb.Model.ITelemetryData
-        {
-            using var db = MakeContext();
-            var dbset = db.Set<TEntity>();
-
-            var deleted = 0;
-            var totalCount = await dbset.Where(t => t.IdTelemetry == jobHandle.Id).CountAsync(token);
-
-            var result = jobHandle.Job.Results!;
-            if (result[jobResultKeyDeleted] is int previousDeleted)
-                deleted += previousDeleted;
-
-            if (result[jobResultKeyTotal] is int previousCount)
-                totalCount += previousCount;
+            await db.Database.ExecInsertAsync(dbset, data, token);
 
+            startDate = lastDate;
+            deleted += currentDeleted;
             result[jobResultKeyDeleted] = deleted;
             result[jobResultKeyTotal] = totalCount;
-
             jobHandle.OnProgress?.Invoke(jobHandle.Job);
-            var startDate = DateTimeOffset.MinValue;
+        } while (true);
 
-            do
-            {
-                var query = dbset
-                    .FromSqlRaw(sqlSelectTemplate, startDate)
-                    .AsNoTracking();
-
-                var data = await query
-                    .Take(chankSize)
-                    .ToArrayAsync(token);
-
-                var currentDataCount = data.Length;
-                if (currentDataCount == 0)
-                    break;
-
-                var lastDate = data.Last().DateTime;
-
-                var currentDeleted = await db.Database.ExecuteSqlRawAsync(sqlDeleteTemplate, new object[] { startDate, lastDate }.AsEnumerable(), token);
-                if (currentDeleted == 0)
-                    break;
-
-                await db.Database.ExecInsertAsync(dbset, data, token);
-
-                startDate = lastDate;
-                deleted += currentDeleted;
-                result[jobResultKeyDeleted] = deleted;
-                result[jobResultKeyTotal] = totalCount;
-                jobHandle.OnProgress?.Invoke(jobHandle.Job);
-            } while (true);
-
-            return;
-        }
-
-        private AsbCloudDbContext MakeContext()
-        {
-            var options = new DbContextOptionsBuilder<AsbCloudDbContext>()
-                .UseNpgsql(connectionString)
-                .Options;
-
-            return new AsbCloudDbContext(options);
-        }
+        return;
     }
 
+    private AsbCloudDbContext MakeContext()
+    {
+        var options = new DbContextOptionsBuilder<AsbCloudDbContext>()
+            .UseNpgsql(connectionString)
+            .Options;
+
+        return new AsbCloudDbContext(options);
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/RequestTrackerService.cs b/AsbCloudInfrastructure/Services/RequestTrackerService.cs
index 2a9ad660..783ac259 100644
--- a/AsbCloudInfrastructure/Services/RequestTrackerService.cs
+++ b/AsbCloudInfrastructure/Services/RequestTrackerService.cs
@@ -5,128 +5,126 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AsbCloudInfrastructure.Services
+namespace AsbCloudInfrastructure.Services;
+
+
+public class RequestTrackerService : IRequerstTrackerService
 {
+    const int fastRequestsCount = 1000;
+    const int slowRequestsCount = 1000;
+    const int errorRequestsCount = 1000;
+    const int span = 100;
 
-    public class RequestTrackerService : IRequerstTrackerService
+    const int fastLimitMs = 500;
+    static readonly char[] stackTraceSeparators = "\r\n".ToCharArray();
+    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)
     {
-        const int fastRequestsCount = 1000;
-        const int slowRequestsCount = 1000;
-        const int errorRequestsCount = 1000;
-        const int span = 100;
+        IEnumerable<RequestLogDto> orderedlist = list.OrderByDescending(r => r.Date);
+        if (take > 0)
+            orderedlist = orderedlist.Take(take.Value);
+        return orderedlist;
+    }
 
-        const int fastLimitMs = 500;
-        static readonly char[] stackTraceSeparators = "\r\n".ToCharArray();
-        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>();
+    public IEnumerable<RequestLogUserDto> GetUsersStat(int? take)
+    {
+        IEnumerable<RequestLogUserDto> result = users.Values.OrderByDescending(u => u.LastDate);
+        if (take > 0)
+            result = result.Take(take.Value);
+        return result;
+    }
 
-        private static IEnumerable<RequestLogDto> Get(IEnumerable<RequestLogDto> list, int? take)
+    public IEnumerable<RequestLogDto> GetAll(int? take)
+    {
+        var result = fastRequests
+            .Union(slowRequests)
+            .Union(errorRequests);
+
+        return Get(result, take);
+    }
+
+    public IEnumerable<RequestLogDto> GetFast(int? take)
+        => Get(fastRequests, take);
+
+    public IEnumerable<RequestLogDto> GetSlow(int? take)
+        => Get(slowRequests, take);
+
+    public IEnumerable<RequestLogDto> GetError(int? take)
+        => Get(errorRequests, take);
+
+    public void RegisterRequest(RequestLogDto requestLog)
+    {
+        if (requestLog.Status < 200)
+            return;
+        requestLog.Date = DateTime.Now;
+        if (requestLog.ElapsedMilliseconds > fastLimitMs)
+            RegisterSlowRequest(requestLog);
+        else
+            RegisterFastRequest(requestLog);
+
+        UpdateUserStat(requestLog);
+    }
+
+    private void RegisterFastRequest(RequestLogDto requestLog)
+    {
+        fastRequests.Enqueue(requestLog);
+        if (fastRequests.Count > fastRequestsCount + span)
+            while (fastRequests.Count > fastRequestsCount)
+                fastRequests.TryDequeue(out _);
+    }
+
+    private void RegisterSlowRequest(RequestLogDto requestLog)
+    {
+        slowRequests.Enqueue(requestLog);
+        if (slowRequests.Count > slowRequestsCount + span)
+            while (slowRequests.Count > slowRequestsCount)
+                slowRequests.TryDequeue(out _);
+    }
+
+    public void RegisterRequestError(RequestLogDto requestLog, Exception ex)
+    {
+        requestLog.Date = DateTime.Now;
+        requestLog.ExceptionMessage = ex.InnerException?.InnerException?.Message
+            ?? ex.InnerException?.Message
+            ?? ex.Message;
+        requestLog.ExceptionStack = ex.StackTrace?.Split(stackTraceSeparators)[0];
+        errorRequests.Enqueue(requestLog);
+        if (errorRequests.Count > errorRequestsCount + span)
+            while (errorRequests.Count > errorRequestsCount)
+                errorRequests.TryDequeue(out _);
+
+        UpdateUserStat(requestLog);
+    }
+
+    private void UpdateUserStat(RequestLogDto requestLog)
+    {
+        if (!string.IsNullOrEmpty(requestLog.UserLogin))
         {
-            IEnumerable<RequestLogDto> orderedlist = list.OrderByDescending(r => r.Date);
-            if (take > 0)
-                orderedlist = orderedlist.Take(take.Value);
-            return orderedlist;
-        }
-
-        public IEnumerable<RequestLogUserDto> GetUsersStat(int? take)
-        {
-            IEnumerable<RequestLogUserDto> result = users.Values.OrderByDescending(u => u.LastDate);
-            if (take > 0)
-                result = result.Take(take.Value);
-            return result;
-        }
-
-        public IEnumerable<RequestLogDto> GetAll(int? take)
-        {
-            var result = fastRequests
-                .Union(slowRequests)
-                .Union(errorRequests);
-
-            return Get(result, take);
-        }
-
-        public IEnumerable<RequestLogDto> GetFast(int? take)
-            => Get(fastRequests, take);
-
-        public IEnumerable<RequestLogDto> GetSlow(int? take)
-            => Get(slowRequests, take);
-
-        public IEnumerable<RequestLogDto> GetError(int? take)
-            => Get(errorRequests, take);
-
-        public void RegisterRequest(RequestLogDto requestLog)
-        {
-            if (requestLog.Status < 200)
-                return;
-            requestLog.Date = DateTime.Now;
-            if (requestLog.ElapsedMilliseconds > fastLimitMs)
-                RegisterSlowRequest(requestLog);
-            else
-                RegisterFastRequest(requestLog);
-
-            UpdateUserStat(requestLog);
-        }
-
-        private void RegisterFastRequest(RequestLogDto requestLog)
-        {
-            fastRequests.Enqueue(requestLog);
-            if (fastRequests.Count > fastRequestsCount + span)
-                while (fastRequests.Count > fastRequestsCount)
-                    fastRequests.TryDequeue(out _);
-        }
-
-        private void RegisterSlowRequest(RequestLogDto requestLog)
-        {
-            slowRequests.Enqueue(requestLog);
-            if (slowRequests.Count > slowRequestsCount + span)
-                while (slowRequests.Count > slowRequestsCount)
-                    slowRequests.TryDequeue(out _);
-        }
-
-        public void RegisterRequestError(RequestLogDto requestLog, Exception ex)
-        {
-            requestLog.Date = DateTime.Now;
-            requestLog.ExceptionMessage = ex.InnerException?.InnerException?.Message
-                ?? ex.InnerException?.Message
-                ?? ex.Message;
-            requestLog.ExceptionStack = ex.StackTrace?.Split(stackTraceSeparators)[0];
-            errorRequests.Enqueue(requestLog);
-            if (errorRequests.Count > errorRequestsCount + span)
-                while (errorRequests.Count > errorRequestsCount)
-                    errorRequests.TryDequeue(out _);
-
-            UpdateUserStat(requestLog);
-        }
-
-        private void UpdateUserStat(RequestLogDto requestLog)
-        {
-            if (!string.IsNullOrEmpty(requestLog.UserLogin))
-            {
-                var key = $"{requestLog.UserId}>{requestLog.UserIp}";
-                if (!users.ContainsKey(key))
-                    users[key] = new RequestLogUserDto
-                    {
-                        UserId = requestLog.UserId,
-                        Ip = requestLog.UserIp,
-                        Login = requestLog.UserLogin,
-                    };
-                users[key].ElapsedMs += requestLog.ElapsedMilliseconds;
-                users[key].LastDate = requestLog.Date;
-                users[key].Requests++;
-                if (!string.IsNullOrEmpty(requestLog.ExceptionMessage))
-                    users[key].Errors++;
-
-                if (users.Count > 1000)
+            var key = $"{requestLog.UserId}>{requestLog.UserIp}";
+            if (!users.ContainsKey(key))
+                users[key] = new RequestLogUserDto
                 {
-                    var count = 900 - users.Count;
-                    var toRemove = users.OrderBy(kv => kv.Value.LastDate).Take(count);
-                    foreach (var kv in toRemove)
-                        users.TryRemove(kv);
-                }
+                    UserId = requestLog.UserId,
+                    Ip = requestLog.UserIp,
+                    Login = requestLog.UserLogin,
+                };
+            users[key].ElapsedMs += requestLog.ElapsedMilliseconds;
+            users[key].LastDate = requestLog.Date;
+            users[key].Requests++;
+            if (!string.IsNullOrEmpty(requestLog.ExceptionMessage))
+                users[key].Errors++;
+
+            if (users.Count > 1000)
+            {
+                var count = 900 - users.Count;
+                var toRemove = users.OrderBy(kv => kv.Value.LastDate).Take(count);
+                foreach (var kv in toRemove)
+                    users.TryRemove(kv);
             }
         }
     }
-
 }
diff --git a/AsbCloudInfrastructure/Services/SAUB/CsvSerializer.cs b/AsbCloudInfrastructure/Services/SAUB/CsvSerializer.cs
index 71091099..cc92f6bc 100644
--- a/AsbCloudInfrastructure/Services/SAUB/CsvSerializer.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/CsvSerializer.cs
@@ -4,81 +4,79 @@ using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
 
-namespace System.Text.Csv
+namespace System.Text.Csv;
+
+
+public class CsvSerializer<T>
 {
+    private readonly PropertyInfo[] props;
+    private readonly static Regex numbers = new Regex(@"^[0-9\-\+\.]+$");
 
-    public class CsvSerializer<T>
+    public string Separator { get; set; } = ";";
+    public string NewLine { get; set; } = "\r\n";
+    public string Quot { get; set; } = "\"";
+    public Encoding Encoding { get; set; } = Encoding.UTF8;
+    public string FloatingPointFormat { get; set; } = "#0.000#";
+    public string DateTimeFormat { get; set; } = "yyyy-MM-dd HH:mm:ss";
+    public string objDateTimeOffsetFormat { get; set; } = "yyyy-MM-dd HH:mm:ss zzz";
+    public string TimeOnlyFormat { get; set; } = "HH:mm:ss";
+    public string DateOnlyFormat { get; set; } = "yyyy-MM-dd";
+
+    public CsvSerializer()
     {
-        private readonly PropertyInfo[] props;
-        private readonly static Regex numbers = new Regex(@"^[0-9\-\+\.]+$");
-
-        public string Separator { get; set; } = ";";
-        public string NewLine { get; set; } = "\r\n";
-        public string Quot { get; set; } = "\"";
-        public Encoding Encoding { get; set; } = Encoding.UTF8;
-        public string FloatingPointFormat { get; set; } = "#0.000#";
-        public string DateTimeFormat { get; set; } = "yyyy-MM-dd HH:mm:ss";
-        public string objDateTimeOffsetFormat { get; set; } = "yyyy-MM-dd HH:mm:ss zzz";
-        public string TimeOnlyFormat { get; set; } = "HH:mm:ss";
-        public string DateOnlyFormat { get; set; } = "yyyy-MM-dd";
-
-        public CsvSerializer()
-        {
-            props = typeof(T).GetProperties();
-        }
-
-        public void Serialize(IEnumerable<T> data, Stream toStream)
-        {
-            if (!data.Any())
-                return;
-
-            if(!props.Any())
-                return;
-
-            void HandleRow(IEnumerable<object?> rowData)
-            {
-                var row = string.Join(Separator, rowData);
-                var bytes = Encoding.GetBytes(row + NewLine);
-                toStream.Write(bytes);
-            }
-
-
-            HandleRow(props.Select(p => p.Name));
-
-            foreach ( var item in data)
-                HandleRow(props.Select(p => CsvSerializer<T>.Escape(Fromat(p.GetValue(item)))));
-        }
-
-        private string Fromat(object? obj)
-        {
-            if (obj is double objDouble)
-                return objDouble.ToString(FloatingPointFormat);
-
-            if (obj is float objfloat)
-                return objfloat.ToString(FloatingPointFormat);
-
-            if (obj is DateTime objDateTime)
-                return objDateTime.ToString(DateTimeFormat);
-
-            if (obj is DateTimeOffset objDateTimeOffset)
-                return objDateTimeOffset.ToString(objDateTimeOffsetFormat);
-
-            if (obj is DateOnly objDateOnly)
-                return objDateOnly.ToString(DateOnlyFormat);
-
-            if (obj is TimeOnly objTimeOnly)
-                return objTimeOnly.ToString(TimeOnlyFormat);
-
-            return obj?.ToString() ?? string.Empty;
-        }
-
-        private static string Escape(string inString)
-        {
-            if (numbers.IsMatch(inString))
-                return inString;
-
-            return $"\"{inString}\"";
-        }
+        props = typeof(T).GetProperties();
     }
 
+    public void Serialize(IEnumerable<T> data, Stream toStream)
+    {
+        if (!data.Any())
+            return;
+
+        if(!props.Any())
+            return;
+
+        void HandleRow(IEnumerable<object?> rowData)
+        {
+            var row = string.Join(Separator, rowData);
+            var bytes = Encoding.GetBytes(row + NewLine);
+            toStream.Write(bytes);
+        }
+
+
+        HandleRow(props.Select(p => p.Name));
+
+        foreach ( var item in data)
+            HandleRow(props.Select(p => CsvSerializer<T>.Escape(Fromat(p.GetValue(item)))));
+    }
+
+    private string Fromat(object? obj)
+    {
+        if (obj is double objDouble)
+            return objDouble.ToString(FloatingPointFormat);
+
+        if (obj is float objfloat)
+            return objfloat.ToString(FloatingPointFormat);
+
+        if (obj is DateTime objDateTime)
+            return objDateTime.ToString(DateTimeFormat);
+
+        if (obj is DateTimeOffset objDateTimeOffset)
+            return objDateTimeOffset.ToString(objDateTimeOffsetFormat);
+
+        if (obj is DateOnly objDateOnly)
+            return objDateOnly.ToString(DateOnlyFormat);
+
+        if (obj is TimeOnly objTimeOnly)
+            return objTimeOnly.ToString(TimeOnlyFormat);
+
+        return obj?.ToString() ?? string.Empty;
+    }
+
+    private static string Escape(string inString)
+    {
+        if (numbers.IsMatch(inString))
+            return inString;
+
+        return $"\"{inString}\"";
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/SAUB/EventService.cs b/AsbCloudInfrastructure/Services/SAUB/EventService.cs
index c01b92c9..d33dc502 100644
--- a/AsbCloudInfrastructure/Services/SAUB/EventService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/EventService.cs
@@ -8,39 +8,38 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services.SAUB
+namespace AsbCloudInfrastructure.Services.SAUB;
+
+
+public class EventService : IEventService
 {
+    private readonly IAsbCloudDbContext db;
+    private readonly IMemoryCache memoryCache;
+    private readonly ITelemetryService telemetryService;
 
-    public class EventService : IEventService
+    public EventService(IAsbCloudDbContext db, IMemoryCache memoryCache, ITelemetryService telemetryService)
     {
-        private readonly IAsbCloudDbContext db;
-        private readonly IMemoryCache memoryCache;
-        private readonly ITelemetryService telemetryService;
+        this.db = db;
+        this.memoryCache = memoryCache;
+        this.telemetryService = telemetryService;
+    }
 
-        public EventService(IAsbCloudDbContext db, IMemoryCache memoryCache, ITelemetryService telemetryService)
+    public async Task UpsertAsync(string uid, IEnumerable<EventDto> dtos,
+        CancellationToken token = default)
+    {
+        if (!dtos.Any())
+            return;
+
+        var telemetry = telemetryService.GetOrCreateTelemetryByUid(uid);
+
+        var entities = dtos.Select(dto => new TelemetryEvent
         {
-            this.db = db;
-            this.memoryCache = memoryCache;
-            this.telemetryService = telemetryService;
-        }
-
-        public async Task UpsertAsync(string uid, IEnumerable<EventDto> dtos,
-            CancellationToken token = default)
-        {
-            if (!dtos.Any())
-                return;
-
-            var telemetry = telemetryService.GetOrCreateTelemetryByUid(uid);
-
-            var entities = dtos.Select(dto => new TelemetryEvent
-            {
-                IdEvent = dto.Id,
-                IdTelemetry = telemetry.Id,
-                IdCategory = dto.IdCategory,
-                MessageTemplate = dto.Message
-            });
-            var result = await db.Database.ExecInsertOrUpdateAsync(db.TelemetryEvents, entities, token);
-            memoryCache.DropBasic<TelemetryEvent>();
-        }
+            IdEvent = dto.Id,
+            IdTelemetry = telemetry.Id,
+            IdCategory = dto.IdCategory,
+            MessageTemplate = dto.Message
+        });
+        var result = await db.Database.ExecInsertOrUpdateAsync(db.TelemetryEvents, entities, token);
+        memoryCache.DropBasic<TelemetryEvent>();
     }
 }
diff --git a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs
index e19e6a54..5d6555bc 100644
--- a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs
@@ -14,173 +14,172 @@ using System.Threading;
 using System.Threading.Tasks;
 
 
-namespace AsbCloudInfrastructure.Services.SAUB
-{
-    public class MessageService : IMessageService
-    {
-        private readonly IAsbCloudDbContext db;
-        private readonly IMemoryCache memoryCache;
-        private readonly ITelemetryService telemetryService;
+namespace AsbCloudInfrastructure.Services.SAUB;
 
-        public MessageService(IAsbCloudDbContext db, IMemoryCache memoryCache, ITelemetryService telemetryService)
+public class MessageService : IMessageService
+{
+    private readonly IAsbCloudDbContext db;
+    private readonly IMemoryCache memoryCache;
+    private readonly ITelemetryService telemetryService;
+
+    public MessageService(IAsbCloudDbContext db, IMemoryCache memoryCache, ITelemetryService telemetryService)
+    {
+        this.db = db;
+        this.memoryCache = memoryCache;
+        this.telemetryService = telemetryService;
+    }
+
+    public async Task<PaginationContainer<MessageDto>> GetMessagesAsync(MessageRequest request, CancellationToken token)
+    {
+        var result = new PaginationContainer<MessageDto>
         {
-            this.db = db;
-            this.memoryCache = memoryCache;
-            this.telemetryService = telemetryService;
+            Skip = request.Skip ?? 0,
+            Take = request.Take ?? 32,
+        };
+
+        var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(request.IdWell);
+        if (telemetry is null)
+            return result;
+
+        var allEvents = await memoryCache.GetOrCreateBasicAsync(db.Set<TelemetryEvent>(), token);
+        var events = allEvents.Where(e => e.IdTelemetry == telemetry.Id);
+
+        if (!events.Any())
+            return result;
+
+        var query = db.TelemetryMessages.Where(m => m.IdTelemetry == telemetry.Id)
+            .OrderBy(m => m.DateTime).AsNoTracking();
+
+        if (request.Categoryids?.Any() == true || !string.IsNullOrEmpty(request.SearchString))
+        {
+            if (!string.IsNullOrEmpty(request.SearchString))
+                events = events.Where(e => e.MessageTemplate.Contains(request.SearchString, StringComparison.OrdinalIgnoreCase));
+
+            if (request.Categoryids?.Any() == true)
+                events = events.Where(e => request.Categoryids.ToList().Contains(e.IdCategory));
+
+            var eventIds = events.Select(e => e.IdEvent);
+
+            if (!eventIds.Any())
+                return result;
+
+            query = query.Where(m => eventIds.Contains(m.IdEvent));
         }
 
-        public async Task<PaginationContainer<MessageDto>> GetMessagesAsync(MessageRequest request, CancellationToken token)
+        query = query.OrderByDescending(m => m.DateTime);
+
+        if (request.Begin is not null)
         {
-            var result = new PaginationContainer<MessageDto>
+            var beginUtc = request.Begin.Value.ToUniversalTime();
+            query = query.Where(m => m.DateTime >= beginUtc);
+        }
+
+        if (request.End is not null)
+        {
+            var endUtc = request.End.Value.ToUniversalTime();
+            query = query.Where(m => m.DateTime <= endUtc);
+        }
+
+        result.Count = query.Count();
+
+        if (request.SortFields?.Any() == true)
+        {
+            query = query.SortBy(request.SortFields);
+        }
+        var messagesList = await query.Skip(result.Skip)
+                .Take(result.Take).AsNoTracking()
+                .ToListAsync(token).ConfigureAwait(false);
+
+        if (messagesList.Count == 0)
+            return result;
+
+        var allUsers = await memoryCache.GetOrCreateBasicAsync(db.Set<TelemetryUser>(), token);
+        var users = allUsers.Where(u => u.IdTelemetry == telemetry.Id);
+
+        var eventsDict = events.ToDictionary(x => x.IdEvent, x => x);
+        var usersDict = users.ToDictionary(x => x.IdUser, x => x);
+
+        var messagesDtoList = new List<MessageDto>();
+        var timezone = telemetryService.GetTimezone(telemetry.Id);
+
+        foreach (var message in messagesList)
+        {
+            var messageDto = new MessageDto
             {
-                Skip = request.Skip ?? 0,
-                Take = request.Take ?? 32,
+                Id = message.Id,
+                WellDepth = message.WellDepth
             };
 
-            var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(request.IdWell);
-            if (telemetry is null)
-                return result;
+            messageDto.DateTime = message.DateTime.ToOffset(TimeSpan.FromHours(timezone.Hours));
 
-            var allEvents = await memoryCache.GetOrCreateBasicAsync(db.Set<TelemetryEvent>(), token);
-            var events = allEvents.Where(e => e.IdTelemetry == telemetry.Id);
-
-            if (!events.Any())
-                return result;
-
-            var query = db.TelemetryMessages.Where(m => m.IdTelemetry == telemetry.Id)
-                .OrderBy(m => m.DateTime).AsNoTracking();
-
-            if (request.Categoryids?.Any() == true || !string.IsNullOrEmpty(request.SearchString))
+            if (message.IdTelemetryUser is not null)
             {
-                if (!string.IsNullOrEmpty(request.SearchString))
-                    events = events.Where(e => e.MessageTemplate.Contains(request.SearchString, StringComparison.OrdinalIgnoreCase));
-
-                if (request.Categoryids?.Any() == true)
-                    events = events.Where(e => request.Categoryids.ToList().Contains(e.IdCategory));
-
-                var eventIds = events.Select(e => e.IdEvent);
-
-                if (!eventIds.Any())
-                    return result;
-
-                query = query.Where(m => eventIds.Contains(m.IdEvent));
-            }
-
-            query = query.OrderByDescending(m => m.DateTime);
-
-            if (request.Begin is not null)
-            {
-                var beginUtc = request.Begin.Value.ToUniversalTime();
-                query = query.Where(m => m.DateTime >= beginUtc);
-            }
-
-            if (request.End is not null)
-            {
-                var endUtc = request.End.Value.ToUniversalTime();
-                query = query.Where(m => m.DateTime <= endUtc);
-            }
-
-            result.Count = query.Count();
-
-            if (request.SortFields?.Any() == true)
-            {
-                query = query.SortBy(request.SortFields);
-            }
-            var messagesList = await query.Skip(result.Skip)
-                    .Take(result.Take).AsNoTracking()
-                    .ToListAsync(token).ConfigureAwait(false);
-
-            if (messagesList.Count == 0)
-                return result;
-
-            var allUsers = await memoryCache.GetOrCreateBasicAsync(db.Set<TelemetryUser>(), token);
-            var users = allUsers.Where(u => u.IdTelemetry == telemetry.Id);
-
-            var eventsDict = events.ToDictionary(x => x.IdEvent, x => x);
-            var usersDict = users.ToDictionary(x => x.IdUser, x => x);
-
-            var messagesDtoList = new List<MessageDto>();
-            var timezone = telemetryService.GetTimezone(telemetry.Id);
-
-            foreach (var message in messagesList)
-            {
-                var messageDto = new MessageDto
+                if (usersDict.TryGetValue((int)message.IdTelemetryUser, out TelemetryUser? user))
                 {
-                    Id = message.Id,
-                    WellDepth = message.WellDepth
-                };
-
-                messageDto.DateTime = message.DateTime.ToOffset(TimeSpan.FromHours(timezone.Hours));
-
-                if (message.IdTelemetryUser is not null)
-                {
-                    if (usersDict.TryGetValue((int)message.IdTelemetryUser, out TelemetryUser? user))
-                    {
-                        messageDto.User = user.MakeDisplayName();
-                    }
-                    else
-                        messageDto.User = message.IdTelemetryUser.ToString();
+                    messageDto.User = user.MakeDisplayName();
                 }
-
-                if (eventsDict.TryGetValue(message.IdEvent, out TelemetryEvent? e))
-                {
-                    messageDto.CategoryId = e.IdCategory;
-                    messageDto.Message = e.MakeMessageText(message);
-                }
-                messagesDtoList.Add(messageDto);
+                else
+                    messageDto.User = message.IdTelemetryUser.ToString();
             }
 
-            result.Items = result.Items.Concat(messagesDtoList);
-
-            return result;
-        }
-
-        public Task InsertAsync(string uid, IEnumerable<TelemetryMessageDto> dtos,
-            CancellationToken token = default)
-        {
-            if (!dtos.Any())
-                return Task.CompletedTask;
-
-            var telemetry = telemetryService.GetOrCreateTelemetryByUid(uid);
-
-            foreach (var dto in dtos)
+            if (eventsDict.TryGetValue(message.IdEvent, out TelemetryEvent? e))
             {
-                var entity = dto.Adapt<TelemetryMessage>();
-                entity.Id = 0;
-                entity.IdTelemetry = telemetry.Id;
-                entity.DateTime = dto.Date.ToUniversalTime();
-                db.TelemetryMessages.Add(entity);
+                messageDto.CategoryId = e.IdCategory;
+                messageDto.Message = e.MakeMessageText(message);
             }
-
-            return db.SaveChangesAsync(token);
+            messagesDtoList.Add(messageDto);
         }
 
-        private IQueryable<TelemetryMessage> BuildQuery(TelemetryPartDeleteRequest request)
+        result.Items = result.Items.Concat(messagesDtoList);
+
+        return result;
+    }
+
+    public Task InsertAsync(string uid, IEnumerable<TelemetryMessageDto> dtos,
+        CancellationToken token = default)
+    {
+        if (!dtos.Any())
+            return Task.CompletedTask;
+
+        var telemetry = telemetryService.GetOrCreateTelemetryByUid(uid);
+
+        foreach (var dto in dtos)
         {
-            var query = db.Set<TelemetryMessage>()
-                .Where(o => o.IdTelemetry == request.IdTelemetry);
-
-            if (request.GeDate is not null)
-            {
-                var geDate = request.GeDate.Value.ToUniversalTime();
-                query = query.Where(o => o.DateTime <= geDate);
-            }
-
-            if (request.LeDate is not null)
-            {
-                var leDate = request.LeDate.Value.ToUniversalTime();
-                query = query.Where(o => o.DateTime >= leDate);
-            }
-
-            return query;
+            var entity = dto.Adapt<TelemetryMessage>();
+            entity.Id = 0;
+            entity.IdTelemetry = telemetry.Id;
+            entity.DateTime = dto.Date.ToUniversalTime();
+            db.TelemetryMessages.Add(entity);
         }
 
-        public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
+        return db.SaveChangesAsync(token);
+    }
+
+    private IQueryable<TelemetryMessage> BuildQuery(TelemetryPartDeleteRequest request)
+    {
+        var query = db.Set<TelemetryMessage>()
+            .Where(o => o.IdTelemetry == request.IdTelemetry);
+
+        if (request.GeDate is not null)
         {
-            var query = BuildQuery(request);
-            db.Set<TelemetryMessage>().RemoveRange(query);
-            return await db.SaveChangesAsync(token);
+            var geDate = request.GeDate.Value.ToUniversalTime();
+            query = query.Where(o => o.DateTime <= geDate);
         }
+
+        if (request.LeDate is not null)
+        {
+            var leDate = request.LeDate.Value.ToUniversalTime();
+            query = query.Where(o => o.DateTime >= leDate);
+        }
+
+        return query;
+    }
+
+    public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
+    {
+        var query = BuildQuery(request);
+        db.Set<TelemetryMessage>().RemoveRange(query);
+        return await db.SaveChangesAsync(token);
     }
 }
 
diff --git a/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs b/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs
index 2584554c..3dbaa1b8 100644
--- a/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs
@@ -9,105 +9,103 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services.SAUB
+namespace AsbCloudInfrastructure.Services.SAUB;
+
+
+public class SetpointsService : ISetpointsService
 {
-
-    public class SetpointsService : ISetpointsService
+    // ## Инфо от АПГ от 26.11.2021, дополнения ШОВ от 26.11.2021
+    private static readonly Dictionary<string, SetpointInfoDto> SetpointInfos = new()
     {
-        // ## Инфо от АПГ от 26.11.2021, дополнения ШОВ от 26.11.2021
-        private static readonly Dictionary<string, SetpointInfoDto> SetpointInfos = new()
-        {
-            { "bitLoad", new SetpointInfoDto { Name = "bitLoad", DisplayName = "Осевая нагрузка, т" } },
-            { "dPressureMaxRotorSP", new SetpointInfoDto { Name = "dPressureMaxRotorSP", DisplayName = "Дифференциальное рабочее давление в роторе, атм" } },
-            { "dPressureMaxSlideSP", new SetpointInfoDto { Name = "dPressureMaxSlideSP", DisplayName = "Дифференциальное рабочее давление в слайде, атм" } },
-            { "torque", new SetpointInfoDto { Name = "torque", DisplayName = "Крутящий момент, кН*м" } },
-            { "speedRotorSp", new SetpointInfoDto { Name = "speedRotorSp", DisplayName = "Скорость бурения в роторе, м/ч" } },
-            { "speedSlideSp", new SetpointInfoDto { Name = "speedSlideSp", DisplayName = "Скорость бурения в слайде, м/ч" } },
-            { "speedDevelopSp", new SetpointInfoDto { Name = "speedDevelopSp", DisplayName = "Скорость проработки, м/ч" } },
-            { "torque_pid_out_limit", new SetpointInfoDto { Name = "torque_pid_out_limit", DisplayName = "Торк мастер. Допустимый процент отклонения от заданной скорости вращения" } }, // Такая же что и прямой
-            //{ "", new SetpointInfoDto { Name = "", DisplayName = "Обороты ВСП, об/мин" } }, // Оно в ПЛК спинмастера, пока сделать нельзя, позднее можно.
-            //{ "", new SetpointInfoDto { Name = "", DisplayName = "Расход промывочной жидкости, л/с" } }, // Нет в контроллере
-        };
-        private readonly SetpointsRequestRepository setpointsRepository;
-        private readonly ITelemetryService telemetryService;
+        { "bitLoad", new SetpointInfoDto { Name = "bitLoad", DisplayName = "Осевая нагрузка, т" } },
+        { "dPressureMaxRotorSP", new SetpointInfoDto { Name = "dPressureMaxRotorSP", DisplayName = "Дифференциальное рабочее давление в роторе, атм" } },
+        { "dPressureMaxSlideSP", new SetpointInfoDto { Name = "dPressureMaxSlideSP", DisplayName = "Дифференциальное рабочее давление в слайде, атм" } },
+        { "torque", new SetpointInfoDto { Name = "torque", DisplayName = "Крутящий момент, кН*м" } },
+        { "speedRotorSp", new SetpointInfoDto { Name = "speedRotorSp", DisplayName = "Скорость бурения в роторе, м/ч" } },
+        { "speedSlideSp", new SetpointInfoDto { Name = "speedSlideSp", DisplayName = "Скорость бурения в слайде, м/ч" } },
+        { "speedDevelopSp", new SetpointInfoDto { Name = "speedDevelopSp", DisplayName = "Скорость проработки, м/ч" } },
+        { "torque_pid_out_limit", new SetpointInfoDto { Name = "torque_pid_out_limit", DisplayName = "Торк мастер. Допустимый процент отклонения от заданной скорости вращения" } }, // Такая же что и прямой
+        //{ "", new SetpointInfoDto { Name = "", DisplayName = "Обороты ВСП, об/мин" } }, // Оно в ПЛК спинмастера, пока сделать нельзя, позднее можно.
+        //{ "", new SetpointInfoDto { Name = "", DisplayName = "Расход промывочной жидкости, л/с" } }, // Нет в контроллере
+    };
+    private readonly SetpointsRequestRepository setpointsRepository;
+    private readonly ITelemetryService telemetryService;
 
-        public SetpointsService(IAsbCloudDbContext db, IMemoryCache memoryCache, ITelemetryService telemetryService, IWellService wellService)
-        {
-            setpointsRepository = new SetpointsRequestRepository(db, memoryCache, wellService);
-            this.telemetryService = telemetryService;
-        }
-
-        public async Task<int> InsertAsync(SetpointsRequestDto setpointsRequest, CancellationToken token)
-        {
-            setpointsRequest.IdState = 1;
-            setpointsRequest.UploadDate = DateTimeOffset.UtcNow;
-            var result = await setpointsRepository.InsertAsync(setpointsRequest, token);
-            return result;
-        }
-
-        public async Task<IEnumerable<SetpointsRequestDto>> GetAsync(int idWell, CancellationToken token)
-        {
-            var all = await setpointsRepository.GetAllAsync(token);
-            var dtos = all.Where(s => s.IdWell == idWell);
-            return dtos;
-        }
-
-        public async Task<IEnumerable<SetpointsRequestDto>> GetForPanelAsync(string uid, CancellationToken token)
-        {
-            var idWell = telemetryService.GetIdWellByTelemetryUid(uid) ?? -1;
-
-            if (idWell < 0)
-                return Enumerable.Empty<SetpointsRequestDto>();
-            var all = await setpointsRepository.GetAllAsync(token);
-            var filtered = all.Where(s =>
-                s.IdWell == idWell &&
-                s.IdState == 1 && 
-                s.UploadDate.AddSeconds(s.ObsolescenceSec).UtcDateTime > DateTime.UtcNow)
-                .ToArray();
-
-            if (!filtered.Any())
-                return Enumerable.Empty<SetpointsRequestDto>();
-
-            foreach (var item in filtered)
-                item.IdState = 2;
-
-            await setpointsRepository.UpdateRangeAsync(filtered, token);
-
-            return filtered;
-        }
-
-        public async Task<int> UpdateStateAsync(SetpointsRequestDto setpointsRequestDto, CancellationToken token)
-        {
-            if (setpointsRequestDto.IdState != 3 && setpointsRequestDto.IdState != 4)
-                throw new ArgumentOutOfRangeException(nameof(setpointsRequestDto), $"{nameof(setpointsRequestDto.IdState)} = {setpointsRequestDto.IdState}. Mast be 3 or 4.");
-
-            if (setpointsRequestDto.Id <= 0)
-                throw new ArgumentOutOfRangeException(nameof(setpointsRequestDto), $"{nameof(setpointsRequestDto.Id)} = {setpointsRequestDto.Id}. Mast be > 0");
-
-            if (setpointsRequestDto.IdWell <= 0)
-                throw new ArgumentOutOfRangeException(nameof(setpointsRequestDto), $"{nameof(setpointsRequestDto.IdWell)} = {setpointsRequestDto.IdWell}. Mast be > 0");
-
-            var entity = await setpointsRepository.GetOrDefaultAsync(setpointsRequestDto.Id, token);
-
-            if (entity?.IdWell != setpointsRequestDto.IdWell)
-                return 0;
-
-            if (entity is null)
-                return 0;
-
-            entity.IdState = setpointsRequestDto.IdState;
-            var affected = await setpointsRepository.UpdateRangeAsync(new[] { entity }, token);
-            return affected;
-        }
-
-        public async Task<int> TryDelete(int id, CancellationToken token)
-        {
-            var affected = await setpointsRepository.DeleteAsync(id, token);
-            return affected;
-        }
-
-        public IEnumerable<SetpointInfoDto> GetSetpointsNames()
-            => SetpointInfos.Values;
+    public SetpointsService(IAsbCloudDbContext db, IMemoryCache memoryCache, ITelemetryService telemetryService, IWellService wellService)
+    {
+        setpointsRepository = new SetpointsRequestRepository(db, memoryCache, wellService);
+        this.telemetryService = telemetryService;
     }
 
+    public async Task<int> InsertAsync(SetpointsRequestDto setpointsRequest, CancellationToken token)
+    {
+        setpointsRequest.IdState = 1;
+        setpointsRequest.UploadDate = DateTimeOffset.UtcNow;
+        var result = await setpointsRepository.InsertAsync(setpointsRequest, token);
+        return result;
+    }
+
+    public async Task<IEnumerable<SetpointsRequestDto>> GetAsync(int idWell, CancellationToken token)
+    {
+        var all = await setpointsRepository.GetAllAsync(token);
+        var dtos = all.Where(s => s.IdWell == idWell);
+        return dtos;
+    }
+
+    public async Task<IEnumerable<SetpointsRequestDto>> GetForPanelAsync(string uid, CancellationToken token)
+    {
+        var idWell = telemetryService.GetIdWellByTelemetryUid(uid) ?? -1;
+
+        if (idWell < 0)
+            return Enumerable.Empty<SetpointsRequestDto>();
+        var all = await setpointsRepository.GetAllAsync(token);
+        var filtered = all.Where(s =>
+            s.IdWell == idWell &&
+            s.IdState == 1 && 
+            s.UploadDate.AddSeconds(s.ObsolescenceSec).UtcDateTime > DateTime.UtcNow)
+            .ToArray();
+
+        if (!filtered.Any())
+            return Enumerable.Empty<SetpointsRequestDto>();
+
+        foreach (var item in filtered)
+            item.IdState = 2;
+
+        await setpointsRepository.UpdateRangeAsync(filtered, token);
+
+        return filtered;
+    }
+
+    public async Task<int> UpdateStateAsync(SetpointsRequestDto setpointsRequestDto, CancellationToken token)
+    {
+        if (setpointsRequestDto.IdState != 3 && setpointsRequestDto.IdState != 4)
+            throw new ArgumentOutOfRangeException(nameof(setpointsRequestDto), $"{nameof(setpointsRequestDto.IdState)} = {setpointsRequestDto.IdState}. Mast be 3 or 4.");
+
+        if (setpointsRequestDto.Id <= 0)
+            throw new ArgumentOutOfRangeException(nameof(setpointsRequestDto), $"{nameof(setpointsRequestDto.Id)} = {setpointsRequestDto.Id}. Mast be > 0");
+
+        if (setpointsRequestDto.IdWell <= 0)
+            throw new ArgumentOutOfRangeException(nameof(setpointsRequestDto), $"{nameof(setpointsRequestDto.IdWell)} = {setpointsRequestDto.IdWell}. Mast be > 0");
+
+        var entity = await setpointsRepository.GetOrDefaultAsync(setpointsRequestDto.Id, token);
+
+        if (entity?.IdWell != setpointsRequestDto.IdWell)
+            return 0;
+
+        if (entity is null)
+            return 0;
+
+        entity.IdState = setpointsRequestDto.IdState;
+        var affected = await setpointsRepository.UpdateRangeAsync(new[] { entity }, token);
+        return affected;
+    }
+
+    public async Task<int> TryDelete(int id, CancellationToken token)
+    {
+        var affected = await setpointsRepository.DeleteAsync(id, token);
+        return affected;
+    }
+
+    public IEnumerable<SetpointInfoDto> GetSetpointsNames()
+        => SetpointInfos.Values;
 }
diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataEditorService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataEditorService.cs
index bcbf4c67..207dc744 100644
--- a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataEditorService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataEditorService.cs
@@ -6,77 +6,76 @@ using AsbCloudApp.Services;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services.SAUB
+namespace AsbCloudInfrastructure.Services.SAUB;
+
+/// <summary>
+/// Сервис по работе с данными телеметрии
+/// </summary>
+public class TelemetryDataEditorService : ITelemetryDataEditorService
 {
+    private readonly ITelemetryDataEditorService[] repositories;
+
     /// <summary>
-    /// Сервис по работе с данными телеметрии
+    /// 
     /// </summary>
-    public class TelemetryDataEditorService : ITelemetryDataEditorService
+    /// <param name="dataSaubService"></param>
+    /// <param name="dataSpinService"></param>
+    /// <param name="dataSaubStatRepository"></param>
+    /// <param name="messageService"></param>
+    /// <param name="drillTestRepository"></param>
+    /// <param name="limitingParameterRepository"></param>
+    /// <param name="detectedOperationRepository"></param>
+    /// <param name="witsRecord1Repository"></param>
+    /// <param name="witsRecord7Repository"></param>
+    /// <param name="witsRecord8Repository"></param>
+    /// <param name="witsRecord50Repository"></param>
+    /// <param name="witsRecord60Repository"></param>
+    /// <param name="witsRecord61Repository"></param>
+    /// <param name="gtrRepository"></param>
+    public TelemetryDataEditorService(
+        ITelemetryDataSaubService dataSaubService,
+        ITelemetryDataService<TelemetryDataSpinDto> dataSpinService,
+        IDataSaubStatRepository dataSaubStatRepository,
+        IMessageService messageService,
+        IDrillTestRepository drillTestRepository,
+        ILimitingParameterRepository limitingParameterRepository,
+        IDetectedOperationRepository detectedOperationRepository,
+        IWitsRecordRepository<Record1Dto> witsRecord1Repository,
+        IWitsRecordRepository<Record7Dto> witsRecord7Repository,
+        IWitsRecordRepository<Record8Dto> witsRecord8Repository,
+        IWitsRecordRepository<Record50Dto> witsRecord50Repository,
+        IWitsRecordRepository<Record60Dto> witsRecord60Repository,
+        IWitsRecordRepository<Record61Dto> witsRecord61Repository,
+        IGtrRepository gtrRepository
+        )
     {
-        private readonly ITelemetryDataEditorService[] repositories;
+        repositories =
+        [
+            dataSaubService,
+            dataSpinService,
+            dataSaubStatRepository,
+            messageService,
+            drillTestRepository,
+            limitingParameterRepository,
+            detectedOperationRepository,
+            witsRecord1Repository,
+            witsRecord7Repository,
+            witsRecord8Repository,
+            witsRecord50Repository,
+            witsRecord60Repository,
+            witsRecord61Repository,
+            gtrRepository,
+        ];
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="dataSaubService"></param>
-        /// <param name="dataSpinService"></param>
-        /// <param name="dataSaubStatRepository"></param>
-        /// <param name="messageService"></param>
-        /// <param name="drillTestRepository"></param>
-        /// <param name="limitingParameterRepository"></param>
-        /// <param name="detectedOperationRepository"></param>
-        /// <param name="witsRecord1Repository"></param>
-        /// <param name="witsRecord7Repository"></param>
-        /// <param name="witsRecord8Repository"></param>
-        /// <param name="witsRecord50Repository"></param>
-        /// <param name="witsRecord60Repository"></param>
-        /// <param name="witsRecord61Repository"></param>
-        /// <param name="gtrRepository"></param>
-        public TelemetryDataEditorService(
-            ITelemetryDataSaubService dataSaubService,
-            ITelemetryDataService<TelemetryDataSpinDto> dataSpinService,
-            IDataSaubStatRepository dataSaubStatRepository,
-            IMessageService messageService,
-            IDrillTestRepository drillTestRepository,
-            ILimitingParameterRepository limitingParameterRepository,
-            IDetectedOperationRepository detectedOperationRepository,
-            IWitsRecordRepository<Record1Dto> witsRecord1Repository,
-            IWitsRecordRepository<Record7Dto> witsRecord7Repository,
-            IWitsRecordRepository<Record8Dto> witsRecord8Repository,
-            IWitsRecordRepository<Record50Dto> witsRecord50Repository,
-            IWitsRecordRepository<Record60Dto> witsRecord60Repository,
-            IWitsRecordRepository<Record61Dto> witsRecord61Repository,
-            IGtrRepository gtrRepository
-            )
+    public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
+    {
+        var result = 0;
+        foreach (var repository in repositories)
         {
-            repositories =
-            [
-                dataSaubService,
-                dataSpinService,
-                dataSaubStatRepository,
-                messageService,
-                drillTestRepository,
-                limitingParameterRepository,
-                detectedOperationRepository,
-                witsRecord1Repository,
-                witsRecord7Repository,
-                witsRecord8Repository,
-                witsRecord50Repository,
-                witsRecord60Repository,
-                witsRecord61Repository,
-                gtrRepository,
-            ];
+            result += await repository.DeleteAsync(request, token);
         }
 
-        public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
-        {
-            var result = 0;
-            foreach (var repository in repositories)
-            {
-                result += await repository.DeleteAsync(request, token);
-            }
-
-            return result;
-        }
+        return result;
     }
 }
diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSpinService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSpinService.cs
index f629c69c..b081026b 100644
--- a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSpinService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSpinService.cs
@@ -4,31 +4,29 @@ using AsbCloudApp.Services;
 using AsbCloudDb.Model;
 using Mapster;
 
-namespace AsbCloudInfrastructure.Services.SAUB
+namespace AsbCloudInfrastructure.Services.SAUB;
+
+
+public class TelemetryDataSpinService : TelemetryDataBaseService<TelemetryDataSpinDto, TelemetryDataSpin>
 {
+    public TelemetryDataSpinService(
+        IAsbCloudDbContext db,
+        ITelemetryService telemetryService,
+        ITelemetryDataCache<TelemetryDataSpinDto> telemetryDataCache)
+        : base(db, telemetryService, telemetryDataCache)
+    { }
 
-    public class TelemetryDataSpinService : TelemetryDataBaseService<TelemetryDataSpinDto, TelemetryDataSpin>
+    protected override TelemetryDataSpin Convert(TelemetryDataSpinDto src, double timezoneOffset)
     {
-        public TelemetryDataSpinService(
-            IAsbCloudDbContext db,
-            ITelemetryService telemetryService,
-            ITelemetryDataCache<TelemetryDataSpinDto> telemetryDataCache)
-            : base(db, telemetryService, telemetryDataCache)
-        { }
-
-        protected override TelemetryDataSpin Convert(TelemetryDataSpinDto src, double timezoneOffset)
-        {
-            var entity = src.Adapt<TelemetryDataSpin>();
-            entity.DateTime = src.DateTime.ToUtcDateTimeOffset(timezoneOffset);
-            return entity;
-        }
-
-        protected override TelemetryDataSpinDto Convert(TelemetryDataSpin src, double timezoneOffset)
-        {
-            var dto = src.Adapt<TelemetryDataSpinDto>();
-            dto.DateTime = src.DateTime.ToRemoteDateTime(timezoneOffset);
-            return dto;
-        }
+        var entity = src.Adapt<TelemetryDataSpin>();
+        entity.DateTime = src.DateTime.ToUtcDateTimeOffset(timezoneOffset);
+        return entity;
     }
 
+    protected override TelemetryDataSpinDto Convert(TelemetryDataSpin src, double timezoneOffset)
+    {
+        var dto = src.Adapt<TelemetryDataSpinDto>();
+        dto.DateTime = src.DateTime.ToRemoteDateTime(timezoneOffset);
+        return dto;
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs
index 4200595e..49d6d821 100644
--- a/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs
@@ -15,342 +15,341 @@ using System.Text.Csv;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services.SAUB
+namespace AsbCloudInfrastructure.Services.SAUB;
+
+public class TelemetryService : ITelemetryService
 {
-    public class TelemetryService : ITelemetryService
+    private readonly IAsbCloudDbContext db;
+    private readonly IMemoryCache memoryCache;
+    //TODO:  методы использующие ITelemetryDataCache, скорее всего, тут не нужны
+    private readonly ITelemetryDataCache<TelemetryDataSaubDto> dataSaubCache;
+    private readonly ITimezoneService timezoneService;
+
+    public ITimezoneService TimeZoneService => timezoneService;
+
+    public TelemetryService(
+        IAsbCloudDbContext db,
+        IMemoryCache memoryCache,
+        ITelemetryDataCache<TelemetryDataSaubDto> dataSaubCache,
+        ITimezoneService timezoneService)
     {
-        private readonly IAsbCloudDbContext db;
-        private readonly IMemoryCache memoryCache;
-        //TODO:  методы использующие ITelemetryDataCache, скорее всего, тут не нужны
-        private readonly ITelemetryDataCache<TelemetryDataSaubDto> dataSaubCache;
-        private readonly ITimezoneService timezoneService;
+        this.db = db;
+        this.memoryCache = memoryCache;
+        this.dataSaubCache = dataSaubCache;
+        this.timezoneService = timezoneService;
+    }
 
-        public ITimezoneService TimeZoneService => timezoneService;
+    private IEnumerable<Telemetry> GetTelemetryCache()
+    => memoryCache.GetOrCreateBasic(
+        db.Set<Telemetry>()
+        .Include(t => t.Well));
+    
+    private void DropTelemetryCache()
+    {
+        memoryCache.DropBasic<Telemetry>();
+    }
 
-        public TelemetryService(
-            IAsbCloudDbContext db,
-            IMemoryCache memoryCache,
-            ITelemetryDataCache<TelemetryDataSaubDto> dataSaubCache,
-            ITimezoneService timezoneService)
-        {
-            this.db = db;
-            this.memoryCache = memoryCache;
-            this.dataSaubCache = dataSaubCache;
-            this.timezoneService = timezoneService;
-        }
+    public DatesRangeDto GetDatesRange(int idTelemetry)
+    {
+        var cacheDataRange = dataSaubCache.GetOrDefaultWellDataDateRange(idTelemetry)
+            ?? new ();
+        return cacheDataRange;
+    }
 
-        private IEnumerable<Telemetry> GetTelemetryCache()
-        => memoryCache.GetOrCreateBasic(
-            db.Set<Telemetry>()
-            .Include(t => t.Well));
+    public int? GetIdWellByTelemetryUid(string uid)
+        => GetWellByTelemetryUid(uid)?.Id;
+
+    public async Task UpdateInfoAsync(string uid, TelemetryInfoDto info,
+        CancellationToken token)
+    {
+        var telemetry = GetOrCreateTelemetry(uid);
+        telemetry.Info = info.Adapt<TelemetryInfo>();
+
+        if (!string.IsNullOrEmpty(info.TimeZoneId) &&
+            telemetry.TimeZone?.IsOverride != true)
+            telemetry.TimeZone = new SimpleTimezone()
+            {
+                Hours = info.TimeZoneOffsetTotalHours,
+                TimezoneId = info.TimeZoneId
+            };
+
+        db.Telemetries.Upsert(telemetry);
+        await db.SaveChangesAsync(token);
+        DropTelemetryCache();
+    }
+
+    [Obsolete("This method will be private. Use TelemetryDto.TimeZone prop.")]
+    public SimpleTimezoneDto GetTimezone(int idTelemetry)
+    {
+        var telemetry = GetTelemetryCache().FirstOrDefault(t => t.Id == idTelemetry);
+
+        if (telemetry is null)
+            throw new Exception($"Telemetry id: {idTelemetry} does not exist.");
+
+        if (telemetry.Well?.Timezone is not null)            
+            return telemetry.Well.Timezone.Adapt<SimpleTimezoneDto>();
         
-        private void DropTelemetryCache()
+        if (telemetry.TimeZone is not null)            
+            return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();
+        
+        throw new Exception($"Telemetry id: {idTelemetry} can't find timezone.");
+    }
+
+    public TelemetryBaseDto? GetOrDefaultTelemetryByIdWell(int idWell)
+    {
+        var entity = GetTelemetryCache()
+            .FirstOrDefault(t => t.Well?.Id == idWell);
+
+        if (entity?.Well?.Timezone is not null && entity.TimeZone.Hours != entity.Well.Timezone.Hours)
         {
-            memoryCache.DropBasic<Telemetry>();
+            entity.TimeZone = entity.Well.Timezone;
+            //TODO: выдаем предупреждение!
         }
+        return entity?.Adapt<TelemetryBaseDto>();
+    }
 
-        public DatesRangeDto GetDatesRange(int idTelemetry)
+    public TelemetryDto GetOrCreateTelemetryByUid(string uid)
+    {
+        var entity = GetOrCreateTelemetry(uid);            
+        if(entity.Well?.Timezone is not null && entity.TimeZone.Hours != entity.Well.Timezone.Hours)
         {
-            var cacheDataRange = dataSaubCache.GetOrDefaultWellDataDateRange(idTelemetry)
-                ?? new ();
-            return cacheDataRange;
+            entity.TimeZone = entity.Well.Timezone;
+            //TODO: выдаем предупреждение!
         }
+        var dto = entity.Adapt<TelemetryDto>();
+        return dto;
+    }
 
-        public int? GetIdWellByTelemetryUid(string uid)
-            => GetWellByTelemetryUid(uid)?.Id;
+    private Well? GetWellByTelemetryUid(string uid)
+    {
+        var telemetry = GetOrDefaultTelemetryByUid(uid);
+        return telemetry?.Well;
+    }
 
-        public async Task UpdateInfoAsync(string uid, TelemetryInfoDto info,
-            CancellationToken token)
+    private Telemetry? GetOrDefaultTelemetryByUid(string uid)
+    {
+        var telemetry = GetTelemetryCache().FirstOrDefault(t => t.RemoteUid == uid);
+        return telemetry;
+    }
+
+    private Telemetry GetOrCreateTelemetry(string uid)
+    {
+        var telemetry = GetOrDefaultTelemetryByUid(uid);
+        if (telemetry is null)
         {
-            var telemetry = GetOrCreateTelemetry(uid);
-            telemetry.Info = info.Adapt<TelemetryInfo>();
-
-            if (!string.IsNullOrEmpty(info.TimeZoneId) &&
-                telemetry.TimeZone?.IsOverride != true)
-                telemetry.TimeZone = new SimpleTimezone()
+            var newTelemetry = new Telemetry
+            {
+                RemoteUid = uid,
+                TimeZone = new SimpleTimezone
                 {
-                    Hours = info.TimeZoneOffsetTotalHours,
-                    TimezoneId = info.TimeZoneId
-                };
-
-            db.Telemetries.Upsert(telemetry);
-            await db.SaveChangesAsync(token);
+                    Hours = 5,
+                    IsOverride = false,
+                    TimezoneId = "default",
+                }
+            };
+            var entry = db.Telemetries.Add(newTelemetry);
+            db.SaveChanges();
             DropTelemetryCache();
-        }
+            return entry.Entity;
+        }            
+        return telemetry;
+    }
 
-        [Obsolete("This method will be private. Use TelemetryDto.TimeZone prop.")]
-        public SimpleTimezoneDto GetTimezone(int idTelemetry)
-        {
-            var telemetry = GetTelemetryCache().FirstOrDefault(t => t.Id == idTelemetry);
-
-            if (telemetry is null)
-                throw new Exception($"Telemetry id: {idTelemetry} does not exist.");
-
-            if (telemetry.Well?.Timezone is not null)            
-                return telemetry.Well.Timezone.Adapt<SimpleTimezoneDto>();
-            
-            if (telemetry.TimeZone is not null)            
-                return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();
-            
-            throw new Exception($"Telemetry id: {idTelemetry} can't find timezone.");
-        }
-
-        public TelemetryBaseDto? GetOrDefaultTelemetryByIdWell(int idWell)
-        {
-            var entity = GetTelemetryCache()
-                .FirstOrDefault(t => t.Well?.Id == idWell);
-
-            if (entity?.Well?.Timezone is not null && entity.TimeZone.Hours != entity.Well.Timezone.Hours)
+    public async Task<Stream> GetTelemetriesInfoByLastData(DateTimeOffset from, CancellationToken token)
+    {
+        var fromUtc = from.UtcDateTime;
+        var query = db.TelemetryDataSaub
+            .Where(i => i.DateTime >= fromUtc)
+            .GroupBy(i => i.IdTelemetry)
+            .Select(i => new
             {
-                entity.TimeZone = entity.Well.Timezone;
-                //TODO: выдаем предупреждение!
-            }
-            return entity?.Adapt<TelemetryBaseDto>();
-        }
+                i.First().Telemetry,
+                LastDate = i.Max(i => i.DateTime)
+            });
 
-        public TelemetryDto GetOrCreateTelemetryByUid(string uid)
-        {
-            var entity = GetOrCreateTelemetry(uid);            
-            if(entity.Well?.Timezone is not null && entity.TimeZone.Hours != entity.Well.Timezone.Hours)
-            {
-                entity.TimeZone = entity.Well.Timezone;
-                //TODO: выдаем предупреждение!
-            }
-            var dto = entity.Adapt<TelemetryDto>();
-            return dto;
-        }
+        var data = await query.ToArrayAsync(token);
 
-        private Well? GetWellByTelemetryUid(string uid)
-        {
-            var telemetry = GetOrDefaultTelemetryByUid(uid);
-            return telemetry?.Well;
-        }
-
-        private Telemetry? GetOrDefaultTelemetryByUid(string uid)
-        {
-            var telemetry = GetTelemetryCache().FirstOrDefault(t => t.RemoteUid == uid);
-            return telemetry;
-        }
-
-        private Telemetry GetOrCreateTelemetry(string uid)
-        {
-            var telemetry = GetOrDefaultTelemetryByUid(uid);
-            if (telemetry is null)
-            {
-                var newTelemetry = new Telemetry
-                {
-                    RemoteUid = uid,
-                    TimeZone = new SimpleTimezone
-                    {
-                        Hours = 5,
-                        IsOverride = false,
-                        TimezoneId = "default",
-                    }
-                };
-                var entry = db.Telemetries.Add(newTelemetry);
-                db.SaveChanges();
-                DropTelemetryCache();
-                return entry.Entity;
-            }            
-            return telemetry;
-        }
-
-        public async Task<Stream> GetTelemetriesInfoByLastData(DateTimeOffset from, CancellationToken token)
-        {
-            var fromUtc = from.UtcDateTime;
-            var query = db.TelemetryDataSaub
-                .Where(i => i.DateTime >= fromUtc)
-                .GroupBy(i => i.IdTelemetry)
-                .Select(i => new
-                {
-                    i.First().Telemetry,
-                    LastDate = i.Max(i => i.DateTime)
-                });
-
-            var data = await query.ToArrayAsync(token);
-
-            var infos = data.Select(i => new TelemetryWithSoftwareVersionsDto(
-                i.Telemetry.Id,
-                i.Telemetry.RemoteUid,
-                i.LastDate,
-                i.Telemetry.Info.Deposit,
-                i.Telemetry.Info.Cluster,
-                i.Telemetry.Info.Well,
-                i.Telemetry.Info.HmiVersion,
-                i.Telemetry.Info.SaubPlcVersion,
-                i.Telemetry.Info.SpinPlcVersion)
-            );
-            var stream = new MemoryStream();
-            if (!data.Any())
-                return stream;
-
-            var serializer = new CsvSerializer<TelemetryWithSoftwareVersionsDto>();
-            serializer.Serialize(infos, stream);
-            stream.Seek(0, SeekOrigin.Begin);
+        var infos = data.Select(i => new TelemetryWithSoftwareVersionsDto(
+            i.Telemetry.Id,
+            i.Telemetry.RemoteUid,
+            i.LastDate,
+            i.Telemetry.Info.Deposit,
+            i.Telemetry.Info.Cluster,
+            i.Telemetry.Info.Well,
+            i.Telemetry.Info.HmiVersion,
+            i.Telemetry.Info.SaubPlcVersion,
+            i.Telemetry.Info.SpinPlcVersion)
+        );
+        var stream = new MemoryStream();
+        if (!data.Any())
             return stream;
-        }
 
-        public async Task<int> MergeAsync(int from, int to, CancellationToken token)
+        var serializer = new CsvSerializer<TelemetryWithSoftwareVersionsDto>();
+        serializer.Serialize(infos, stream);
+        stream.Seek(0, SeekOrigin.Begin);
+        return stream;
+    }
+
+    public async Task<int> MergeAsync(int from, int to, CancellationToken token)
+    {
+        if (from == to)
+            return -2;
+
+        var stopwath = new System.Diagnostics.Stopwatch();
+        stopwath.Start();
+
+        var transaction = await db.Database.BeginTransactionAsync(token).ConfigureAwait(false);
+        try
         {
-            if (from == to)
+            var affected = 0;
+
+            var wellFrom = await db.Wells.FirstOrDefaultAsync(w => w.IdTelemetry == from, token)
+                .ConfigureAwait(false);
+            var wellTo = await db.Wells.FirstOrDefaultAsync(w => w.IdTelemetry == to, token)
+                .ConfigureAwait(false);
+
+            if (wellTo is not null && wellFrom is not null)
                 return -2;
 
-            var stopwath = new System.Diagnostics.Stopwatch();
-            stopwath.Start();
-
-            var transaction = await db.Database.BeginTransactionAsync(token).ConfigureAwait(false);
-            try
+            if (wellTo is null && wellFrom is not null)
             {
-                var affected = 0;
-
-                var wellFrom = await db.Wells.FirstOrDefaultAsync(w => w.IdTelemetry == from, token)
-                    .ConfigureAwait(false);
-                var wellTo = await db.Wells.FirstOrDefaultAsync(w => w.IdTelemetry == to, token)
-                    .ConfigureAwait(false);
-
-                if (wellTo is not null && wellFrom is not null)
-                    return -2;
-
-                if (wellTo is null && wellFrom is not null)
-                {
-                    wellFrom.IdTelemetry = to;
-                    affected += await db.SaveChangesAsync(token);
-                }
-
-                affected += await MergeEventsAndMessagesAndUsersAsync(from, to, token);
-                affected += await MergeDataAsync<TelemetryDataSaub>(from, to, token);
-                affected += await MergeDataAsync<TelemetryDataSpin>(from, to, token);
-
-                affected += await db.Database.ExecuteSqlRawAsync($"DELETE FROM t_telemetry_analysis WHERE id_telemetry = {from} OR id_telemetry = {to};", token)
-                    .ConfigureAwait(false);
-                affected += await db.Database.ExecuteSqlRawAsync($"DELETE FROM t_telemetry WHERE id = {from};", token)
-                    .ConfigureAwait(false);
-                await transaction.CommitAsync(token).ConfigureAwait(false);
-
-                stopwath.Stop();
-                Console.WriteLine($"Successfully committed in {1d * stopwath.ElapsedMilliseconds / 1000d: #0.00} sec. Affected {affected} rows.");
-                DropTelemetryCache();
-                return affected;
-            }
-            catch (Exception ex)
-            {
-                System.Diagnostics.Trace.WriteLine($"Merge() Fail. Rollback. Reason is:{ex.Message}");
-                await transaction.RollbackAsync(CancellationToken.None);
-                return -1;
-            }
-        }
-
-        private async Task<int> MergeEventsAndMessagesAndUsersAsync(int from, int to, CancellationToken token)
-        {
-            var messagesFrom = await db.TelemetryMessages
-                .Where(d => d.IdTelemetry == from)
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-
-            var usersFromQuery = db.TelemetryUsers
-                .Where(d => d.IdTelemetry == from);
-            var usersFrom = await usersFromQuery
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-
-            var usersTo = await db.TelemetryUsers
-                .Where(d => d.IdTelemetry == to)
-                .AsNoTracking()
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-
-            var usersToNextId = usersTo.Max(u => u.IdUser) + 100;
-
-            messagesFrom.ForEach(m => m.IdTelemetry = to);
-
-            foreach (var userFrom in usersFrom)
-            {
-                var userTo = usersTo
-                    .FirstOrDefault(u => u.IdUser == userFrom.IdUser);
-
-                if (userTo is null ||
-                    userTo.Name != userFrom.Name ||
-                    userTo.Surname != userFrom.Surname ||
-                    userTo.Patronymic != userFrom.Patronymic)
-                {
-                    messagesFrom
-                        .Where(m => m.IdTelemetryUser == userFrom.IdUser)
-                        .ToList()
-                        .ForEach(m => m.IdTelemetryUser = usersToNextId);
-                    userFrom.IdUser = usersToNextId;
-                    userFrom.IdTelemetry = to;
-                    usersToNextId++;
-                }
+                wellFrom.IdTelemetry = to;
+                affected += await db.SaveChangesAsync(token);
             }
 
-            var eventsFromQuery = db.TelemetryEvents
-                .Where(d => d.IdTelemetry == from);
-            var eventsFrom = await eventsFromQuery
-                .ToListAsync(token)
+            affected += await MergeEventsAndMessagesAndUsersAsync(from, to, token);
+            affected += await MergeDataAsync<TelemetryDataSaub>(from, to, token);
+            affected += await MergeDataAsync<TelemetryDataSpin>(from, to, token);
+
+            affected += await db.Database.ExecuteSqlRawAsync($"DELETE FROM t_telemetry_analysis WHERE id_telemetry = {from} OR id_telemetry = {to};", token)
                 .ConfigureAwait(false);
-
-            var eventsTo = await db.TelemetryEvents
-                .Where(d => d.IdTelemetry == to)
-                .AsNoTracking()
-                .ToListAsync(token)
+            affected += await db.Database.ExecuteSqlRawAsync($"DELETE FROM t_telemetry WHERE id = {from};", token)
                 .ConfigureAwait(false);
+            await transaction.CommitAsync(token).ConfigureAwait(false);
 
-            var eventsToNextId = eventsTo.Max(e => e.IdEvent) + 1;
-
-            foreach (var eventFrom in eventsFrom)
-            {
-                var eventTo = eventsTo
-                    .FirstOrDefault(e => e.IdEvent == eventFrom.IdEvent);
-
-                if (eventTo is null ||
-                    eventTo.IdCategory != eventFrom.IdCategory ||
-                    eventTo.MessageTemplate != eventFrom.MessageTemplate)
-                {
-                    messagesFrom
-                        .Where(m => m.IdEvent == eventFrom.IdEvent)
-                        .ToList()
-                        .ForEach(m => m.IdEvent = eventsToNextId);
-                    eventFrom.IdEvent = eventsToNextId;
-                    eventFrom.IdTelemetry = to;
-                    eventsToNextId++;
-                }
-            }
-
-            await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_user DISABLE TRIGGER ALL;", token).ConfigureAwait(false);
-            await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_event DISABLE TRIGGER ALL;", token).ConfigureAwait(false);
-            await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_message DISABLE TRIGGER ALL;", token).ConfigureAwait(false);
-            var affected = await db.SaveChangesAsync(token).ConfigureAwait(false);
-            await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_user ENABLE TRIGGER ALL;", token).ConfigureAwait(false);
-            await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_event ENABLE TRIGGER ALL;", token).ConfigureAwait(false);
-            await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_message ENABLE TRIGGER ALL;", token).ConfigureAwait(false);
-            db.TelemetryUsers.RemoveRange(usersFromQuery);
-            db.TelemetryEvents.RemoveRange(eventsFromQuery);
-            affected += await db.SaveChangesAsync(token).ConfigureAwait(false);
+            stopwath.Stop();
+            Console.WriteLine($"Successfully committed in {1d * stopwath.ElapsedMilliseconds / 1000d: #0.00} sec. Affected {affected} rows.");
+            DropTelemetryCache();
             return affected;
         }
-
-        private async Task<int> MergeDataAsync<TEntity>(int from, int to, CancellationToken token)
-            where TEntity : class, AsbCloudDb.Model.ITelemetryData
+        catch (Exception ex)
         {
-            const string IdTelemetryColumnName = "\"id_telemetry\"";
-            var dbSet = db.Set<TEntity>();
-            var tableName = dbSet.GetTableName();
-            var columns = dbSet.GetColumnsNames().ToList();
-            var index = columns.FindIndex(c => c.ToLower() == IdTelemetryColumnName.ToLower());
-            if (index < 0)
-                return -5;
-            columns[index] = $"{to} as {IdTelemetryColumnName}";
-            var columnsString = string.Join(',', columns);
-            var sql = $"INSERT INTO {tableName} " +
-                $"select {columnsString} " +
-                $"from {tableName} " +
-                $"where {IdTelemetryColumnName} = {from};" +
-                $"delete from {tableName} where {IdTelemetryColumnName} = {from};";
-
-            var affected = await db.Database.ExecuteSqlRawAsync(sql, token)
-                .ConfigureAwait(false);
-
-            return affected;
+            System.Diagnostics.Trace.WriteLine($"Merge() Fail. Rollback. Reason is:{ex.Message}");
+            await transaction.RollbackAsync(CancellationToken.None);
+            return -1;
         }
     }
+
+    private async Task<int> MergeEventsAndMessagesAndUsersAsync(int from, int to, CancellationToken token)
+    {
+        var messagesFrom = await db.TelemetryMessages
+            .Where(d => d.IdTelemetry == from)
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+
+        var usersFromQuery = db.TelemetryUsers
+            .Where(d => d.IdTelemetry == from);
+        var usersFrom = await usersFromQuery
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+
+        var usersTo = await db.TelemetryUsers
+            .Where(d => d.IdTelemetry == to)
+            .AsNoTracking()
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+
+        var usersToNextId = usersTo.Max(u => u.IdUser) + 100;
+
+        messagesFrom.ForEach(m => m.IdTelemetry = to);
+
+        foreach (var userFrom in usersFrom)
+        {
+            var userTo = usersTo
+                .FirstOrDefault(u => u.IdUser == userFrom.IdUser);
+
+            if (userTo is null ||
+                userTo.Name != userFrom.Name ||
+                userTo.Surname != userFrom.Surname ||
+                userTo.Patronymic != userFrom.Patronymic)
+            {
+                messagesFrom
+                    .Where(m => m.IdTelemetryUser == userFrom.IdUser)
+                    .ToList()
+                    .ForEach(m => m.IdTelemetryUser = usersToNextId);
+                userFrom.IdUser = usersToNextId;
+                userFrom.IdTelemetry = to;
+                usersToNextId++;
+            }
+        }
+
+        var eventsFromQuery = db.TelemetryEvents
+            .Where(d => d.IdTelemetry == from);
+        var eventsFrom = await eventsFromQuery
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+
+        var eventsTo = await db.TelemetryEvents
+            .Where(d => d.IdTelemetry == to)
+            .AsNoTracking()
+            .ToListAsync(token)
+            .ConfigureAwait(false);
+
+        var eventsToNextId = eventsTo.Max(e => e.IdEvent) + 1;
+
+        foreach (var eventFrom in eventsFrom)
+        {
+            var eventTo = eventsTo
+                .FirstOrDefault(e => e.IdEvent == eventFrom.IdEvent);
+
+            if (eventTo is null ||
+                eventTo.IdCategory != eventFrom.IdCategory ||
+                eventTo.MessageTemplate != eventFrom.MessageTemplate)
+            {
+                messagesFrom
+                    .Where(m => m.IdEvent == eventFrom.IdEvent)
+                    .ToList()
+                    .ForEach(m => m.IdEvent = eventsToNextId);
+                eventFrom.IdEvent = eventsToNextId;
+                eventFrom.IdTelemetry = to;
+                eventsToNextId++;
+            }
+        }
+
+        await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_user DISABLE TRIGGER ALL;", token).ConfigureAwait(false);
+        await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_event DISABLE TRIGGER ALL;", token).ConfigureAwait(false);
+        await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_message DISABLE TRIGGER ALL;", token).ConfigureAwait(false);
+        var affected = await db.SaveChangesAsync(token).ConfigureAwait(false);
+        await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_user ENABLE TRIGGER ALL;", token).ConfigureAwait(false);
+        await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_event ENABLE TRIGGER ALL;", token).ConfigureAwait(false);
+        await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_message ENABLE TRIGGER ALL;", token).ConfigureAwait(false);
+        db.TelemetryUsers.RemoveRange(usersFromQuery);
+        db.TelemetryEvents.RemoveRange(eventsFromQuery);
+        affected += await db.SaveChangesAsync(token).ConfigureAwait(false);
+        return affected;
+    }
+
+    private async Task<int> MergeDataAsync<TEntity>(int from, int to, CancellationToken token)
+        where TEntity : class, AsbCloudDb.Model.ITelemetryData
+    {
+        const string IdTelemetryColumnName = "\"id_telemetry\"";
+        var dbSet = db.Set<TEntity>();
+        var tableName = dbSet.GetTableName();
+        var columns = dbSet.GetColumnsNames().ToList();
+        var index = columns.FindIndex(c => c.ToLower() == IdTelemetryColumnName.ToLower());
+        if (index < 0)
+            return -5;
+        columns[index] = $"{to} as {IdTelemetryColumnName}";
+        var columnsString = string.Join(',', columns);
+        var sql = $"INSERT INTO {tableName} " +
+            $"select {columnsString} " +
+            $"from {tableName} " +
+            $"where {IdTelemetryColumnName} = {from};" +
+            $"delete from {tableName} where {IdTelemetryColumnName} = {from};";
+
+        var affected = await db.Database.ExecuteSqlRawAsync(sql, token)
+            .ConfigureAwait(false);
+
+        return affected;
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryUserService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryUserService.cs
index d3975602..abd17dc4 100644
--- a/AsbCloudInfrastructure/Services/SAUB/TelemetryUserService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryUserService.cs
@@ -11,91 +11,89 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services.SAUB
+namespace AsbCloudInfrastructure.Services.SAUB;
+
+
+public class TelemetryUserService : ITelemetryUserService
 {
+    private const string CacheTag = "TelemetryUserCacheTag";
+    private readonly TimeSpan CacheOlescence = TimeSpan.FromMinutes(5);
 
-    public class TelemetryUserService : ITelemetryUserService
+    private readonly IAsbCloudDbContext db;
+    private readonly ITelemetryService telemetryService;
+    private readonly IMemoryCache memoryCache;
+
+    public TelemetryUserService(IAsbCloudDbContext db,
+        ITelemetryService telemetryService,
+        IMemoryCache memoryCache)
     {
-        private const string CacheTag = "TelemetryUserCacheTag";
-        private readonly TimeSpan CacheOlescence = TimeSpan.FromMinutes(5);
-
-        private readonly IAsbCloudDbContext db;
-        private readonly ITelemetryService telemetryService;
-        private readonly IMemoryCache memoryCache;
-
-        public TelemetryUserService(IAsbCloudDbContext db,
-            ITelemetryService telemetryService,
-            IMemoryCache memoryCache)
-        {
-            this.db = db;
-            this.telemetryService = telemetryService;
-            this.memoryCache = memoryCache;
-        }
-
-        public TelemetryUserDto? GetOrDefault(int idTelemetry, int idUser)
-        {
-            var entity = GetCache()
-                .FirstOrDefault(u => u.IdTelemetry == idTelemetry && u.IdUser == idUser);
-
-            if(entity is null)
-                return null;
-
-            return Convert(entity);
-        }
-
-        public IEnumerable<TelemetryUserDto> GetUsers(int idTelemetry, Func<TelemetryUserDto, bool>? predicate = null)
-        {
-            var entities = GetCache()
-                .Where(u => u.IdTelemetry == idTelemetry);
-
-            foreach (var entity in entities)
-            {
-                var dto = Convert(entity);
-                if(predicate?.Invoke(dto)??true)
-                    yield return dto;
-            }
-            
-            yield break;
-        }
-
-        public async Task UpsertAsync(string uid, IEnumerable<TelemetryUserDto> dtos, CancellationToken token = default)
-        {
-            if (!dtos.Any())
-                return;
-
-            var telemetry = telemetryService.GetOrCreateTelemetryByUid(uid);
-
-            var entities = dtos.Distinct(new TelemetryUserDtoComparer()).Select(dto => {
-                var entity = dto.Adapt<TelemetryUser>();
-                entity.IdUser = dto.Id;
-                entity.IdTelemetry = telemetry.Id;
-                return entity;
-            });
-            var result = await db.Database.ExecInsertOrUpdateAsync(db.TelemetryUsers, entities, token);
-            DropCache();
-        }
-
-        private IEnumerable<TelemetryUser> GetCache()
-        {
-            var cache = memoryCache.GetOrCreate(CacheTag, cacheEntry => {
-                cacheEntry.AbsoluteExpirationRelativeToNow = CacheOlescence;
-                cacheEntry.SlidingExpiration = CacheOlescence;
-
-                var entities = db.Set<TelemetryUser>().ToArray();                
-                return entities;
-            });
-            return cache!;
-        }
-
-        private void DropCache()
-            => memoryCache.Remove(CacheTag);
-
-        private static TelemetryUserDto Convert(TelemetryUser entity)
-        {
-            var dto = entity.Adapt<TelemetryUserDto>();
-            dto.Id = entity.IdUser;
-            return dto;
-        }
+        this.db = db;
+        this.telemetryService = telemetryService;
+        this.memoryCache = memoryCache;
     }
 
+    public TelemetryUserDto? GetOrDefault(int idTelemetry, int idUser)
+    {
+        var entity = GetCache()
+            .FirstOrDefault(u => u.IdTelemetry == idTelemetry && u.IdUser == idUser);
+
+        if(entity is null)
+            return null;
+
+        return Convert(entity);
+    }
+
+    public IEnumerable<TelemetryUserDto> GetUsers(int idTelemetry, Func<TelemetryUserDto, bool>? predicate = null)
+    {
+        var entities = GetCache()
+            .Where(u => u.IdTelemetry == idTelemetry);
+
+        foreach (var entity in entities)
+        {
+            var dto = Convert(entity);
+            if(predicate?.Invoke(dto)??true)
+                yield return dto;
+        }
+        
+        yield break;
+    }
+
+    public async Task UpsertAsync(string uid, IEnumerable<TelemetryUserDto> dtos, CancellationToken token = default)
+    {
+        if (!dtos.Any())
+            return;
+
+        var telemetry = telemetryService.GetOrCreateTelemetryByUid(uid);
+
+        var entities = dtos.Distinct(new TelemetryUserDtoComparer()).Select(dto => {
+            var entity = dto.Adapt<TelemetryUser>();
+            entity.IdUser = dto.Id;
+            entity.IdTelemetry = telemetry.Id;
+            return entity;
+        });
+        var result = await db.Database.ExecInsertOrUpdateAsync(db.TelemetryUsers, entities, token);
+        DropCache();
+    }
+
+    private IEnumerable<TelemetryUser> GetCache()
+    {
+        var cache = memoryCache.GetOrCreate(CacheTag, cacheEntry => {
+            cacheEntry.AbsoluteExpirationRelativeToNow = CacheOlescence;
+            cacheEntry.SlidingExpiration = CacheOlescence;
+
+            var entities = db.Set<TelemetryUser>().ToArray();                
+            return entities;
+        });
+        return cache!;
+    }
+
+    private void DropCache()
+        => memoryCache.Remove(CacheTag);
+
+    private static TelemetryUserDto Convert(TelemetryUser entity)
+    {
+        var dto = entity.Adapt<TelemetryUserDto>();
+        dto.Id = entity.IdUser;
+        return dto;
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/Subsystems/DepthInterpolation.cs b/AsbCloudInfrastructure/Services/Subsystems/DepthInterpolation.cs
index 532377ef..8376e06d 100644
--- a/AsbCloudInfrastructure/Services/Subsystems/DepthInterpolation.cs
+++ b/AsbCloudInfrastructure/Services/Subsystems/DepthInterpolation.cs
@@ -1,62 +1,60 @@
 using System;
 using System.Collections.Generic;
 
-namespace AsbCloudInfrastructure.Services.Subsystems.Utils
+namespace AsbCloudInfrastructure.Services.Subsystems.Utils;
+
+
+internal class DepthInterpolation
 {
+    private readonly TimeSpan maxDeltaDate = TimeSpan.FromHours(12);
+    private readonly IEnumerator<(DateTimeOffset x, float y)> enumerator;
+    private (DateTimeOffset x, float y) p0;
+    private bool canMoveNext;
 
-    internal class DepthInterpolation
+    public DepthInterpolation(IEnumerable<(DateTimeOffset x, float y)> collection)
     {
-        private readonly TimeSpan maxDeltaDate = TimeSpan.FromHours(12);
-        private readonly IEnumerator<(DateTimeOffset x, float y)> enumerator;
-        private (DateTimeOffset x, float y) p0;
-        private bool canMoveNext;
-
-        public DepthInterpolation(IEnumerable<(DateTimeOffset x, float y)> collection)
-        {
-            enumerator = collection.GetEnumerator();
-            canMoveNext = enumerator.MoveNext();
-            p0 = enumerator.Current;
-        }
-
-        ~DepthInterpolation()
-        {
-            enumerator.Dispose();
-        }
-
-        public float GetDepth(DateTimeOffset date)
-        {
-            // ошибка в телеметрии см. прим.: idTelemetry = 93 && date between '2021-11-16 17:18:40.000 +0500' and '2021-11-16 17:19:37.000 +0500'
-            while (canMoveNext && enumerator.Current.x < date)
-            {
-                p0 = enumerator.Current;
-                canMoveNext = enumerator.MoveNext();
-            }
-            return CalcValue(date);
-        }
-        
-        private float CalcValue(DateTimeOffset date)
-        {
-            var p1 = enumerator.Current;
-            if (canMoveNext || p1 == default || p0.y == p1.y || p0.x > date)
-                return p0.y;
-
-            if (p1.x < date)
-                return p1.y;
-
-            if (p1.x - p0.x > maxDeltaDate && Math.Abs(p1.y - p0.y) > 0.2d)
-            {
-                if (date - p0.x < p1.x - date)
-                    return p0.y;
-                else
-                    return p1.y;
-            }
-
-            var a = (p1.y - p0.y) / (p1.x - p0.x).TotalSeconds;
-            var b = p0.y;
-            var x = (date - p0.x).TotalSeconds;
-            var y = a * x + b;
-            return (float)y;
-        }
+        enumerator = collection.GetEnumerator();
+        canMoveNext = enumerator.MoveNext();
+        p0 = enumerator.Current;
     }
 
+    ~DepthInterpolation()
+    {
+        enumerator.Dispose();
+    }
+
+    public float GetDepth(DateTimeOffset date)
+    {
+        // ошибка в телеметрии см. прим.: idTelemetry = 93 && date between '2021-11-16 17:18:40.000 +0500' and '2021-11-16 17:19:37.000 +0500'
+        while (canMoveNext && enumerator.Current.x < date)
+        {
+            p0 = enumerator.Current;
+            canMoveNext = enumerator.MoveNext();
+        }
+        return CalcValue(date);
+    }
+    
+    private float CalcValue(DateTimeOffset date)
+    {
+        var p1 = enumerator.Current;
+        if (canMoveNext || p1 == default || p0.y == p1.y || p0.x > date)
+            return p0.y;
+
+        if (p1.x < date)
+            return p1.y;
+
+        if (p1.x - p0.x > maxDeltaDate && Math.Abs(p1.y - p0.y) > 0.2d)
+        {
+            if (date - p0.x < p1.x - date)
+                return p0.y;
+            else
+                return p1.y;
+        }
+
+        var a = (p1.y - p0.y) / (p1.x - p0.x).TotalSeconds;
+        var b = p0.y;
+        var x = (date - p0.x).TotalSeconds;
+        var y = a * x + b;
+        return (float)y;
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/TimeZoneService.cs b/AsbCloudInfrastructure/Services/TimeZoneService.cs
index b22edfc0..f0552777 100644
--- a/AsbCloudInfrastructure/Services/TimeZoneService.cs
+++ b/AsbCloudInfrastructure/Services/TimeZoneService.cs
@@ -5,67 +5,66 @@ using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services
+namespace AsbCloudInfrastructure.Services;
+
+public class TimezoneService : ITimezoneService
 {
-    public class TimezoneService : ITimezoneService
+    private class TimeZoneInfo
     {
-        private class TimeZoneInfo
-        {
-            public string? Sunrise { get; set; }
-            public double Lng { get; set; }
-            public double Lat { get; set; }
-            public string? CountryCode { get; set; }
-            public double GmtOffset { get; set; }
-            public double RawOffset { get; set; }
-            public string? Sunset { get; set; }
-            public string? TimezoneId { get; set; }
-            public double DstOffset { get; set; }
-            public string? CountryName { get; set; }
-            public string? Time { get; set; }
-        }
-
-        private const string timezoneApiUrl = "http://api.geonames.org/timezoneJSON";
-        private const string timezoneApiUserName = "asbautodrilling";
-
-        public SimpleTimezoneDto? GetOrDefaultByCoordinates(double latitude, double longitude)
-        => GetOrDefaultByCoordinatesAsync(latitude, longitude, default).Result;
-
-        public async Task<SimpleTimezoneDto?> GetOrDefaultByCoordinatesAsync(double latitude, double longitude, CancellationToken token)
-        {
-            var lat = latitude.ToString(System.Globalization.CultureInfo.InvariantCulture);
-            var lng = longitude.ToString(System.Globalization.CultureInfo.InvariantCulture);
-
-            var url =
-                $"{timezoneApiUrl}?lat={lat}&lng={lng}&username={timezoneApiUserName}";
-
-            using var client = new HttpClient();
-
-            var response = await client.GetAsync(url, token)
-                .ConfigureAwait(false);
-
-            var responseJson = await response.Content.ReadAsStringAsync(token)
-                .ConfigureAwait(false);
-
-            if (!(responseJson.Contains("timezoneId") && responseJson.Contains("dstOffset")))
-                return null;
-
-            var options = new JsonSerializerOptions
-            {
-                PropertyNameCaseInsensitive = true
-            };
-            var timezoneInfo = JsonSerializer.Deserialize<TimeZoneInfo>(responseJson, options);
-
-            if(timezoneInfo is null)
-                return null;
-
-            return new SimpleTimezoneDto
-            {
-                Hours = timezoneInfo.DstOffset,
-                IsOverride = false,
-                TimezoneId = timezoneInfo.TimezoneId,
-            };
-        }
-
-
+        public string? Sunrise { get; set; }
+        public double Lng { get; set; }
+        public double Lat { get; set; }
+        public string? CountryCode { get; set; }
+        public double GmtOffset { get; set; }
+        public double RawOffset { get; set; }
+        public string? Sunset { get; set; }
+        public string? TimezoneId { get; set; }
+        public double DstOffset { get; set; }
+        public string? CountryName { get; set; }
+        public string? Time { get; set; }
     }
+
+    private const string timezoneApiUrl = "http://api.geonames.org/timezoneJSON";
+    private const string timezoneApiUserName = "asbautodrilling";
+
+    public SimpleTimezoneDto? GetOrDefaultByCoordinates(double latitude, double longitude)
+    => GetOrDefaultByCoordinatesAsync(latitude, longitude, default).Result;
+
+    public async Task<SimpleTimezoneDto?> GetOrDefaultByCoordinatesAsync(double latitude, double longitude, CancellationToken token)
+    {
+        var lat = latitude.ToString(System.Globalization.CultureInfo.InvariantCulture);
+        var lng = longitude.ToString(System.Globalization.CultureInfo.InvariantCulture);
+
+        var url =
+            $"{timezoneApiUrl}?lat={lat}&lng={lng}&username={timezoneApiUserName}";
+
+        using var client = new HttpClient();
+
+        var response = await client.GetAsync(url, token)
+            .ConfigureAwait(false);
+
+        var responseJson = await response.Content.ReadAsStringAsync(token)
+            .ConfigureAwait(false);
+
+        if (!(responseJson.Contains("timezoneId") && responseJson.Contains("dstOffset")))
+            return null;
+
+        var options = new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        };
+        var timezoneInfo = JsonSerializer.Deserialize<TimeZoneInfo>(responseJson, options);
+
+        if(timezoneInfo is null)
+            return null;
+
+        return new SimpleTimezoneDto
+        {
+            Hours = timezoneInfo.DstOffset,
+            IsOverride = false,
+            TimezoneId = timezoneInfo.TimezoneId,
+        };
+    }
+
+
 }
diff --git a/AsbCloudInfrastructure/Services/WellContactService.cs b/AsbCloudInfrastructure/Services/WellContactService.cs
index 770375f3..3e5bf0af 100644
--- a/AsbCloudInfrastructure/Services/WellContactService.cs
+++ b/AsbCloudInfrastructure/Services/WellContactService.cs
@@ -11,131 +11,130 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services
+namespace AsbCloudInfrastructure.Services;
+
+public class WellContactService : IWellContactService
 {
-    public class WellContactService : IWellContactService
+    private readonly IAsbCloudDbContext db;
+
+    public WellContactService(IAsbCloudDbContext db)
     {
-        private readonly IAsbCloudDbContext db;
+        this.db = db;
+    }
 
-        public WellContactService(IAsbCloudDbContext db)
+    public async Task<IEnumerable<ContactDto>> GetAllAsync(WellContactRequest request, CancellationToken token)
+    {
+        var query = db.Contacts
+            .Where(c => request.IdsWells.Contains(c.IdWell));
+
+        if (request.ContactTypeId.HasValue)
         {
-            this.db = db;
-        }
+            query = query.Where(c => c.IdCompanyType == request.ContactTypeId);
+        };
 
-        public async Task<IEnumerable<ContactDto>> GetAllAsync(WellContactRequest request, CancellationToken token)
+        var entities = await query.AsNoTracking()
+          .ToArrayAsync(token);
+
+        var dtos = entities.Select(c => c.Adapt<ContactDto>());
+
+        return dtos;
+    }
+
+    public async Task<ContactDto?> GetAsync(int idWell, int id, CancellationToken token)
+    {
+        var dbContact = await GetContact(idWell, id, token);
+
+        var result = dbContact?.Adapt<ContactDto>();
+
+        return result;
+    }
+
+    public async Task<IEnumerable<CompanyTypeDto>> GetTypesAsync(CancellationToken token)
+    {
+        var query = db.CompaniesTypes
+            .Where(t => t.IsContact)
+            .OrderBy(t => t.Order);
+
+        var entities = await query.AsNoTracking()
+           .ToArrayAsync(token);
+
+        var dtos = entities.Adapt<IEnumerable<CompanyTypeDto>>();
+
+        return dtos;
+    }
+
+    public async Task<int> InsertAsync(ContactDto contactDto, CancellationToken token)
+    {
+        var entity = contactDto.Adapt<Contact>();
+
+        db.Contacts.Add(entity);
+
+        await db.SaveChangesAsync(token).ConfigureAwait(false);
+        return entity.Id;
+    }
+
+
+    public async Task<int> UpdateAsync(ContactDto contactDto, CancellationToken token)
+    {
+        var dbContact = await GetContact(contactDto.IdWell, contactDto.Id, token);
+        if (dbContact is null)
+            throw new ForbidException("Contact doesn't exist");
+
+        var entity = contactDto.Adapt<Contact>();
+        db.Contacts.Update(entity);
+
+        return await db.SaveChangesAsync(token);
+    }
+
+    public async Task<int> DeleteAsync(int idWell, int id, CancellationToken token)
+    {
+        var dbContact = await GetContact(idWell, id, token);
+        if (dbContact is null)
+            throw new ForbidException("Contact doesn't exist");
+
+        db.Contacts.Remove(dbContact);
+        return await db.SaveChangesAsync(token);
+    }
+
+    public async Task<int> CopyAsync(int idWell, int idWellTarget, IEnumerable<int> contactIds, CancellationToken token)
+    {
+        var contacts = await GetContacts(idWell, contactIds, token);
+        if (!contacts.Any())
+            return 0;
+
+        var newContacts = contacts.Select(contact =>
         {
-            var query = db.Contacts
-                .Where(c => request.IdsWells.Contains(c.IdWell));
+            var newContact = contact.Adapt<Contact>();
+            newContact.IdWell = idWellTarget;
+            newContact.Id = default;
 
-            if (request.ContactTypeId.HasValue)
-            {
-                query = query.Where(c => c.IdCompanyType == request.ContactTypeId);
-            };
+            return newContact;
+        });
 
-            var entities = await query.AsNoTracking()
-              .ToArrayAsync(token);
+        db.Contacts.AddRange(newContacts);
 
-            var dtos = entities.Select(c => c.Adapt<ContactDto>());
+        return await db.SaveChangesAsync(token);
+    }
 
-            return dtos;
-        }
+    private async Task<Contact?> GetContact(int idWell, int idContact, CancellationToken token)
+    {
+        var contact = await db.Contacts
+            .Where(c => c.IdWell == idWell)
+            .Where(c => c.Id == idContact)
+            .AsNoTracking()
+            .FirstOrDefaultAsync(token);
 
-        public async Task<ContactDto?> GetAsync(int idWell, int id, CancellationToken token)
-        {
-            var dbContact = await GetContact(idWell, id, token);
+        return contact;
+    }
 
-            var result = dbContact?.Adapt<ContactDto>();
+    private async Task<Contact[]> GetContacts(int idWell, IEnumerable<int> contactIds, CancellationToken token)
+    {
+        var contacts = await db.Contacts
+            .Where(c => c.IdWell == idWell)
+            .Where(c => contactIds.Contains(c.Id))
+            .AsNoTracking()
+            .ToArrayAsync(token);
 
-            return result;
-        }
-
-        public async Task<IEnumerable<CompanyTypeDto>> GetTypesAsync(CancellationToken token)
-        {
-            var query = db.CompaniesTypes
-                .Where(t => t.IsContact)
-                .OrderBy(t => t.Order);
-
-            var entities = await query.AsNoTracking()
-               .ToArrayAsync(token);
-
-            var dtos = entities.Adapt<IEnumerable<CompanyTypeDto>>();
-
-            return dtos;
-        }
-
-        public async Task<int> InsertAsync(ContactDto contactDto, CancellationToken token)
-        {
-            var entity = contactDto.Adapt<Contact>();
-
-            db.Contacts.Add(entity);
-
-            await db.SaveChangesAsync(token).ConfigureAwait(false);
-            return entity.Id;
-        }
-
-
-        public async Task<int> UpdateAsync(ContactDto contactDto, CancellationToken token)
-        {
-            var dbContact = await GetContact(contactDto.IdWell, contactDto.Id, token);
-            if (dbContact is null)
-                throw new ForbidException("Contact doesn't exist");
-
-            var entity = contactDto.Adapt<Contact>();
-            db.Contacts.Update(entity);
-
-            return await db.SaveChangesAsync(token);
-        }
-
-        public async Task<int> DeleteAsync(int idWell, int id, CancellationToken token)
-        {
-            var dbContact = await GetContact(idWell, id, token);
-            if (dbContact is null)
-                throw new ForbidException("Contact doesn't exist");
-
-            db.Contacts.Remove(dbContact);
-            return await db.SaveChangesAsync(token);
-        }
-
-        public async Task<int> CopyAsync(int idWell, int idWellTarget, IEnumerable<int> contactIds, CancellationToken token)
-        {
-            var contacts = await GetContacts(idWell, contactIds, token);
-            if (!contacts.Any())
-                return 0;
-
-            var newContacts = contacts.Select(contact =>
-            {
-                var newContact = contact.Adapt<Contact>();
-                newContact.IdWell = idWellTarget;
-                newContact.Id = default;
-
-                return newContact;
-            });
-
-            db.Contacts.AddRange(newContacts);
-
-            return await db.SaveChangesAsync(token);
-        }
-
-        private async Task<Contact?> GetContact(int idWell, int idContact, CancellationToken token)
-        {
-            var contact = await db.Contacts
-                .Where(c => c.IdWell == idWell)
-                .Where(c => c.Id == idContact)
-                .AsNoTracking()
-                .FirstOrDefaultAsync(token);
-
-            return contact;
-        }
-
-        private async Task<Contact[]> GetContacts(int idWell, IEnumerable<int> contactIds, CancellationToken token)
-        {
-            var contacts = await db.Contacts
-                .Where(c => c.IdWell == idWell)
-                .Where(c => contactIds.Contains(c.Id))
-                .AsNoTracking()
-                .ToArrayAsync(token);
-
-            return contacts;
-        }
+        return contacts;
     }
 }
diff --git a/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs b/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs
index 6e9a9e41..c141e8a6 100644
--- a/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs
+++ b/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs
@@ -13,150 +13,148 @@ using System.Threading.Tasks;
 using AsbCloudApp.Services.Notifications;
 using AsbCloudDb.Model;
 
-namespace AsbCloudInfrastructure.Services
+namespace AsbCloudInfrastructure.Services;
+
+
+/// <summary>
+/// Сервис "Дело скважины"
+/// </summary>
+public class WellFinalDocumentsService : IWellFinalDocumentsService
 {
+    private readonly FileService fileService;
+    private readonly IUserRepository userRepository;
+    private readonly IWellService wellService;
+    private readonly IConfiguration configuration;
+    private readonly IFileCategoryService fileCategoryService;
+    private readonly IWellFinalDocumentsRepository wellFinalDocumentsRepository;
+    private readonly NotificationService notificationService;
 
-    /// <summary>
-    /// Сервис "Дело скважины"
-    /// </summary>
-    public class WellFinalDocumentsService : IWellFinalDocumentsService
+    public WellFinalDocumentsService(FileService fileService,
+        IUserRepository userRepository,
+        IWellService wellService,
+        IConfiguration configuration,
+        IFileCategoryService fileCategoryService,
+        IWellFinalDocumentsRepository wellFinalDocumentsRepository,
+        NotificationService notificationService)
     {
-        private readonly FileService fileService;
-        private readonly IUserRepository userRepository;
-        private readonly IWellService wellService;
-        private readonly IConfiguration configuration;
-        private readonly IFileCategoryService fileCategoryService;
-        private readonly IWellFinalDocumentsRepository wellFinalDocumentsRepository;
-        private readonly NotificationService notificationService;
+        this.fileService = fileService;
+        this.userRepository = userRepository;
+        this.wellService = wellService;
+        this.configuration = configuration;
+        this.fileCategoryService = fileCategoryService;
+        this.wellFinalDocumentsRepository = wellFinalDocumentsRepository;
+        this.notificationService = notificationService;
+    }
 
-        public WellFinalDocumentsService(FileService fileService,
-            IUserRepository userRepository,
-            IWellService wellService,
-            IConfiguration configuration,
-            IFileCategoryService fileCategoryService,
-            IWellFinalDocumentsRepository wellFinalDocumentsRepository,
-            NotificationService notificationService)
+    ///<inheritdoc/>
+    public async Task<int> UpdateRangeAsync(int idWell, IEnumerable<WellFinalDocumentInputDto> dtos, CancellationToken token)
+    {
+        var data = await wellFinalDocumentsRepository.UpdateRangeAsync(idWell, dtos, token);
+
+        var message = "от Вас ожидается загрузка на портал документа «{0}»";
+        await NotifyUsersAsync(data, message, token);
+
+        return data.Count();
+    }
+
+    ///<inheritdoc/>
+    public async Task<int> SaveCategoryFileAsync(int idWell, int idCategory, int idUser, Stream fileStream, string fileName, CancellationToken token)
+    {
+        var dto = await wellFinalDocumentsRepository.GetCategoryAsync(idWell, idCategory, idUser, token)
+            .ConfigureAwait(false);
+
+        var file = await fileService.SaveAsync(dto.IdWell, dto.IdUser, dto.IdCategory, fileName,
+             fileStream, token).ConfigureAwait(false);
+
+        return file.Id;
+    }
+
+    ///<inheritdoc/>
+    public async Task<WellFinalDocumentsHistoryDto> GetFilesHistoryByIdCategoryAsync(int idWell, int idCategory, CancellationToken token)
+    {
+        var request = new FileRequest
         {
-            this.fileService = fileService;
-            this.userRepository = userRepository;
-            this.wellService = wellService;
-            this.configuration = configuration;
-            this.fileCategoryService = fileCategoryService;
-            this.wellFinalDocumentsRepository = wellFinalDocumentsRepository;
-            this.notificationService = notificationService;
-        }
+            IdWell = idWell,
+            IdCategory = idCategory,
+        };
+        var files = await fileService.GetInfosAsync(request, token).ConfigureAwait(false);
 
-        ///<inheritdoc/>
-        public async Task<int> UpdateRangeAsync(int idWell, IEnumerable<WellFinalDocumentInputDto> dtos, CancellationToken token)
+        return new WellFinalDocumentsHistoryDto { 
+            IdWell = idWell,
+            IdCategory = idCategory,
+            Files = files
+        };
+    }
+
+    ///<inheritdoc/>
+    public async Task<int> ReNotifyPublishersAsync(int idWell, int idUser, int idCategory, CancellationToken token)
+    {
+        var wellCase = await wellFinalDocumentsRepository.GetByWellIdAsync(idWell, idUser, token);
+
+        if (!wellCase.PermissionToSetPubliher)
+            throw new ForbidException("Повторная отправка оповещений Вам не разрешена");
+
+        var requester = await userRepository.GetOrDefaultAsync(idUser, token);
+        if (requester is null)
+            throw new ForbidException("Не удается вас опознать");
+
+        var docs = wellCase.WellFinalDocuments
+            .Where(doc => doc.IdCategory == idCategory)
+            .Where(doc => doc.File is null)
+            .SelectMany(doc => doc.Publishers
+                .Select(pub => new WellFinalDocumentDBDto { 
+                    IdCategory = idCategory,
+                    IdUser = pub.Id,
+                    IdWell = idWell
+                }));
+
+        if(!docs.Any())
+            throw new ArgumentInvalidException(nameof(idCategory), "Нет такой категории, или в нее уже загружен документ");
+
+        var message = requester.MakeDisplayName() + " ожидает от Вас загрузку на портал документа «{{0}}»";
+        await NotifyUsersAsync(docs, message, token);
+
+        return docs.Count();
+    }
+
+    private async Task NotifyUsersAsync(IEnumerable<WellFinalDocumentDBDto> dtos, string message, CancellationToken token)
+    {
+        foreach (var item in dtos)
         {
-            var data = await wellFinalDocumentsRepository.UpdateRangeAsync(idWell, dtos, token);
-
-            var message = "от Вас ожидается загрузка на портал документа «{0}»";
-            await NotifyUsersAsync(data, message, token);
-
-            return data.Count();
-        }
-
-        ///<inheritdoc/>
-        public async Task<int> SaveCategoryFileAsync(int idWell, int idCategory, int idUser, Stream fileStream, string fileName, CancellationToken token)
-        {
-            var dto = await wellFinalDocumentsRepository.GetCategoryAsync(idWell, idCategory, idUser, token)
-                .ConfigureAwait(false);
-
-            var file = await fileService.SaveAsync(dto.IdWell, dto.IdUser, dto.IdCategory, fileName,
-                 fileStream, token).ConfigureAwait(false);
-
-            return file.Id;
-        }
-
-        ///<inheritdoc/>
-        public async Task<WellFinalDocumentsHistoryDto> GetFilesHistoryByIdCategoryAsync(int idWell, int idCategory, CancellationToken token)
-        {
-            var request = new FileRequest
+            var user = await userRepository.GetOrDefaultAsync(item.IdUser, token);
+            if (user?.Email is not null)
             {
-                IdWell = idWell,
-                IdCategory = idCategory,
-            };
-            var files = await fileService.GetInfosAsync(request, token).ConfigureAwait(false);
+                var category = await fileCategoryService.GetOrDefaultAsync(item.IdCategory, token);
+                var well = await wellService.GetOrDefaultAsync(item.IdWell, token)
+                    ?? throw new ArgumentInvalidException(nameof(item.IdWell), "idWell doesn`t exist");
 
-            return new WellFinalDocumentsHistoryDto { 
-                IdWell = idWell,
-                IdCategory = idCategory,
-                Files = files
-            };
-        }
-
-        ///<inheritdoc/>
-        public async Task<int> ReNotifyPublishersAsync(int idWell, int idUser, int idCategory, CancellationToken token)
-        {
-            var wellCase = await wellFinalDocumentsRepository.GetByWellIdAsync(idWell, idUser, token);
-
-            if (!wellCase.PermissionToSetPubliher)
-                throw new ForbidException("Повторная отправка оповещений Вам не разрешена");
-
-            var requester = await userRepository.GetOrDefaultAsync(idUser, token);
-            if (requester is null)
-                throw new ForbidException("Не удается вас опознать");
-
-            var docs = wellCase.WellFinalDocuments
-                .Where(doc => doc.IdCategory == idCategory)
-                .Where(doc => doc.File is null)
-                .SelectMany(doc => doc.Publishers
-                    .Select(pub => new WellFinalDocumentDBDto { 
-                        IdCategory = idCategory,
-                        IdUser = pub.Id,
-                        IdWell = idWell
-                    }));
-
-            if(!docs.Any())
-                throw new ArgumentInvalidException(nameof(idCategory), "Нет такой категории, или в нее уже загружен документ");
-
-            var message = requester.MakeDisplayName() + " ожидает от Вас загрузку на портал документа «{{0}}»";
-            await NotifyUsersAsync(docs, message, token);
-
-            return docs.Count();
-        }
-
-        private async Task NotifyUsersAsync(IEnumerable<WellFinalDocumentDBDto> dtos, string message, CancellationToken token)
-        {
-            foreach (var item in dtos)
-            {
-                var user = await userRepository.GetOrDefaultAsync(item.IdUser, token);
-                if (user?.Email is not null)
-                {
-                    var category = await fileCategoryService.GetOrDefaultAsync(item.IdCategory, token);
-                    var well = await wellService.GetOrDefaultAsync(item.IdWell, token)
-                        ?? throw new ArgumentInvalidException(nameof(item.IdWell), "idWell doesn`t exist");
-
-                    await SendMessageAsync(well, user, category?.Name ?? string.Empty, message,
-                        token);
-                }
+                await SendMessageAsync(well, user, category?.Name ?? string.Empty, message,
+                    token);
             }
         }
-
-        private async Task SendMessageAsync(WellDto well, UserDto user, string documentCategory, string message, 
-            CancellationToken cancellationToken)
-        {
-            const int idTransportType = 1;
-            
-            var factory = new WellFinalDocumentMailBodyFactory(configuration);
-            var subject = factory.MakeSubject(well, documentCategory);
-
-            var body = factory.MakeMailBodyForWellFinalDocument(
-                well,
-                (user.Name ?? user.Surname ?? string.Empty),
-                string.Format(message, documentCategory)
-            );
-
-            await notificationService.NotifyAsync(new NotifyRequest
-            {
-                IdUser = user.Id,
-                IdNotificationCategory = NotificationCategory.IdSystemNotificationCategory,
-                Title = subject,
-                Message = body,
-                IdTransportType = idTransportType
-            }, cancellationToken);
-        }
     }
 
+    private async Task SendMessageAsync(WellDto well, UserDto user, string documentCategory, string message, 
+        CancellationToken cancellationToken)
+    {
+        const int idTransportType = 1;
+        
+        var factory = new WellFinalDocumentMailBodyFactory(configuration);
+        var subject = factory.MakeSubject(well, documentCategory);
+
+        var body = factory.MakeMailBodyForWellFinalDocument(
+            well,
+            (user.Name ?? user.Surname ?? string.Empty),
+            string.Format(message, documentCategory)
+        );
+
+        await notificationService.NotifyAsync(new NotifyRequest
+        {
+            IdUser = user.Id,
+            IdNotificationCategory = NotificationCategory.IdSystemNotificationCategory,
+            Title = subject,
+            Message = body,
+            IdTransportType = idTransportType
+        }, cancellationToken);
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/WellOperationService/Race.cs b/AsbCloudInfrastructure/Services/WellOperationService/Race.cs
index e50ef9a9..0de9b26a 100644
--- a/AsbCloudInfrastructure/Services/WellOperationService/Race.cs
+++ b/AsbCloudInfrastructure/Services/WellOperationService/Race.cs
@@ -3,65 +3,63 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AsbCloudInfrastructure.Services.WellOperationService
+namespace AsbCloudInfrastructure.Services.WellOperationService;
+
+
+class Race
 {
+    /// <summary>
+    /// Дата начала рейса
+    /// </summary>
+    public DateTime StartDate { get; set; }
 
-    class Race
-    {
-        /// <summary>
-        /// Дата начала рейса
-        /// </summary>
-        public DateTime StartDate { get; set; }
+    /// <summary>
+    /// Глубина начала рейса, м
+    /// </summary>
+    public double StartWellDepth { get; set; }
 
-        /// <summary>
-        /// Глубина начала рейса, м
-        /// </summary>
-        public double StartWellDepth { get; set; }
+    /// <summary>
+    /// Дата окончания рейса
+    /// </summary>
+    public DateTime EndDate { get; set; }
 
-        /// <summary>
-        /// Дата окончания рейса
-        /// </summary>
-        public DateTime EndDate { get; set; }
+    /// <summary>
+    /// Глубина окончания рейса, м
+    /// </summary>
+    public double EndWellDepth { get; set; }
 
-        /// <summary>
-        /// Глубина окончания рейса, м
-        /// </summary>
-        public double EndWellDepth { get; set; }
+    /// <summary>
+    /// Время рейса, часы
+    /// </summary>
+    public double DrillingTime { get; set; }
 
-        /// <summary>
-        /// Время рейса, часы
-        /// </summary>
-        public double DrillingTime { get; set; }
+    /// <summary>
+    /// Время НПВ, часы
+    /// </summary>
+    public double NonProductiveHours { get; set; }
 
-        /// <summary>
-        /// Время НПВ, часы
-        /// </summary>
-        public double NonProductiveHours { get; set; }
+    /// <summary>
+    /// Ремонт, часы
+    /// </summary>
+    public double RepairHours { get; set; }
 
-        /// <summary>
-        /// Ремонт, часы
-        /// </summary>
-        public double RepairHours { get; set; }
+    /// <summary>
+    /// проходка за рейс, м
+    /// </summary>
+    public double DeltaDepth => EndWellDepth - StartWellDepth;
 
-        /// <summary>
-        /// проходка за рейс, м
-        /// </summary>
-        public double DeltaDepth => EndWellDepth - StartWellDepth;
-
-        /// <summary>
-        /// Полное время рейса, часы
-        /// </summary>
-        public double DeltaHours => (EndDate - StartDate).TotalHours;
-
-        /// <summary>
-        /// Скорость за рейс, м/час
-        /// </summary>
-        public double Speed => DeltaDepth / (DeltaHours - NonProductiveHours - RepairHours + double.Epsilon);
-        
-        /// <summary>
-        /// Список операций за рейс
-        /// </summary>
-        public List<WellOperation> Operations { get; internal set; } = new List<WellOperation>();
-    }
+    /// <summary>
+    /// Полное время рейса, часы
+    /// </summary>
+    public double DeltaHours => (EndDate - StartDate).TotalHours;
 
+    /// <summary>
+    /// Скорость за рейс, м/час
+    /// </summary>
+    public double Speed => DeltaDepth / (DeltaHours - NonProductiveHours - RepairHours + double.Epsilon);
+    
+    /// <summary>
+    /// Список операций за рейс
+    /// </summary>
+    public List<WellOperation> Operations { get; internal set; } = new List<WellOperation>();
 }
diff --git a/AsbCloudInfrastructure/Services/WellOperationService/ScheduleReportService.cs b/AsbCloudInfrastructure/Services/WellOperationService/ScheduleReportService.cs
index aee3c9d1..2b053e03 100644
--- a/AsbCloudInfrastructure/Services/WellOperationService/ScheduleReportService.cs
+++ b/AsbCloudInfrastructure/Services/WellOperationService/ScheduleReportService.cs
@@ -11,377 +11,375 @@ using System.Threading;
 using System.Threading.Tasks;
 using AsbCloudApp.Data.WellOperation;
 
-namespace AsbCloudInfrastructure.Services.WellOperationService
+namespace AsbCloudInfrastructure.Services.WellOperationService;
+
+public class ScheduleReportService : IScheduleReportService
 {
-    public class ScheduleReportService : IScheduleReportService
+    private readonly IWellOperationService wellOperationService;
+    private readonly IWellService wellService;
+    const string sheetNameSchedule = "Сетевой график";
+    const string sheetNameSchedulePlan = "План";
+    const string sheetNameScheduleFact = "Факт";
+    const string sheetNameSchedulePrediction = "Прогноз";
+    const string sheetNameTvd = "ГГД";
+    const int maxChartsToWrap = 88;
+
+    public ScheduleReportService(IWellOperationService wellOperationService, IWellService wellService)
     {
-        private readonly IWellOperationService wellOperationService;
-        private readonly IWellService wellService;
-        const string sheetNameSchedule = "Сетевой график";
-        const string sheetNameSchedulePlan = "План";
-        const string sheetNameScheduleFact = "Факт";
-        const string sheetNameSchedulePrediction = "Прогноз";
-        const string sheetNameTvd = "ГГД";
-        const int maxChartsToWrap = 88;
+        this.wellOperationService = wellOperationService;
+        this.wellService = wellService;
+    }
 
-        public ScheduleReportService(IWellOperationService wellOperationService, IWellService wellService)
+    public async Task<Stream> MakeReportAsync(int idWell, CancellationToken token = default)
+    {
+        var tvd = await wellOperationService.GetTvdAsync(idWell, token);
+
+        var well = await wellService.GetOrDefaultAsync(idWell, token)
+            ?? throw new ArgumentInvalidException(nameof(idWell), "idWell doesn`t exist");
+
+        var ecxelTemplateStream = GetExcelTemplateStream();
+        using var workbook = new XLWorkbook(ecxelTemplateStream);
+        FillScheduleSheetToWorkbook(workbook, tvd, well);
+        FillTvdSheetToWorkbook(workbook, tvd, well);
+        MemoryStream memoryStream = new MemoryStream();
+        workbook.SaveAs(memoryStream, new SaveOptions { });
+        memoryStream.Seek(0, SeekOrigin.Begin);
+        return memoryStream;
+    }
+
+    private static void FillScheduleSheetToWorkbook(XLWorkbook workbook, IEnumerable<PlanFactPredictBase<WellOperationDto>> tvd, WellDto well)
+    {
+        FillScheduleSheet(workbook, tvd, well);
+
+        var tvdList = tvd.ToList();
+        var plans = tvd
+            .Where(t => t.Plan is not null)
+            .Select(t => t.Plan!)
+            .OrderBy(t => t.DateStart);
+        FillCurrentScheduleSheet(workbook, plans, sheetNameSchedulePlan);
+
+        var facts = tvd
+           .Where(t => t.Fact is not null)
+           .Select(t => t.Fact!)
+           .OrderBy(t => t.DateStart);
+        FillCurrentScheduleSheet(workbook, facts, sheetNameScheduleFact);
+
+        var predictions = tvd
+           .Where(t => t.Predict is not null)
+           .Select(t => t.Predict!)
+           .OrderBy(t => t.DateStart);
+        FillCurrentScheduleSheet(workbook, predictions, sheetNameSchedulePrediction);
+    }
+
+    private static void FillCurrentScheduleSheet(XLWorkbook workbook, IEnumerable<WellOperationDto> tvdList, string sheetName)
+    {
+        var sheet = workbook.GetWorksheet(sheetName);
+
+        const int headerRowsCount = 6;
+
+        const int columnRowNumber = 2;
+        const int columnCaption = 3;
+        const int columnWellDepthStart = 4;
+        const int columnWellDepthEnd = 5;
+        const int columnDuration = 6;
+        const int columnDateStart = 7;
+        const int columnDateEnd = 8;
+
+        int i = 1;
+        foreach (var tvdItem in tvdList)
         {
-            this.wellOperationService = wellOperationService;
-            this.wellService = wellService;
-        }
-
-        public async Task<Stream> MakeReportAsync(int idWell, CancellationToken token = default)
-        {
-            var tvd = await wellOperationService.GetTvdAsync(idWell, token);
-
-            var well = await wellService.GetOrDefaultAsync(idWell, token)
-                ?? throw new ArgumentInvalidException(nameof(idWell), "idWell doesn`t exist");
-
-            var ecxelTemplateStream = GetExcelTemplateStream();
-            using var workbook = new XLWorkbook(ecxelTemplateStream);
-            FillScheduleSheetToWorkbook(workbook, tvd, well);
-            FillTvdSheetToWorkbook(workbook, tvd, well);
-            MemoryStream memoryStream = new MemoryStream();
-            workbook.SaveAs(memoryStream, new SaveOptions { });
-            memoryStream.Seek(0, SeekOrigin.Begin);
-            return memoryStream;
-        }
-
-        private static void FillScheduleSheetToWorkbook(XLWorkbook workbook, IEnumerable<PlanFactPredictBase<WellOperationDto>> tvd, WellDto well)
-        {
-            FillScheduleSheet(workbook, tvd, well);
-
-            var tvdList = tvd.ToList();
-            var plans = tvd
-                .Where(t => t.Plan is not null)
-                .Select(t => t.Plan!)
-                .OrderBy(t => t.DateStart);
-            FillCurrentScheduleSheet(workbook, plans, sheetNameSchedulePlan);
-
-            var facts = tvd
-               .Where(t => t.Fact is not null)
-               .Select(t => t.Fact!)
-               .OrderBy(t => t.DateStart);
-            FillCurrentScheduleSheet(workbook, facts, sheetNameScheduleFact);
-
-            var predictions = tvd
-               .Where(t => t.Predict is not null)
-               .Select(t => t.Predict!)
-               .OrderBy(t => t.DateStart);
-            FillCurrentScheduleSheet(workbook, predictions, sheetNameSchedulePrediction);
-        }
-
-        private static void FillCurrentScheduleSheet(XLWorkbook workbook, IEnumerable<WellOperationDto> tvdList, string sheetName)
-        {
-            var sheet = workbook.GetWorksheet(sheetName);
-
-            const int headerRowsCount = 6;
-
-            const int columnRowNumber = 2;
-            const int columnCaption = 3;
-            const int columnWellDepthStart = 4;
-            const int columnWellDepthEnd = 5;
-            const int columnDuration = 6;
-            const int columnDateStart = 7;
-            const int columnDateEnd = 8;
-
-            int i = 1;
-            foreach (var tvdItem in tvdList)
-            {
-                var row = sheet.Row(i + headerRowsCount);
-                SetCell(row, columnRowNumber, $"{i}");
-                SetCell(row, columnCaption, $"{tvdItem.OperationCategoryName} {tvdItem.CategoryInfo}".Trim());
-                SetCell(row, columnWellDepthStart, tvdItem.DepthStart);
-                SetCell(row, columnWellDepthEnd, tvdItem.DepthEnd);
-                SetCell(row, columnDuration, tvdItem.DurationHours);
-                SetCell(row, columnDateStart, tvdItem.DateStart);
-                SetCell(row, columnDateEnd, tvdItem.DateStart.AddHours(tvdItem.DurationHours));
-                i++;
-            }
-        }
-
-        private static void FillScheduleSheet(XLWorkbook workbook, IEnumerable<PlanFactPredictBase<WellOperationDto>> tvd, WellDto well)
-        {
-            var sheet = workbook.GetWorksheet(sheetNameSchedule);
-
-            const int headerRowsCount = 6;
-            const int rowTitle = 3;
-
-            const int columnRowNumber = 2;
-            const int columnCaption = 3;
-            const int columnWellDepthStartPlan = 4;
-            const int columnWellDepthStartFact = 5;
-            const int columnWellDepthStartPredict = 6;
-            const int columnWellDepthEndPlan = 7;
-            const int columnWellDepthEndFact = 8;
-            const int columnWellDepthEndPredict = 9;
-            const int columnDeltaWellDepthPerDay = 10;
-            const int columnDurationPlan = 11;
-            const int columnDurationFact = 12;
-            const int columnDurationPredict = 13;
-            const int columnDateStartPlan = 14;
-            const int columnDateStartFact = 15;
-            const int columnDateStartPredict = 16;
-            const int columnDateEndPlan = 17;
-            const int columnDateEndFact = 18;
-            const int columnDateEndPredict = 19;
-            const int columnGuilty = 20;
-            const int columnNpt = 21;
-
-            var subTitle = $"на строительство скважины №{well.Caption}, куст: {well.Cluster}, м/р: {well.Deposit}";
-            sheet.Row(rowTitle).Cell(3).SetCellValue(subTitle);
-
-            var tvdList = tvd.ToList();
-            var facts = tvd
-                .Where(t => t.Fact is not null)
-                .Select(t => t.Fact!)
-                .ToList();
-
-            DateTimeOffset lastFactDate = default;
-            var lastFactI = 0;
-
-            int i = 0;
-            for (; i < tvdList.Count; i++)
-            {
-                var tvdItem = tvdList[i];
-                var operation = tvdItem.Fact ?? tvdItem.Plan;
-                if (operation is null)
-                    continue;
-
-                var row = sheet.Row(1 + i + headerRowsCount);
-
-                SetCell(row, columnRowNumber, $"{1 + i}");
-                SetCell(row, columnCaption, $"{operation.OperationCategoryName} {operation.CategoryInfo}".Trim());
-
-                SetCell(row, columnWellDepthStartPlan, tvdItem.Plan?.DepthStart);
-                SetCell(row, columnWellDepthStartFact, tvdItem.Fact?.DepthStart);
-                SetCell(row, columnWellDepthStartPredict, tvdItem.Predict?.DepthStart);
-
-                SetCell(row, columnWellDepthEndPlan, tvdItem.Plan?.DepthEnd);
-                SetCell(row, columnWellDepthEndFact, tvdItem.Fact?.DepthEnd);
-                SetCell(row, columnWellDepthEndPredict, tvdItem.Predict?.DepthEnd);
-
-                SetCell(row, columnDeltaWellDepthPerDay, null);
-                if (tvdItem.Fact is not null)
-                {
-                    var fact = tvdItem.Fact;
-                    if (lastFactDate == default)
-                        lastFactDate = fact.DateStart;
-
-                    if (i > 0 && fact.DateStart.DayOfYear != lastFactDate.DayOfYear)
-                    {
-                        var daylyOperations = facts
-                            .Where(t => t.DateStart >= lastFactDate && t.DateStart < fact.DateStart);
-                        if (daylyOperations.Any())
-                        {
-                            var depthDayStart = daylyOperations.Min(o => o.DepthStart);
-                            var depthDayEnd = daylyOperations.Max(o => o.DepthEnd);
-                            var delta = depthDayEnd - depthDayStart;
-                            SetCell(sheet.Row(1 + lastFactI + headerRowsCount), columnDeltaWellDepthPerDay, delta);
-                            lastFactDate = fact.DateStart;
-                        }
-                    }
-                    lastFactI = i;
-                }
-
-                SetCell(row, columnDurationPlan, tvdItem.Plan?.DurationHours);
-                SetCell(row, columnDurationFact, tvdItem.Fact?.DurationHours);
-                SetCell(row, columnDurationPredict, tvdItem.Predict?.DurationHours);
-
-                SetCell(row, columnDateStartPlan, tvdItem.Plan?.DateStart);
-                SetCell(row, columnDateStartFact, tvdItem.Fact?.DateStart);
-                SetCell(row, columnDateStartPredict, tvdItem.Predict?.DateStart);
-
-                SetCell(row, columnDateEndPlan, tvdItem.Plan?.DateStart.AddHours(tvdItem.Plan?.DurationHours ?? 0));
-                SetCell(row, columnDateEndFact, tvdItem.Fact?.DateStart.AddHours(tvdItem.Fact?.DurationHours ?? 0));
-                SetCell(row, columnDateEndPredict, tvdItem.Predict?.DateStart.AddHours(tvdItem.Predict?.DurationHours ?? 0));
-
-                if (tvdItem.Fact is not null && WellOperationCategory.NonProductiveTimeSubIds.Contains(tvdItem.Fact.IdCategory))
-                {
-                    SetCell(row, columnGuilty, tvdItem.Fact.Comment);
-                    SetCell(row, columnNpt, tvdItem.Fact.DurationHours);
-                    row.Row(columnRowNumber, columnNpt).Style.Fill.BackgroundColor = XLColor.Red;
-                }
-                else
-                {
-                    SetCell(row, columnGuilty, null);
-                    SetCell(row, columnNpt, null);
-                }
-            }
-
-            var rowNumSummary = 1 + i + headerRowsCount;
-            var rowNumStart = 1 + headerRowsCount;
-            var rowNumEnd = i + headerRowsCount;
-
-            string MakeRangeFunction(string funcName, int column)
-                => $"={funcName}({GetColunmLetter(column)}{rowNumStart}:{GetColunmLetter(column)}{rowNumEnd})";
-
-            IXLCell AddRangeFormula(IXLRow row, string funcName, int column)
-            {
-                var cell = row.Cell(column);
-                cell.FormulaA1 = MakeRangeFunction(funcName, column);
-                return cell;
-            }
-
-            var rowSummary = sheet.Row(rowNumSummary);
-            rowSummary.Style.Font.Bold = true;
-            rowSummary.Cell(columnCaption).SetCellValue("Итого:");
-
-            AddRangeFormula(rowSummary, "sum", columnDeltaWellDepthPerDay);
-            AddRangeFormula(rowSummary, "sum", columnDurationPlan);
-            AddRangeFormula(rowSummary, "sum", columnDurationFact);
-            var cell = AddRangeFormula(rowSummary, "max", columnDateEndPlan);
-            SetDateTime(cell);
-            cell = AddRangeFormula(rowSummary, "max", columnDateEndFact);
-            SetDateTime(cell);
-            AddRangeFormula(rowSummary, "sum", columnNpt);
-            SetBorder(rowSummary.Cells(true).Style);
-
-            var rowSummary2 = sheet.Row(rowNumSummary + 1);
-            rowSummary2.Style.NumberFormat.Format = "0,00";
-            rowSummary2.Cell(columnCaption).SetCellValue("в сутках:");
-            rowSummary2.Cell(columnDurationPlan).FormulaA1 = $"={GetColunmLetter(columnDurationPlan)}{rowNumSummary}/24";
-            SetNumber(rowSummary2.Cell(columnDurationPlan));
-            rowSummary2.Cell(columnDurationFact).FormulaA1 = $"={GetColunmLetter(columnDurationFact)}{rowNumSummary}/24";
-            SetNumber(rowSummary2.Cell(columnDurationFact));
-            rowSummary2.Cell(columnNpt).FormulaA1 = $"={GetColunmLetter(columnNpt)}{rowNumSummary}/24";
-            SetNumber(rowSummary2.Cell(columnNpt));
-            SetBorder(rowSummary2.Cells(true).Style);
-        }
-
-        private static void FillTvdSheetToWorkbook(XLWorkbook workbook, IEnumerable<PlanFactPredictBase<WellOperationDto>> tvd, WellDto well)
-        {
-            var sheet = workbook.GetWorksheet(sheetNameTvd);
-
-            const int rowTitle = 2;
-            const int rowSubtitle = 3;
-            const int colTitle = 5;
-
-            const int rowTopStatTitle = 2;
-            const int colTopStatvalue = 10;
-
-            const int colBottomStatvalue = 3;
-            const int rowStartDateFact = 43;
-            const int rowEndDatePlan = 44;
-            const int rowEndDateFact = 45;
-
-            sheet.Row(rowSubtitle).Cell(colTitle).Value
-                = $"скважины №{well.Caption}, куст: {well.Cluster}, м/р: {well.Deposit}";
-
-            SetCell(sheet.Row(rowTitle), colTopStatvalue, DateTime.Now);
-
-            var Plan = tvd.Where(t => t.Plan is not null)
-                .Select(t => t.Plan);
-            var Fact = tvd.Where(t => t.Fact is not null)
-                .Select(t => t.Fact);
-            var Predict = tvd.Where(t => t.Predict is not null)
-                .Select(t => t.Predict);
-
-            var startDateFact = Fact.FirstOrDefault()?.DateStart;
-            var planLast = Plan.LastOrDefault();
-            var factLast = Fact.LastOrDefault();
-            var predictLast = Predict.LastOrDefault();
-
-            static DateTime GetEndDate(WellOperationDto operation)
-                => operation is not null
-                ? operation.DateStart.Date.AddHours(operation.DurationHours)
-                : default;
-
-            var endDatePlan = planLast is not null ? GetEndDate(planLast) : default;
-            var endDateFact = factLast is not null ? GetEndDate(factLast) : default;
-            var endDatePredict = predictLast is not null ? GetEndDate(predictLast) : default;
-
-            var endDate = endDatePredict > endDateFact
-                ? endDatePredict
-                : endDateFact;
-
-            if (startDateFact is not null)
-            {
-                SetCell(sheet.Row(rowStartDateFact), colBottomStatvalue, startDateFact);
-                SetCell(sheet.Row(rowEndDatePlan), colBottomStatvalue, endDatePlan);
-                SetCell(sheet.Row(rowEndDateFact), colBottomStatvalue, endDate);
-                if (endDate != default)
-                {
-                    var deltaEndDate = (endDatePlan - endDate).TotalDays;
-                    SetCell(sheet.Row(rowTopStatTitle + 1), colTopStatvalue, Math.Abs(deltaEndDate));
-                    if (deltaEndDate >= 0)
-                        SetCell(sheet.Row(rowTopStatTitle + 1), colTopStatvalue - 1, "+")
-                            .Style.Font.SetFontColor(XLColor.Green);
-                    else
-                        SetCell(sheet.Row(rowTopStatTitle + 1), colTopStatvalue - 1, "-")
-                                .Style.Font.SetFontColor(XLColor.Red);
-                }
-            }
-        }
-
-        private static string GetColunmLetter(int columnNumber)
-        {
-            string letter = "";
-
-            while (columnNumber > 0)
-            {
-                int modulo = (columnNumber - 1) % 26;
-                letter = Convert.ToChar('A' + modulo) + letter;
-                columnNumber = (columnNumber - modulo) / 26;
-            }
-
-            return letter;
-        }
-
-        private static IXLStyle SetBorder(IXLStyle style)
-        {
-            style.Border.RightBorder = XLBorderStyleValues.Thin;
-            style.Border.LeftBorder = XLBorderStyleValues.Thin;
-            style.Border.TopBorder = XLBorderStyleValues.Thin;
-            style.Border.BottomBorder = XLBorderStyleValues.Thin;
-            style.Border.InsideBorder = XLBorderStyleValues.Thin;
-            return style;
-        }
-
-        private static IXLCell SetDateTime(IXLCell cell)
-        {
-            cell.Style.DateFormat.Format = "DD.MM.YYYY HH:MM:SS";
-            return cell;
-        }
-
-        private static IXLCell SetNumber(IXLCell cell)
-        {
-            cell.Style.NumberFormat.Format = "0.00";
-            return cell;
-        }
-
-        private static IXLCell SetCell(IXLRow row, int colunm, object? value)
-        {
-            var cell = row.Cell(colunm);
-            cell.SetCellValue(value);
-
-            SetBorder(cell.Style);
-            cell.Style.Alignment.WrapText = true;
-
-            if (value is string valueString && valueString.Length > maxChartsToWrap)
-            {
-                var baseHeight = row.Height;
-                row.Height = 0.82d * baseHeight * Math.Ceiling(1d + valueString.Length / maxChartsToWrap);
-            }
-
-            if (value is DateTime)
-            {
-                SetDateTime(cell);
-            }
-            else if (value is IFormattable)
-            {
-                SetNumber(cell);
-            }
-
-            return cell;
-        }
-
-        private static Stream GetExcelTemplateStream()
-        {
-            var stream = System.Reflection.Assembly.GetExecutingAssembly()
-                .GetManifestResourceStream("AsbCloudInfrastructure.Services.WellOperationService.ScheduleReportTemplate.xlsx")!;
-            return stream;
+            var row = sheet.Row(i + headerRowsCount);
+            SetCell(row, columnRowNumber, $"{i}");
+            SetCell(row, columnCaption, $"{tvdItem.OperationCategoryName} {tvdItem.CategoryInfo}".Trim());
+            SetCell(row, columnWellDepthStart, tvdItem.DepthStart);
+            SetCell(row, columnWellDepthEnd, tvdItem.DepthEnd);
+            SetCell(row, columnDuration, tvdItem.DurationHours);
+            SetCell(row, columnDateStart, tvdItem.DateStart);
+            SetCell(row, columnDateEnd, tvdItem.DateStart.AddHours(tvdItem.DurationHours));
+            i++;
         }
     }
 
+    private static void FillScheduleSheet(XLWorkbook workbook, IEnumerable<PlanFactPredictBase<WellOperationDto>> tvd, WellDto well)
+    {
+        var sheet = workbook.GetWorksheet(sheetNameSchedule);
+
+        const int headerRowsCount = 6;
+        const int rowTitle = 3;
+
+        const int columnRowNumber = 2;
+        const int columnCaption = 3;
+        const int columnWellDepthStartPlan = 4;
+        const int columnWellDepthStartFact = 5;
+        const int columnWellDepthStartPredict = 6;
+        const int columnWellDepthEndPlan = 7;
+        const int columnWellDepthEndFact = 8;
+        const int columnWellDepthEndPredict = 9;
+        const int columnDeltaWellDepthPerDay = 10;
+        const int columnDurationPlan = 11;
+        const int columnDurationFact = 12;
+        const int columnDurationPredict = 13;
+        const int columnDateStartPlan = 14;
+        const int columnDateStartFact = 15;
+        const int columnDateStartPredict = 16;
+        const int columnDateEndPlan = 17;
+        const int columnDateEndFact = 18;
+        const int columnDateEndPredict = 19;
+        const int columnGuilty = 20;
+        const int columnNpt = 21;
+
+        var subTitle = $"на строительство скважины №{well.Caption}, куст: {well.Cluster}, м/р: {well.Deposit}";
+        sheet.Row(rowTitle).Cell(3).SetCellValue(subTitle);
+
+        var tvdList = tvd.ToList();
+        var facts = tvd
+            .Where(t => t.Fact is not null)
+            .Select(t => t.Fact!)
+            .ToList();
+
+        DateTimeOffset lastFactDate = default;
+        var lastFactI = 0;
+
+        int i = 0;
+        for (; i < tvdList.Count; i++)
+        {
+            var tvdItem = tvdList[i];
+            var operation = tvdItem.Fact ?? tvdItem.Plan;
+            if (operation is null)
+                continue;
+
+            var row = sheet.Row(1 + i + headerRowsCount);
+
+            SetCell(row, columnRowNumber, $"{1 + i}");
+            SetCell(row, columnCaption, $"{operation.OperationCategoryName} {operation.CategoryInfo}".Trim());
+
+            SetCell(row, columnWellDepthStartPlan, tvdItem.Plan?.DepthStart);
+            SetCell(row, columnWellDepthStartFact, tvdItem.Fact?.DepthStart);
+            SetCell(row, columnWellDepthStartPredict, tvdItem.Predict?.DepthStart);
+
+            SetCell(row, columnWellDepthEndPlan, tvdItem.Plan?.DepthEnd);
+            SetCell(row, columnWellDepthEndFact, tvdItem.Fact?.DepthEnd);
+            SetCell(row, columnWellDepthEndPredict, tvdItem.Predict?.DepthEnd);
+
+            SetCell(row, columnDeltaWellDepthPerDay, null);
+            if (tvdItem.Fact is not null)
+            {
+                var fact = tvdItem.Fact;
+                if (lastFactDate == default)
+                    lastFactDate = fact.DateStart;
+
+                if (i > 0 && fact.DateStart.DayOfYear != lastFactDate.DayOfYear)
+                {
+                    var daylyOperations = facts
+                        .Where(t => t.DateStart >= lastFactDate && t.DateStart < fact.DateStart);
+                    if (daylyOperations.Any())
+                    {
+                        var depthDayStart = daylyOperations.Min(o => o.DepthStart);
+                        var depthDayEnd = daylyOperations.Max(o => o.DepthEnd);
+                        var delta = depthDayEnd - depthDayStart;
+                        SetCell(sheet.Row(1 + lastFactI + headerRowsCount), columnDeltaWellDepthPerDay, delta);
+                        lastFactDate = fact.DateStart;
+                    }
+                }
+                lastFactI = i;
+            }
+
+            SetCell(row, columnDurationPlan, tvdItem.Plan?.DurationHours);
+            SetCell(row, columnDurationFact, tvdItem.Fact?.DurationHours);
+            SetCell(row, columnDurationPredict, tvdItem.Predict?.DurationHours);
+
+            SetCell(row, columnDateStartPlan, tvdItem.Plan?.DateStart);
+            SetCell(row, columnDateStartFact, tvdItem.Fact?.DateStart);
+            SetCell(row, columnDateStartPredict, tvdItem.Predict?.DateStart);
+
+            SetCell(row, columnDateEndPlan, tvdItem.Plan?.DateStart.AddHours(tvdItem.Plan?.DurationHours ?? 0));
+            SetCell(row, columnDateEndFact, tvdItem.Fact?.DateStart.AddHours(tvdItem.Fact?.DurationHours ?? 0));
+            SetCell(row, columnDateEndPredict, tvdItem.Predict?.DateStart.AddHours(tvdItem.Predict?.DurationHours ?? 0));
+
+            if (tvdItem.Fact is not null && WellOperationCategory.NonProductiveTimeSubIds.Contains(tvdItem.Fact.IdCategory))
+            {
+                SetCell(row, columnGuilty, tvdItem.Fact.Comment);
+                SetCell(row, columnNpt, tvdItem.Fact.DurationHours);
+                row.Row(columnRowNumber, columnNpt).Style.Fill.BackgroundColor = XLColor.Red;
+            }
+            else
+            {
+                SetCell(row, columnGuilty, null);
+                SetCell(row, columnNpt, null);
+            }
+        }
+
+        var rowNumSummary = 1 + i + headerRowsCount;
+        var rowNumStart = 1 + headerRowsCount;
+        var rowNumEnd = i + headerRowsCount;
+
+        string MakeRangeFunction(string funcName, int column)
+            => $"={funcName}({GetColunmLetter(column)}{rowNumStart}:{GetColunmLetter(column)}{rowNumEnd})";
+
+        IXLCell AddRangeFormula(IXLRow row, string funcName, int column)
+        {
+            var cell = row.Cell(column);
+            cell.FormulaA1 = MakeRangeFunction(funcName, column);
+            return cell;
+        }
+
+        var rowSummary = sheet.Row(rowNumSummary);
+        rowSummary.Style.Font.Bold = true;
+        rowSummary.Cell(columnCaption).SetCellValue("Итого:");
+
+        AddRangeFormula(rowSummary, "sum", columnDeltaWellDepthPerDay);
+        AddRangeFormula(rowSummary, "sum", columnDurationPlan);
+        AddRangeFormula(rowSummary, "sum", columnDurationFact);
+        var cell = AddRangeFormula(rowSummary, "max", columnDateEndPlan);
+        SetDateTime(cell);
+        cell = AddRangeFormula(rowSummary, "max", columnDateEndFact);
+        SetDateTime(cell);
+        AddRangeFormula(rowSummary, "sum", columnNpt);
+        SetBorder(rowSummary.Cells(true).Style);
+
+        var rowSummary2 = sheet.Row(rowNumSummary + 1);
+        rowSummary2.Style.NumberFormat.Format = "0,00";
+        rowSummary2.Cell(columnCaption).SetCellValue("в сутках:");
+        rowSummary2.Cell(columnDurationPlan).FormulaA1 = $"={GetColunmLetter(columnDurationPlan)}{rowNumSummary}/24";
+        SetNumber(rowSummary2.Cell(columnDurationPlan));
+        rowSummary2.Cell(columnDurationFact).FormulaA1 = $"={GetColunmLetter(columnDurationFact)}{rowNumSummary}/24";
+        SetNumber(rowSummary2.Cell(columnDurationFact));
+        rowSummary2.Cell(columnNpt).FormulaA1 = $"={GetColunmLetter(columnNpt)}{rowNumSummary}/24";
+        SetNumber(rowSummary2.Cell(columnNpt));
+        SetBorder(rowSummary2.Cells(true).Style);
+    }
+
+    private static void FillTvdSheetToWorkbook(XLWorkbook workbook, IEnumerable<PlanFactPredictBase<WellOperationDto>> tvd, WellDto well)
+    {
+        var sheet = workbook.GetWorksheet(sheetNameTvd);
+
+        const int rowTitle = 2;
+        const int rowSubtitle = 3;
+        const int colTitle = 5;
+
+        const int rowTopStatTitle = 2;
+        const int colTopStatvalue = 10;
+
+        const int colBottomStatvalue = 3;
+        const int rowStartDateFact = 43;
+        const int rowEndDatePlan = 44;
+        const int rowEndDateFact = 45;
+
+        sheet.Row(rowSubtitle).Cell(colTitle).Value
+            = $"скважины №{well.Caption}, куст: {well.Cluster}, м/р: {well.Deposit}";
+
+        SetCell(sheet.Row(rowTitle), colTopStatvalue, DateTime.Now);
+
+        var Plan = tvd.Where(t => t.Plan is not null)
+            .Select(t => t.Plan);
+        var Fact = tvd.Where(t => t.Fact is not null)
+            .Select(t => t.Fact);
+        var Predict = tvd.Where(t => t.Predict is not null)
+            .Select(t => t.Predict);
+
+        var startDateFact = Fact.FirstOrDefault()?.DateStart;
+        var planLast = Plan.LastOrDefault();
+        var factLast = Fact.LastOrDefault();
+        var predictLast = Predict.LastOrDefault();
+
+        static DateTime GetEndDate(WellOperationDto operation)
+            => operation is not null
+            ? operation.DateStart.Date.AddHours(operation.DurationHours)
+            : default;
+
+        var endDatePlan = planLast is not null ? GetEndDate(planLast) : default;
+        var endDateFact = factLast is not null ? GetEndDate(factLast) : default;
+        var endDatePredict = predictLast is not null ? GetEndDate(predictLast) : default;
+
+        var endDate = endDatePredict > endDateFact
+            ? endDatePredict
+            : endDateFact;
+
+        if (startDateFact is not null)
+        {
+            SetCell(sheet.Row(rowStartDateFact), colBottomStatvalue, startDateFact);
+            SetCell(sheet.Row(rowEndDatePlan), colBottomStatvalue, endDatePlan);
+            SetCell(sheet.Row(rowEndDateFact), colBottomStatvalue, endDate);
+            if (endDate != default)
+            {
+                var deltaEndDate = (endDatePlan - endDate).TotalDays;
+                SetCell(sheet.Row(rowTopStatTitle + 1), colTopStatvalue, Math.Abs(deltaEndDate));
+                if (deltaEndDate >= 0)
+                    SetCell(sheet.Row(rowTopStatTitle + 1), colTopStatvalue - 1, "+")
+                        .Style.Font.SetFontColor(XLColor.Green);
+                else
+                    SetCell(sheet.Row(rowTopStatTitle + 1), colTopStatvalue - 1, "-")
+                            .Style.Font.SetFontColor(XLColor.Red);
+            }
+        }
+    }
+
+    private static string GetColunmLetter(int columnNumber)
+    {
+        string letter = "";
+
+        while (columnNumber > 0)
+        {
+            int modulo = (columnNumber - 1) % 26;
+            letter = Convert.ToChar('A' + modulo) + letter;
+            columnNumber = (columnNumber - modulo) / 26;
+        }
+
+        return letter;
+    }
+
+    private static IXLStyle SetBorder(IXLStyle style)
+    {
+        style.Border.RightBorder = XLBorderStyleValues.Thin;
+        style.Border.LeftBorder = XLBorderStyleValues.Thin;
+        style.Border.TopBorder = XLBorderStyleValues.Thin;
+        style.Border.BottomBorder = XLBorderStyleValues.Thin;
+        style.Border.InsideBorder = XLBorderStyleValues.Thin;
+        return style;
+    }
+
+    private static IXLCell SetDateTime(IXLCell cell)
+    {
+        cell.Style.DateFormat.Format = "DD.MM.YYYY HH:MM:SS";
+        return cell;
+    }
+
+    private static IXLCell SetNumber(IXLCell cell)
+    {
+        cell.Style.NumberFormat.Format = "0.00";
+        return cell;
+    }
+
+    private static IXLCell SetCell(IXLRow row, int colunm, object? value)
+    {
+        var cell = row.Cell(colunm);
+        cell.SetCellValue(value);
+
+        SetBorder(cell.Style);
+        cell.Style.Alignment.WrapText = true;
+
+        if (value is string valueString && valueString.Length > maxChartsToWrap)
+        {
+            var baseHeight = row.Height;
+            row.Height = 0.82d * baseHeight * Math.Ceiling(1d + valueString.Length / maxChartsToWrap);
+        }
+
+        if (value is DateTime)
+        {
+            SetDateTime(cell);
+        }
+        else if (value is IFormattable)
+        {
+            SetNumber(cell);
+        }
+
+        return cell;
+    }
+
+    private static Stream GetExcelTemplateStream()
+    {
+        var stream = System.Reflection.Assembly.GetExecutingAssembly()
+            .GetManifestResourceStream("AsbCloudInfrastructure.Services.WellOperationService.ScheduleReportTemplate.xlsx")!;
+        return stream;
+    }
 }
diff --git a/AsbCloudInfrastructure/Services/WellService.cs b/AsbCloudInfrastructure/Services/WellService.cs
index baa51b14..ba29dc06 100644
--- a/AsbCloudInfrastructure/Services/WellService.cs
+++ b/AsbCloudInfrastructure/Services/WellService.cs
@@ -14,344 +14,342 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services
+namespace AsbCloudInfrastructure.Services;
+
+public class WellService : CrudCacheRepositoryBase<WellDto, Well>, IWellService
 {
-    public class WellService : CrudCacheRepositoryBase<WellDto, Well>, IWellService
+    private readonly ITelemetryService telemetryService;
+    private readonly ICrudRepository<CompanyTypeDto> companyTypesService;
+    private readonly ITimezoneService timezoneService;
+    private readonly WellInfoService wellInfoService;
+    private readonly IWellOperationRepository wellOperationRepository;
+
+    public ITelemetryService TelemetryService => telemetryService;
+
+    private static IQueryable<Well> MakeQueryWell(DbSet<Well> dbSet)
+        => dbSet
+            .Include(w => w.Cluster)
+                .ThenInclude(c => c.Deposit)
+            .Include(w => w.Telemetry)
+            .Include(w => w.WellType)
+            .Include(w => w.RelationCompaniesWells)
+            .ThenInclude(r => r.Company)
+            .AsNoTracking();
+
+    public WellService(IAsbCloudDbContext db,
+                       IMemoryCache memoryCache,
+                       ITelemetryService telemetryService,
+                       ITimezoneService timezoneService,
+                       WellInfoService wellInfoService,
+                       IWellOperationCategoryRepository wellOperationCategoryRepository)
+        : base(db, memoryCache, MakeQueryWell)
     {
-        private readonly ITelemetryService telemetryService;
-        private readonly ICrudRepository<CompanyTypeDto> companyTypesService;
-        private readonly ITimezoneService timezoneService;
-        private readonly WellInfoService wellInfoService;
-        private readonly IWellOperationRepository wellOperationRepository;
-
-        public ITelemetryService TelemetryService => telemetryService;
-
-        private static IQueryable<Well> MakeQueryWell(DbSet<Well> dbSet)
-            => dbSet
-                .Include(w => w.Cluster)
-                    .ThenInclude(c => c.Deposit)
-                .Include(w => w.Telemetry)
-                .Include(w => w.WellType)
-                .Include(w => w.RelationCompaniesWells)
-                .ThenInclude(r => r.Company)
-                .AsNoTracking();
-
-        public WellService(IAsbCloudDbContext db,
-                           IMemoryCache memoryCache,
-                           ITelemetryService telemetryService,
-                           ITimezoneService timezoneService,
-                           WellInfoService wellInfoService,
-                           IWellOperationCategoryRepository wellOperationCategoryRepository)
-            : base(db, memoryCache, MakeQueryWell)
-        {
-            this.telemetryService = telemetryService;
-            this.timezoneService = timezoneService;
-            this.wellInfoService = wellInfoService;
-            wellOperationRepository = new WellOperationRepository(db, memoryCache, wellOperationCategoryRepository, this);
-            companyTypesService = new CrudCacheRepositoryBase<CompanyTypeDto, CompanyType>(dbContext, memoryCache);
-        }
-
-        private Task<IEnumerable<RelationCompanyWell>> GetCacheRelationCompanyWellAsync(CancellationToken token)
-        {
-            return memoryCache.GetOrCreateBasicAsync(
-                dbContext.Set<RelationCompanyWell>()
-                    .Include(r => r.Company)
-                    .Include(r => r.Well)
-                , token);
-        }
-
-        private void DropCacheRelationCompanyWell()
-            => memoryCache.DropBasic<RelationCompanyWell>();
-
-        public DateTimeOffset GetLastTelemetryDate(int idWell)
-        {
-            var well = GetOrDefault(idWell);
-
-            if (well?.IdTelemetry is null)
-                return DateTimeOffset.MinValue;
-
-            var datesRange = telemetryService.GetDatesRange(well.IdTelemetry.Value);
-            return datesRange.To;
-        }
-
-        /// <inheritdoc/>
-        public async Task<IEnumerable<DepositBranchDto>> GetWellTreeAsync(int idCompany, CancellationToken token)
-        {
-            var wells = await GetEntitiesAsync(new() { IdCompany = idCompany }, token);
-
-            var groupedWells = wells
-                .GroupBy(w => w.Cluster)
-                .GroupBy(g => g.Key.Deposit);
-
-            var depositTree = groupedWells.Select(
-                gDeposit => new DepositBranchDto
-                {
-                    Id = gDeposit.Key.Id,
-                    Caption = gDeposit.Key.Caption,
-                    Latitude = gDeposit.Key.Latitude,
-                    Longitude = gDeposit.Key.Longitude,
-                    Clusters = gDeposit.Select(gCluster => new ClusterBranchDto
-                    {
-                        Id = gCluster.Key.Id,
-                        Caption = gCluster.Key.Caption,
-                        Latitude = gCluster.Key.Latitude ?? gDeposit.Key.Latitude,
-                        Longitude = gCluster.Key.Longitude ?? gDeposit.Key.Longitude,
-                        Wells = gCluster.Select(well =>
-                        {
-                            var dto = wellInfoService.FirstOrDefault(w => w.Id == well.Id && well.IdState == 1);
-                            dto ??= well.Adapt<WellMapInfoWithTelemetryStat>();
-                            dto.Latitude ??= gCluster.Key.Latitude ?? gDeposit.Key.Latitude;
-                            dto.Longitude ??= gCluster.Key.Longitude ?? gDeposit.Key.Longitude;
-                            dto.Companies = well.RelationCompaniesWells.Select(r => Convert(r.Company));
-                            return dto;
-                        }),
-                    }),
-                });
-            return depositTree;
-        }
-
-        public async Task<WellMapInfoWithTelemetryStat?> GetOrDefaultStatAsync(int idWell, CancellationToken token)
-        {
-            var well = await GetOrDefaultAsync(idWell, token);
-
-            if (well is null)
-                return null;
-
-            var wellInfo = wellInfoService.FirstOrDefault(well => well.Id == idWell);
-
-            if (wellInfo is null)
-                return well.Adapt<WellMapInfoWithTelemetryStat>();
-
-            wellInfo.IdState = well.IdState;
-            return wellInfo;
-        }
-
-        public async Task<IEnumerable<WellDto>> GetAsync(WellRequest request, CancellationToken token)
-        {
-            var wells = await GetEntitiesAsync(request, token);
-            var wellsDtos = wells.Select(Convert);
-            return wellsDtos;
-        }
-
-        private async Task<IEnumerable<Well>> GetEntitiesAsync(WellRequest request, CancellationToken token)
-        {
-            var wells = await GetCacheAsync(token);
-
-            if (request.Ids?.Any() == true)
-                wells = wells.Where(well => request.Ids.Contains(well.Id));
-
-            if (request.IdCompany.HasValue)
-                wells = wells.Where(well => well.RelationCompaniesWells.Any(r => r.IdCompany == request.IdCompany.Value));
-
-            if (request.IdState.HasValue)
-                wells = wells.Where(well => well.IdState == request.IdState.Value);
-
-            return wells;
-        }
-
-        public override async Task<int> InsertAsync(WellDto dto, CancellationToken token)
-        {
-            if (IsTelemetryAssignedToDifferentWell(dto))
-                throw new ArgumentInvalidException(nameof(dto), "Телеметрия уже была привязана к другой скважине.");
-
-            if (dto.Id != 0 && (await GetCacheAsync(token)).Any(w => w.Id == dto.Id))
-                throw new ArgumentInvalidException(nameof(dto), $"Нельзя повторно добавить скважину с id: {dto.Id}");
-
-            var entity = Convert(dto);
-
-            var result = await base.InsertAsync(dto, token);
-
-            if (dto.Companies.Any())
-            {
-                var newRelations = dto.Companies.Select(c => new RelationCompanyWell { IdWell = result, IdCompany = c.Id });
-                dbContext.RelationCompaniesWells.AddRange(newRelations);
-                await dbContext.SaveChangesAsync(token);
-                DropCacheRelationCompanyWell();
-            }
-
-            return result;
-        }
-
-        public override Task<int> InsertRangeAsync(IEnumerable<WellDto> dtos, CancellationToken token)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override async Task<int> UpdateAsync(WellDto dto,
-            CancellationToken token)
-        {
-            if (IsTelemetryAssignedToDifferentWell(dto))
-                throw new ArgumentInvalidException(nameof(dto), "Телеметрия уже была привязана к другой скважине.");
-
-            var oldRelations = (await GetCacheRelationCompanyWellAsync(token))
-                .Where(r => r.IdWell == dto.Id).ToArray();
-
-            if (dto.Companies.Count() != oldRelations.Length ||
-                dto.Companies.Any(c => oldRelations.All(oldC => oldC.IdCompany != c.Id)))
-            {
-                dbContext.RelationCompaniesWells
-                    .RemoveRange(dbContext.RelationCompaniesWells
-                        .Where(r => r.IdWell == dto.Id));
-
-                DropCacheRelationCompanyWell();
-
-                var newRelations = dto.Companies
-                    .Select(c => new RelationCompanyWell
-                    {
-                        IdWell = dto.Id,
-                        IdCompany = c.Id
-                    });
-
-                dbContext.RelationCompaniesWells.AddRange(newRelations);
-            }
-
-            var result = await base.UpdateAsync(dto, token);
-            return result;
-        }
-
-        public async Task<bool> IsCompanyInvolvedInWellAsync(int idCompany, int idWell, CancellationToken token)
-            => (await GetCacheRelationCompanyWellAsync(token))
-                .Any(r => r.IdWell == idWell && r.IdCompany == idCompany);
-
-        public async Task<string> GetWellCaptionByIdAsync(int idWell, CancellationToken token)
-        {
-            var entity = await GetOrDefaultAsync(idWell, token).ConfigureAwait(false);
-            return entity!.Caption;
-        }
-
-        public async Task<IEnumerable<CompanyDto>> GetCompaniesAsync(int idWell, CancellationToken token)
-        {
-            var relations = (await GetCacheRelationCompanyWellAsync(token))
-                .Where(r => r.IdWell == idWell);
-            var dtos = relations.Select(r => Convert(r.Company));
-            return dtos;
-        }
-
-        public string GetStateText(int state)
-        {
-            return state switch
-            {
-                1 => "В работе",
-                2 => "Завершена",
-                _ => "Неизвестно",
-            };
-        }
-
-        public async Task<IEnumerable<int>> GetClusterWellsIdsAsync(int idWell, CancellationToken token)
-        {
-            var well = await GetOrDefaultAsync(idWell, token);
-
-            if (well is null)
-                return Enumerable.Empty<int>();
-
-            var cache = await GetCacheAsync(token);
-
-            var clusterWellsIds = cache
-                .Where((w) => w.IdCluster == well.IdCluster)
-                .Select(w => w.Id);
-
-            return clusterWellsIds;
-        }
-
-        protected override Well Convert(WellDto dto)
-        {
-            var entity = dto.Adapt<Well>();
-
-            entity.IdTelemetry = entity.IdTelemetry ?? dto.IdTelemetry ?? dto.Telemetry?.Id;
-
-            if (dto.Timezone is null)
-                entity.Timezone = GetTimezone(dto.Id)
-                    .Adapt<SimpleTimezone>();
-
-            return entity;
-        }
-
-        protected override WellDto Convert(Well entity)
-        {
-            var dto = base.Convert(entity);
-
-            if (entity.Timezone is null)
-                dto.Timezone = GetTimezone(entity.Id);
-
-            dto.StartDate = wellOperationRepository
-                .GetFirstAndLastFact(entity.Id)?.First?.DateStart;
-            dto.WellType = entity.WellType.Caption;
-            dto.Cluster = entity.Cluster.Caption;
-            dto.Deposit = entity.Cluster.Deposit.Caption;
-            if (entity.IdTelemetry is not null)
-                dto.LastTelemetryDate = telemetryService.GetDatesRange(entity.IdTelemetry.Value).To.ToOffset(dto.Timezone.Offset);
-            dto.Companies = entity.RelationCompaniesWells
-                .Select(r => Convert(r.Company))
-                .ToList();
-            return dto;
-        }
-
-        private CompanyDto Convert(Company entity)
-        {
-            var dto = entity.Adapt<CompanyDto>();
-            dto.CompanyTypeCaption = entity.CompanyType?.Caption
-                ?? companyTypesService.GetOrDefault(entity.IdCompanyType)?.Caption
-                ?? string.Empty;
-            return dto;
-        }
-
-        public SimpleTimezoneDto GetTimezone(int idWell)
-        {
-            var cache = GetCache();
-            var cacheItem = cache.FirstOrDefault(d => d.Id == idWell)
-                ?? throw new ArgumentInvalidException(nameof(idWell), $"idWell: {idWell} does not exist.");
-            return cacheItem.Timezone.Adapt<SimpleTimezoneDto>();
-        }
-
-        private bool IsTelemetryAssignedToDifferentWell(WellDto wellDto)
-        {
-            if (!wellDto.IdTelemetry.HasValue)
-                return false;
-
-            var existingWellWithAssignedTelemetry = GetCache()
-                .FirstOrDefault(x => x.IdTelemetry == wellDto.IdTelemetry);
-
-            if (existingWellWithAssignedTelemetry is null)
-                return false;
-
-            return existingWellWithAssignedTelemetry.Id != wellDto.Id;
-        }
-
-        private static AsbCloudDb.Model.IMapPoint GetCoordinates(Well well)
-        {
-            if (well is null)
-                throw new ArgumentNullException(nameof(well));
-
-            if (well.Latitude is not null & well.Longitude is not null)
-                return well;
-
-            var cluster = well.Cluster;
-
-            if (cluster.Latitude is not null & cluster.Longitude is not null)
-                return cluster;
-
-            if (cluster.Deposit is null)
-                throw new Exception($"Can't find coordinates of well by cluster {cluster.Caption} id: {cluster.Id}");
-
-            var deposit = cluster.Deposit;
-
-            if (deposit.Latitude is not null & deposit.Longitude is not null)
-                return deposit;
-
-            throw new Exception($"Can't find coordinates of well by deposit {deposit.Caption} id: {deposit.Id}");
-        }
-
-        public DatesRangeDto GetDatesRange(int idWell)
-        {
-            var well = GetOrDefault(idWell);
-            if (well is null)
-                throw new Exception($"Well id: {idWell} does not exist.");
-
-            if (well.IdTelemetry is null)
-                throw new KeyNotFoundException($"Well id: {idWell} does not contain telemetry.");
-
-            return telemetryService.GetDatesRange((int)well.IdTelemetry);
-        }
+        this.telemetryService = telemetryService;
+        this.timezoneService = timezoneService;
+        this.wellInfoService = wellInfoService;
+        wellOperationRepository = new WellOperationRepository(db, memoryCache, wellOperationCategoryRepository, this);
+        companyTypesService = new CrudCacheRepositoryBase<CompanyTypeDto, CompanyType>(dbContext, memoryCache);
     }
 
+    private Task<IEnumerable<RelationCompanyWell>> GetCacheRelationCompanyWellAsync(CancellationToken token)
+    {
+        return memoryCache.GetOrCreateBasicAsync(
+            dbContext.Set<RelationCompanyWell>()
+                .Include(r => r.Company)
+                .Include(r => r.Well)
+            , token);
+    }
+
+    private void DropCacheRelationCompanyWell()
+        => memoryCache.DropBasic<RelationCompanyWell>();
+
+    public DateTimeOffset GetLastTelemetryDate(int idWell)
+    {
+        var well = GetOrDefault(idWell);
+
+        if (well?.IdTelemetry is null)
+            return DateTimeOffset.MinValue;
+
+        var datesRange = telemetryService.GetDatesRange(well.IdTelemetry.Value);
+        return datesRange.To;
+    }
+
+    /// <inheritdoc/>
+    public async Task<IEnumerable<DepositBranchDto>> GetWellTreeAsync(int idCompany, CancellationToken token)
+    {
+        var wells = await GetEntitiesAsync(new() { IdCompany = idCompany }, token);
+
+        var groupedWells = wells
+            .GroupBy(w => w.Cluster)
+            .GroupBy(g => g.Key.Deposit);
+
+        var depositTree = groupedWells.Select(
+            gDeposit => new DepositBranchDto
+            {
+                Id = gDeposit.Key.Id,
+                Caption = gDeposit.Key.Caption,
+                Latitude = gDeposit.Key.Latitude,
+                Longitude = gDeposit.Key.Longitude,
+                Clusters = gDeposit.Select(gCluster => new ClusterBranchDto
+                {
+                    Id = gCluster.Key.Id,
+                    Caption = gCluster.Key.Caption,
+                    Latitude = gCluster.Key.Latitude ?? gDeposit.Key.Latitude,
+                    Longitude = gCluster.Key.Longitude ?? gDeposit.Key.Longitude,
+                    Wells = gCluster.Select(well =>
+                    {
+                        var dto = wellInfoService.FirstOrDefault(w => w.Id == well.Id && well.IdState == 1);
+                        dto ??= well.Adapt<WellMapInfoWithTelemetryStat>();
+                        dto.Latitude ??= gCluster.Key.Latitude ?? gDeposit.Key.Latitude;
+                        dto.Longitude ??= gCluster.Key.Longitude ?? gDeposit.Key.Longitude;
+                        dto.Companies = well.RelationCompaniesWells.Select(r => Convert(r.Company));
+                        return dto;
+                    }),
+                }),
+            });
+        return depositTree;
+    }
+
+    public async Task<WellMapInfoWithTelemetryStat?> GetOrDefaultStatAsync(int idWell, CancellationToken token)
+    {
+        var well = await GetOrDefaultAsync(idWell, token);
+
+        if (well is null)
+            return null;
+
+        var wellInfo = wellInfoService.FirstOrDefault(well => well.Id == idWell);
+
+        if (wellInfo is null)
+            return well.Adapt<WellMapInfoWithTelemetryStat>();
+
+        wellInfo.IdState = well.IdState;
+        return wellInfo;
+    }
+
+    public async Task<IEnumerable<WellDto>> GetAsync(WellRequest request, CancellationToken token)
+    {
+        var wells = await GetEntitiesAsync(request, token);
+        var wellsDtos = wells.Select(Convert);
+        return wellsDtos;
+    }
+
+    private async Task<IEnumerable<Well>> GetEntitiesAsync(WellRequest request, CancellationToken token)
+    {
+        var wells = await GetCacheAsync(token);
+
+        if (request.Ids?.Any() == true)
+            wells = wells.Where(well => request.Ids.Contains(well.Id));
+
+        if (request.IdCompany.HasValue)
+            wells = wells.Where(well => well.RelationCompaniesWells.Any(r => r.IdCompany == request.IdCompany.Value));
+
+        if (request.IdState.HasValue)
+            wells = wells.Where(well => well.IdState == request.IdState.Value);
+
+        return wells;
+    }
+
+    public override async Task<int> InsertAsync(WellDto dto, CancellationToken token)
+    {
+        if (IsTelemetryAssignedToDifferentWell(dto))
+            throw new ArgumentInvalidException(nameof(dto), "Телеметрия уже была привязана к другой скважине.");
+
+        if (dto.Id != 0 && (await GetCacheAsync(token)).Any(w => w.Id == dto.Id))
+            throw new ArgumentInvalidException(nameof(dto), $"Нельзя повторно добавить скважину с id: {dto.Id}");
+
+        var entity = Convert(dto);
+
+        var result = await base.InsertAsync(dto, token);
+
+        if (dto.Companies.Any())
+        {
+            var newRelations = dto.Companies.Select(c => new RelationCompanyWell { IdWell = result, IdCompany = c.Id });
+            dbContext.RelationCompaniesWells.AddRange(newRelations);
+            await dbContext.SaveChangesAsync(token);
+            DropCacheRelationCompanyWell();
+        }
+
+        return result;
+    }
+
+    public override Task<int> InsertRangeAsync(IEnumerable<WellDto> dtos, CancellationToken token)
+    {
+        throw new NotImplementedException();
+    }
+
+    public override async Task<int> UpdateAsync(WellDto dto,
+        CancellationToken token)
+    {
+        if (IsTelemetryAssignedToDifferentWell(dto))
+            throw new ArgumentInvalidException(nameof(dto), "Телеметрия уже была привязана к другой скважине.");
+
+        var oldRelations = (await GetCacheRelationCompanyWellAsync(token))
+            .Where(r => r.IdWell == dto.Id).ToArray();
+
+        if (dto.Companies.Count() != oldRelations.Length ||
+            dto.Companies.Any(c => oldRelations.All(oldC => oldC.IdCompany != c.Id)))
+        {
+            dbContext.RelationCompaniesWells
+                .RemoveRange(dbContext.RelationCompaniesWells
+                    .Where(r => r.IdWell == dto.Id));
+
+            DropCacheRelationCompanyWell();
+
+            var newRelations = dto.Companies
+                .Select(c => new RelationCompanyWell
+                {
+                    IdWell = dto.Id,
+                    IdCompany = c.Id
+                });
+
+            dbContext.RelationCompaniesWells.AddRange(newRelations);
+        }
+
+        var result = await base.UpdateAsync(dto, token);
+        return result;
+    }
+
+    public async Task<bool> IsCompanyInvolvedInWellAsync(int idCompany, int idWell, CancellationToken token)
+        => (await GetCacheRelationCompanyWellAsync(token))
+            .Any(r => r.IdWell == idWell && r.IdCompany == idCompany);
+
+    public async Task<string> GetWellCaptionByIdAsync(int idWell, CancellationToken token)
+    {
+        var entity = await GetOrDefaultAsync(idWell, token).ConfigureAwait(false);
+        return entity!.Caption;
+    }
+
+    public async Task<IEnumerable<CompanyDto>> GetCompaniesAsync(int idWell, CancellationToken token)
+    {
+        var relations = (await GetCacheRelationCompanyWellAsync(token))
+            .Where(r => r.IdWell == idWell);
+        var dtos = relations.Select(r => Convert(r.Company));
+        return dtos;
+    }
+
+    public string GetStateText(int state)
+    {
+        return state switch
+        {
+            1 => "В работе",
+            2 => "Завершена",
+            _ => "Неизвестно",
+        };
+    }
+
+    public async Task<IEnumerable<int>> GetClusterWellsIdsAsync(int idWell, CancellationToken token)
+    {
+        var well = await GetOrDefaultAsync(idWell, token);
+
+        if (well is null)
+            return Enumerable.Empty<int>();
+
+        var cache = await GetCacheAsync(token);
+
+        var clusterWellsIds = cache
+            .Where((w) => w.IdCluster == well.IdCluster)
+            .Select(w => w.Id);
+
+        return clusterWellsIds;
+    }
+
+    protected override Well Convert(WellDto dto)
+    {
+        var entity = dto.Adapt<Well>();
+
+        entity.IdTelemetry = entity.IdTelemetry ?? dto.IdTelemetry ?? dto.Telemetry?.Id;
+
+        if (dto.Timezone is null)
+            entity.Timezone = GetTimezone(dto.Id)
+                .Adapt<SimpleTimezone>();
+
+        return entity;
+    }
+
+    protected override WellDto Convert(Well entity)
+    {
+        var dto = base.Convert(entity);
+
+        if (entity.Timezone is null)
+            dto.Timezone = GetTimezone(entity.Id);
+
+        dto.StartDate = wellOperationRepository
+            .GetFirstAndLastFact(entity.Id)?.First?.DateStart;
+        dto.WellType = entity.WellType.Caption;
+        dto.Cluster = entity.Cluster.Caption;
+        dto.Deposit = entity.Cluster.Deposit.Caption;
+        if (entity.IdTelemetry is not null)
+            dto.LastTelemetryDate = telemetryService.GetDatesRange(entity.IdTelemetry.Value).To.ToOffset(dto.Timezone.Offset);
+        dto.Companies = entity.RelationCompaniesWells
+            .Select(r => Convert(r.Company))
+            .ToList();
+        return dto;
+    }
+
+    private CompanyDto Convert(Company entity)
+    {
+        var dto = entity.Adapt<CompanyDto>();
+        dto.CompanyTypeCaption = entity.CompanyType?.Caption
+            ?? companyTypesService.GetOrDefault(entity.IdCompanyType)?.Caption
+            ?? string.Empty;
+        return dto;
+    }
+
+    public SimpleTimezoneDto GetTimezone(int idWell)
+    {
+        var cache = GetCache();
+        var cacheItem = cache.FirstOrDefault(d => d.Id == idWell)
+            ?? throw new ArgumentInvalidException(nameof(idWell), $"idWell: {idWell} does not exist.");
+        return cacheItem.Timezone.Adapt<SimpleTimezoneDto>();
+    }
+
+    private bool IsTelemetryAssignedToDifferentWell(WellDto wellDto)
+    {
+        if (!wellDto.IdTelemetry.HasValue)
+            return false;
+
+        var existingWellWithAssignedTelemetry = GetCache()
+            .FirstOrDefault(x => x.IdTelemetry == wellDto.IdTelemetry);
+
+        if (existingWellWithAssignedTelemetry is null)
+            return false;
+
+        return existingWellWithAssignedTelemetry.Id != wellDto.Id;
+    }
+
+    private static AsbCloudDb.Model.IMapPoint GetCoordinates(Well well)
+    {
+        if (well is null)
+            throw new ArgumentNullException(nameof(well));
+
+        if (well.Latitude is not null & well.Longitude is not null)
+            return well;
+
+        var cluster = well.Cluster;
+
+        if (cluster.Latitude is not null & cluster.Longitude is not null)
+            return cluster;
+
+        if (cluster.Deposit is null)
+            throw new Exception($"Can't find coordinates of well by cluster {cluster.Caption} id: {cluster.Id}");
+
+        var deposit = cluster.Deposit;
+
+        if (deposit.Latitude is not null & deposit.Longitude is not null)
+            return deposit;
+
+        throw new Exception($"Can't find coordinates of well by deposit {deposit.Caption} id: {deposit.Id}");
+    }
+
+    public DatesRangeDto GetDatesRange(int idWell)
+    {
+        var well = GetOrDefault(idWell);
+        if (well is null)
+            throw new Exception($"Well id: {idWell} does not exist.");
+
+        if (well.IdTelemetry is null)
+            throw new KeyNotFoundException($"Well id: {idWell} does not contain telemetry.");
+
+        return telemetryService.GetDatesRange((int)well.IdTelemetry);
+    }
 }
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Services/WitsInfoService.cs b/AsbCloudInfrastructure/Services/WitsInfoService.cs
index 7e8ac40a..7f78fbac 100644
--- a/AsbCloudInfrastructure/Services/WitsInfoService.cs
+++ b/AsbCloudInfrastructure/Services/WitsInfoService.cs
@@ -1,35 +1,34 @@
 using AsbWitsInfo;
 using System.Collections.Generic;
 
-namespace AsbCloudInfrastructure.Services
+namespace AsbCloudInfrastructure.Services;
+
+
+public class WitsInfoService
 {
-
-    public class WitsInfoService
+    private readonly InfoService witsInfoService;
+    public WitsInfoService(IEnumerable<ItemInfo>? customItems = null, IEnumerable<RecordInfo>? customRecords = null)
     {
-        private readonly InfoService witsInfoService;
-        public WitsInfoService(IEnumerable<ItemInfo>? customItems = null, IEnumerable<RecordInfo>? customRecords = null)
-        {
-            witsInfoService = new InfoService(customItems, customRecords);
-        }
+        witsInfoService = new InfoService(customItems, customRecords);
+    }
 
-        public object GetItems(int idRecord = -1)
-        {
-            object items;
-            if (idRecord > 0)
-                items = witsInfoService.ItemInfoStore.Where(i => i.RecordId == idRecord);
-            else
-                items = witsInfoService.ItemInfoStore.Where(i => true);
-            return items;
-        }
+    public object GetItems(int idRecord = -1)
+    {
+        object items;
+        if (idRecord > 0)
+            items = witsInfoService.ItemInfoStore.Where(i => i.RecordId == idRecord);
+        else
+            items = witsInfoService.ItemInfoStore.Where(i => true);
+        return items;
+    }
 
-        public object GetRecords(int idRecord = -1)
-        {
-            object items;
-            if (idRecord > 0)
-                items = witsInfoService.RecordInfoStore.Where(i => i.RecordId == idRecord);
-            else
-                items = witsInfoService.RecordInfoStore.Where(i => true);
-            return items;
-        }
+    public object GetRecords(int idRecord = -1)
+    {
+        object items;
+        if (idRecord > 0)
+            items = witsInfoService.RecordInfoStore.Where(i => i.RecordId == idRecord);
+        else
+            items = witsInfoService.RecordInfoStore.Where(i => true);
+        return items;
     }
 }
diff --git a/AsbCloudInfrastructure/Startup.cs b/AsbCloudInfrastructure/Startup.cs
index c6a83d17..83eba346 100644
--- a/AsbCloudInfrastructure/Startup.cs
+++ b/AsbCloudInfrastructure/Startup.cs
@@ -12,62 +12,60 @@ using AsbCloudDb;
 using AsbCloudApp.Repositories;
 using AsbCloudInfrastructure.Background.PeriodicWorks;
 
-namespace AsbCloudInfrastructure
+namespace AsbCloudInfrastructure;
+
+public class Startup
 {
-    public class Startup
+    public static void BeforeRunHandler(IHost host)
     {
-        public static void BeforeRunHandler(IHost host)
-        {
-            using var scope = host.Services.CreateScope();
-            var provider = scope.ServiceProvider;
+        using var scope = host.Services.CreateScope();
+        var provider = scope.ServiceProvider;
 
-            var context = provider.GetRequiredService<IAsbCloudDbContext>();
-            context.Database.EnsureCreatedAndMigrated();
+        var context = provider.GetRequiredService<IAsbCloudDbContext>();
+        context.Database.EnsureCreatedAndMigrated();
 
-            // TODO: Сделать инициализацию кеша телеметрии более явной.
-            _ = provider.GetRequiredService<ITelemetryDataCache<TelemetryDataSaubDto>>();
-            _ = provider.GetRequiredService<ITelemetryDataCache<TelemetryDataSpinDto>>();
+        // TODO: Сделать инициализацию кеша телеметрии более явной.
+        _ = provider.GetRequiredService<ITelemetryDataCache<TelemetryDataSaubDto>>();
+        _ = provider.GetRequiredService<ITelemetryDataCache<TelemetryDataSpinDto>>();
 
-            var backgroundWorker = provider.GetRequiredService<PeriodicBackgroundWorker>();
-            backgroundWorker.Add<WorkToDeleteOldReports>(TimeSpan.FromDays(1));
-            backgroundWorker.Add<WellInfoService.WorkWellInfoUpdate>(TimeSpan.FromMinutes(30));
-            backgroundWorker.Add<WorkOperationDetection>(TimeSpan.FromMinutes(0));
-            backgroundWorker.Add<WorkDataSaubStat>(TimeSpan.FromMinutes(0));
-            backgroundWorker.Add<WorkLimitingParameterCalc>(TimeSpan.FromMinutes(0));
-            backgroundWorker.Add(MakeMemoryMonitoringWork(), TimeSpan.FromMinutes(0));
+        var backgroundWorker = provider.GetRequiredService<PeriodicBackgroundWorker>();
+        backgroundWorker.Add<WorkToDeleteOldReports>(TimeSpan.FromDays(1));
+        backgroundWorker.Add<WellInfoService.WorkWellInfoUpdate>(TimeSpan.FromMinutes(30));
+        backgroundWorker.Add<WorkOperationDetection>(TimeSpan.FromMinutes(0));
+        backgroundWorker.Add<WorkDataSaubStat>(TimeSpan.FromMinutes(0));
+        backgroundWorker.Add<WorkLimitingParameterCalc>(TimeSpan.FromMinutes(0));
+        backgroundWorker.Add(MakeMemoryMonitoringWork(), TimeSpan.FromMinutes(0));
 
-            var notificationBackgroundWorker = provider.GetRequiredService<NotificationBackgroundWorker>();
-        }
-
-        static Work MakeMemoryMonitoringWork()
-        {
-            var workAction = (string _, IServiceProvider _, Action<string, double?> _, CancellationToken _) => {
-                var bytes = GC.GetTotalMemory(false);
-                var bytesString = FromatBytes(bytes);
-                System.Diagnostics.Trace.TraceInformation($"Total memory allocated is {bytesString} bytes. DbContext count is:{AsbCloudDbContext.ReferenceCount}");
-                return Task.CompletedTask;
-            };
-            var work = Work.CreateByDelegate("Memory monitoring", workAction);
-            return work;
-        }
-
-        static string FromatBytes(long bytes)
-        {
-            const double gigaByte = 1024 * 1024 * 1024;
-            const double megaByte = 1024 * 1024;
-            const double kiloByte = 1024;
-            
-            if (bytes > 10 * gigaByte)
-                return (bytes / gigaByte).ToString("### ### ###.## Gb");
-
-            if (bytes > 10 * megaByte)
-                return (bytes / megaByte).ToString("### ### ###.## Mb");
-
-            if (bytes > 10 * kiloByte)
-                return (bytes / megaByte).ToString("### ### ###.## Kb");
-
-            return bytes.ToString("### ### ###");
-        }
+        var notificationBackgroundWorker = provider.GetRequiredService<NotificationBackgroundWorker>();
     }
 
+    static Work MakeMemoryMonitoringWork()
+    {
+        var workAction = (string _, IServiceProvider _, Action<string, double?> _, CancellationToken _) => {
+            var bytes = GC.GetTotalMemory(false);
+            var bytesString = FromatBytes(bytes);
+            System.Diagnostics.Trace.TraceInformation($"Total memory allocated is {bytesString} bytes. DbContext count is:{AsbCloudDbContext.ReferenceCount}");
+            return Task.CompletedTask;
+        };
+        var work = Work.CreateByDelegate("Memory monitoring", workAction);
+        return work;
+    }
+
+    static string FromatBytes(long bytes)
+    {
+        const double gigaByte = 1024 * 1024 * 1024;
+        const double megaByte = 1024 * 1024;
+        const double kiloByte = 1024;
+        
+        if (bytes > 10 * gigaByte)
+            return (bytes / gigaByte).ToString("### ### ###.## Gb");
+
+        if (bytes > 10 * megaByte)
+            return (bytes / megaByte).ToString("### ### ###.## Mb");
+
+        if (bytes > 10 * kiloByte)
+            return (bytes / megaByte).ToString("### ### ###.## Kb");
+
+        return bytes.ToString("### ### ###");
+    }
 }
diff --git a/AsbCloudWebApi.IntegrationTests/Data/Defaults.cs b/AsbCloudWebApi.IntegrationTests/Data/Defaults.cs
index 1d97e6ec..21e3c531 100644
--- a/AsbCloudWebApi.IntegrationTests/Data/Defaults.cs
+++ b/AsbCloudWebApi.IntegrationTests/Data/Defaults.cs
@@ -1,58 +1,57 @@
 using AsbCloudDb.Model;
 
-namespace AsbCloudWebApi.IntegrationTests.Data
+namespace AsbCloudWebApi.IntegrationTests.Data;
+
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2211:Поля, не являющиеся константами, не должны быть видимыми",
+  Justification = "<Ожидание>")]
+public static class Defaults
 {
-   [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2211:Поля, не являющиеся константами, не должны быть видимыми",
-      Justification = "<Ожидание>")]
-   public static class Defaults
-   {
-      public static SimpleTimezone Timezone => new()
-      {
-         Hours = 1
-      };
+  public static SimpleTimezone Timezone => new()
+  {
+     Hours = 1
+  };
 
-      public const string RemoteUid = "555-555-555";
+  public const string RemoteUid = "555-555-555";
 
-      public static Deposit[] Deposits => new Deposit[]
-      {
-         new()
-         {
-            Caption = "Deposit1",
-            Latitude = 10,
-            Longitude = 20,
-            Timezone = Timezone,
-            Clusters = new[]
-            {
-               new Cluster
-               {
-                  Caption = "Cluster1",
-                  Latitude = 10,
-                  Longitude = 20,
-                  Timezone = Timezone,
-                  Wells = new[]
-                  {
-                     new Well
-                     {
-                        IdWellType = 1,
-                        IdState = 1,
-                        Caption = "Well1",
-                        Latitude = 10,
-                        Longitude = 20,
-                        Timezone = Timezone,
-                        Telemetry = new Telemetry
-                        {
-                           RemoteUid = RemoteUid,
-                           TimeZone = Timezone
-                        },
-                        RelationCompaniesWells = new RelationCompanyWell[]
-                        {
-                           new() { IdCompany = 1 },
-                        },
-                     }
-                  }
-               }
-            }
-         }
-      };
-   }
+  public static Deposit[] Deposits => new Deposit[]
+  {
+     new()
+     {
+        Caption = "Deposit1",
+        Latitude = 10,
+        Longitude = 20,
+        Timezone = Timezone,
+        Clusters = new[]
+        {
+           new Cluster
+           {
+              Caption = "Cluster1",
+              Latitude = 10,
+              Longitude = 20,
+              Timezone = Timezone,
+              Wells = new[]
+              {
+                 new Well
+                 {
+                    IdWellType = 1,
+                    IdState = 1,
+                    Caption = "Well1",
+                    Latitude = 10,
+                    Longitude = 20,
+                    Timezone = Timezone,
+                    Telemetry = new Telemetry
+                    {
+                       RemoteUid = RemoteUid,
+                       TimeZone = Timezone
+                    },
+                    RelationCompaniesWells = new RelationCompanyWell[]
+                    {
+                       new() { IdCompany = 1 },
+                    },
+                 }
+              }
+           }
+        }
+     }
+  };
 }
\ No newline at end of file
diff --git a/AsbCloudWebApi.Tests/AspExtensions.cs b/AsbCloudWebApi.Tests/AspExtensions.cs
index a7c1aedd..4ccd8204 100644
--- a/AsbCloudWebApi.Tests/AspExtensions.cs
+++ b/AsbCloudWebApi.Tests/AspExtensions.cs
@@ -1,19 +1,18 @@
 using Microsoft.Extensions.DependencyInjection;
 using System.Linq;
 
-namespace AsbCloudWebApi.Tests
+namespace AsbCloudWebApi.Tests;
+
+public static class AspExtensions
 {
-    public static class AspExtensions
+    public static IServiceCollection ReplaceService<T>(this IServiceCollection services, T instance)
+        where T : notnull
     {
-        public static IServiceCollection ReplaceService<T>(this IServiceCollection services, T instance)
-            where T : notnull
-        {
-            var typeofT = typeof(T);
-            var originalDecriptor = services.Last(s => s.ServiceType == typeofT);
-            var newDecriptor = new ServiceDescriptor(typeofT, instance);
-            services.Remove(originalDecriptor);
-            services.Add(newDecriptor);
-            return services;
-        }
+        var typeofT = typeof(T);
+        var originalDecriptor = services.Last(s => s.ServiceType == typeofT);
+        var newDecriptor = new ServiceDescriptor(typeofT, instance);
+        services.Remove(originalDecriptor);
+        services.Add(newDecriptor);
+        return services;
     }
 }
diff --git a/AsbCloudWebApi.Tests/ReflectionExtensions.cs b/AsbCloudWebApi.Tests/ReflectionExtensions.cs
index 23019890..86d99a1f 100644
--- a/AsbCloudWebApi.Tests/ReflectionExtensions.cs
+++ b/AsbCloudWebApi.Tests/ReflectionExtensions.cs
@@ -4,44 +4,43 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Tests
+namespace AsbCloudWebApi.Tests;
+
+public static class ReflectionExtensions
 {
-    public static class ReflectionExtensions
+    private static readonly Dictionary<Type, object> _commonTypeDictionary = new()
     {
-        private static readonly Dictionary<Type, object> _commonTypeDictionary = new()
-        {
-            { typeof(int), default(int) },
-            { typeof(Guid), default(Guid) },
-            { typeof(DateOnly), default(DateOnly) },
-            { typeof(DateTime), default(DateTime) },
-            { typeof(DateTimeOffset), default(DateTimeOffset) },
-            { typeof(TimeOnly), default(TimeOnly) },
-            { typeof(long), default(long) },
-            { typeof(bool), default(bool) },
-            { typeof(double), default(double) },
-            { typeof(short), default(short) },
-            { typeof(float), default(float) },
-            { typeof(byte), default(byte) },
-            { typeof(char), default(char) },
-            { typeof(uint), default(uint) },
-            { typeof(ushort), default(ushort) },
-            { typeof(ulong), default(ulong) },
-            { typeof(sbyte), default(sbyte) }
-        };
+        { typeof(int), default(int) },
+        { typeof(Guid), default(Guid) },
+        { typeof(DateOnly), default(DateOnly) },
+        { typeof(DateTime), default(DateTime) },
+        { typeof(DateTimeOffset), default(DateTimeOffset) },
+        { typeof(TimeOnly), default(TimeOnly) },
+        { typeof(long), default(long) },
+        { typeof(bool), default(bool) },
+        { typeof(double), default(double) },
+        { typeof(short), default(short) },
+        { typeof(float), default(float) },
+        { typeof(byte), default(byte) },
+        { typeof(char), default(char) },
+        { typeof(uint), default(uint) },
+        { typeof(ushort), default(ushort) },
+        { typeof(ulong), default(ulong) },
+        { typeof(sbyte), default(sbyte) }
+    };
 
-        public static object? GetDefaultValue(this Type type)
+    public static object? GetDefaultValue(this Type type)
+    {
+        if (!type.IsValueType)
         {
-            if (!type.IsValueType)
-            {
-                return null;
-            }
-
-            return _commonTypeDictionary.TryGetValue(type, out var value)
-                ? value
-                : Activator.CreateInstance(type);
+            return null;
         }
 
-        public static bool IsDefaultValue(this Type type, object? value)
-            => (value?.Equals(type.GetDefaultValue()) != false);
+        return _commonTypeDictionary.TryGetValue(type, out var value)
+            ? value
+            : Activator.CreateInstance(type);
     }
+
+    public static bool IsDefaultValue(this Type type, object? value)
+        => (value?.Equals(type.GetDefaultValue()) != false);
 }
diff --git a/AsbCloudWebApi.Tests/Services/Notification/EmailNotificationTransportServiceTests.cs b/AsbCloudWebApi.Tests/Services/Notification/EmailNotificationTransportServiceTests.cs
index 0d2974b9..b2b96735 100644
--- a/AsbCloudWebApi.Tests/Services/Notification/EmailNotificationTransportServiceTests.cs
+++ b/AsbCloudWebApi.Tests/Services/Notification/EmailNotificationTransportServiceTests.cs
@@ -12,61 +12,60 @@ using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace AsbCloudWebApi.Tests.Services.Notification
+namespace AsbCloudWebApi.Tests.Services.Notification;
+
+public class EmailNotificationTransportServiceTests
 {
-    public class EmailNotificationTransportServiceTests
+    private IUserRepository userRepository;
+    private INotificationTransportService notificationTransportService;
+
+    private readonly NotificationDto notification = new NotificationDto()
     {
-        private IUserRepository userRepository;
-        private INotificationTransportService notificationTransportService;
+        Message = "Message",
+        Title = "Title",
+        IdUser = 1,
+        IdTransportType = 1,
+        IdState = 0,
+        RegistrationDate = DateTimeOffset.Now,
+        IdNotificationCategory = 10000,
+    };
+    private readonly UserExtendedDto user = new UserExtendedDto()
+    {
+        Id = 1,
+        IdCompany = 1,
+        Email = "studio@yandex.ru",
+        IdState = 1,
+        Login = "studio",
+        Name = "Test",
+        Patronymic = "Test",
+        Phone = "22-22-22",
+        Position = "Test",
+        Surname = "Test",
+    };
 
-        private readonly NotificationDto notification = new NotificationDto()
-        {
-            Message = "Message",
-            Title = "Title",
-            IdUser = 1,
-            IdTransportType = 1,
-            IdState = 0,
-            RegistrationDate = DateTimeOffset.Now,
-            IdNotificationCategory = 10000,
-        };
-        private readonly UserExtendedDto user = new UserExtendedDto()
-        {
-            Id = 1,
-            IdCompany = 1,
-            Email = "studio@yandex.ru",
-            IdState = 1,
-            Login = "studio",
-            Name = "Test",
-            Patronymic = "Test",
-            Phone = "22-22-22",
-            Position = "Test",
-            Surname = "Test",
-        };
+    private static Dictionary<string, string?> configSettings = new()
+    {
+        { "email:sender", "bot@digitaldrilling.ru" },
+        { "email:password", "8wZrXSfP" },
+        { "email:smtpServer", "smtp.timeweb.ru" }
+    };
 
-        private static Dictionary<string, string?> configSettings = new()
-        {
-            { "email:sender", "bot@digitaldrilling.ru" },
-            { "email:password", "8wZrXSfP" },
-            { "email:smtpServer", "smtp.timeweb.ru" }
-        };
+    public EmailNotificationTransportServiceTests()
+    {
+        IConfiguration configuration = new ConfigurationBuilder()
+         .AddInMemoryCollection(configSettings)
+         .Build();
 
-        public EmailNotificationTransportServiceTests()
-        {
-            IConfiguration configuration = new ConfigurationBuilder()
-             .AddInMemoryCollection(configSettings)
-             .Build();
+        userRepository = Substitute.For<IUserRepository>();
 
-            userRepository = Substitute.For<IUserRepository>();
+        notificationTransportService = new EmailNotificationTransportService(configuration, userRepository);
+    }
 
-            notificationTransportService = new EmailNotificationTransportService(configuration, userRepository);
-        }
-
-        [Fact]
-        public async Task SendAsyncThrowsMailboxUnavailable()
-        {
-            userRepository.GetOrDefaultAsync(Arg.Any<int>(), Arg.Any<CancellationToken>()).Returns(user);
-            var exception = await Assert.ThrowsAsync<SmtpException>(() => notificationTransportService.SendAsync(notification, CancellationToken.None));
-            Assert.Equal(SmtpStatusCode.MailboxUnavailable, exception.StatusCode);
-        }
+    [Fact]
+    public async Task SendAsyncThrowsMailboxUnavailable()
+    {
+        userRepository.GetOrDefaultAsync(Arg.Any<int>(), Arg.Any<CancellationToken>()).Returns(user);
+        var exception = await Assert.ThrowsAsync<SmtpException>(() => notificationTransportService.SendAsync(notification, CancellationToken.None));
+        Assert.Equal(SmtpStatusCode.MailboxUnavailable, exception.StatusCode);
     }
 }
diff --git a/AsbCloudWebApi.Tests/Services/Trajectory/TrajectoryExportTest.cs b/AsbCloudWebApi.Tests/Services/Trajectory/TrajectoryExportTest.cs
index 856d09ae..4c5d76d9 100644
--- a/AsbCloudWebApi.Tests/Services/Trajectory/TrajectoryExportTest.cs
+++ b/AsbCloudWebApi.Tests/Services/Trajectory/TrajectoryExportTest.cs
@@ -9,121 +9,120 @@ using System.Threading.Tasks;
 using AsbCloudApp.Requests.ExportOptions;
 using Xunit;
 
-namespace AsbCloudWebApi.Tests.Services.Trajectory
+namespace AsbCloudWebApi.Tests.Services.Trajectory;
+
+public class TrajectoryExportTest
 {
-    public class TrajectoryExportTest
+    private const int idWell = 4;
+    
+    private IWellService wellService;
+    private readonly ITrajectoryEditableRepository<TrajectoryGeoPlanDto> trajectoryPlanRepository;
+    private readonly TrajectoryPlanExportService trajectoryPlanExportService;
+
+    private readonly ITrajectoryEditableRepository<TrajectoryGeoFactDto> trajectoryFactManualReposirory;
+    private readonly TrajectoryFactManualExportService trajectoryFactManualExportService;
+
+    private readonly ITrajectoryNnbRepository trajectoryFactNnbRepository;
+    private readonly TrajectoryFactNnbExportService trajectoryFactNnbExportService;
+
+    private readonly TrajectoryGeoPlanDto[] trajectoryPlanRows = new TrajectoryGeoPlanDto[2] {
+            new TrajectoryGeoPlanDto() {
+                Id = 1,
+                AzimuthGeo = 1,
+                AzimuthMagnetic = 2,
+                Comment = "комментарий",
+                IdUser = 1,
+                IdWell = 4,
+                Radius = 3,
+                UpdateDate = DateTimeOffset.Now,
+                VerticalDepth = 100,
+                WellboreDepth = 100,
+                ZenithAngle = 10
+            },
+           new TrajectoryGeoPlanDto() {
+                Id = 2,
+                AzimuthGeo = 1,
+                AzimuthMagnetic = 2,
+                Comment = "комментарий",
+                IdUser = 1,
+                IdWell = 4,
+                Radius = 3,
+                UpdateDate = DateTimeOffset.Now,
+                VerticalDepth = 100,
+                WellboreDepth = 100,
+                ZenithAngle = 10
+            },
+        };
+
+    private readonly TrajectoryGeoFactDto[] trajectoryFactRows = new TrajectoryGeoFactDto[2] {
+            new TrajectoryGeoFactDto() {
+                Id = 1,
+                AzimuthGeo = 1,
+                AzimuthMagnetic = 2,
+                Comment = "комментарий",
+                IdUser = 1,
+                IdWell = 4,
+                UpdateDate = DateTimeOffset.Now,
+                VerticalDepth = 100,
+                WellboreDepth = 100,
+                ZenithAngle = 10
+            },
+           new TrajectoryGeoFactDto() {
+                Id = 2,
+                AzimuthGeo = 1,
+                AzimuthMagnetic = 2,
+                Comment = "комментарий",
+                IdUser = 1,
+                IdWell = 4,
+                UpdateDate = DateTimeOffset.Now,
+                VerticalDepth = 100,
+                WellboreDepth = 100,
+                ZenithAngle = 10
+            },
+        };
+
+    private readonly WellRelatedExportRequest exportOptions = new(idWell);
+
+    public TrajectoryExportTest()
     {
-        private const int idWell = 4;
+        wellService = Substitute.For<IWellService>();
+        trajectoryPlanRepository = Substitute.For<ITrajectoryEditableRepository<TrajectoryGeoPlanDto>>();
+        trajectoryPlanExportService = new TrajectoryPlanExportService(wellService, trajectoryPlanRepository);
+
+        trajectoryFactManualReposirory = Substitute.For<ITrajectoryEditableRepository<TrajectoryGeoFactDto>>();
+        trajectoryFactManualExportService = new TrajectoryFactManualExportService(wellService, trajectoryFactManualReposirory);
+
+        trajectoryFactNnbRepository = Substitute.For<ITrajectoryNnbRepository>();
+        trajectoryFactNnbExportService = new TrajectoryFactNnbExportService(wellService, trajectoryFactNnbRepository);
+    }
+
+    [Fact]
+    public async Task Export_trajectory_plan()
+    {
+        trajectoryPlanRepository.GetAsync(idWell, CancellationToken.None)
+            .Returns(trajectoryPlanRows);
         
-        private IWellService wellService;
-        private readonly ITrajectoryEditableRepository<TrajectoryGeoPlanDto> trajectoryPlanRepository;
-        private readonly TrajectoryPlanExportService trajectoryPlanExportService;
+        var stream = await trajectoryPlanExportService.ExportAsync(exportOptions, CancellationToken.None);
+        Assert.True(stream.File.Length > 0);
+    }
 
-        private readonly ITrajectoryEditableRepository<TrajectoryGeoFactDto> trajectoryFactManualReposirory;
-        private readonly TrajectoryFactManualExportService trajectoryFactManualExportService;
+    [Fact]
+    public async Task Export_trajectory_fact_manual()
+    {
+        trajectoryFactManualReposirory.GetAsync(idWell, CancellationToken.None)
+            .Returns(trajectoryFactRows);
+        
+        var stream = await trajectoryFactManualExportService.ExportAsync(exportOptions, CancellationToken.None);
+        Assert.True(stream.File.Length > 0);
+    }
 
-        private readonly ITrajectoryNnbRepository trajectoryFactNnbRepository;
-        private readonly TrajectoryFactNnbExportService trajectoryFactNnbExportService;
-
-        private readonly TrajectoryGeoPlanDto[] trajectoryPlanRows = new TrajectoryGeoPlanDto[2] {
-                new TrajectoryGeoPlanDto() {
-                    Id = 1,
-                    AzimuthGeo = 1,
-                    AzimuthMagnetic = 2,
-                    Comment = "комментарий",
-                    IdUser = 1,
-                    IdWell = 4,
-                    Radius = 3,
-                    UpdateDate = DateTimeOffset.Now,
-                    VerticalDepth = 100,
-                    WellboreDepth = 100,
-                    ZenithAngle = 10
-                },
-               new TrajectoryGeoPlanDto() {
-                    Id = 2,
-                    AzimuthGeo = 1,
-                    AzimuthMagnetic = 2,
-                    Comment = "комментарий",
-                    IdUser = 1,
-                    IdWell = 4,
-                    Radius = 3,
-                    UpdateDate = DateTimeOffset.Now,
-                    VerticalDepth = 100,
-                    WellboreDepth = 100,
-                    ZenithAngle = 10
-                },
-            };
-
-        private readonly TrajectoryGeoFactDto[] trajectoryFactRows = new TrajectoryGeoFactDto[2] {
-                new TrajectoryGeoFactDto() {
-                    Id = 1,
-                    AzimuthGeo = 1,
-                    AzimuthMagnetic = 2,
-                    Comment = "комментарий",
-                    IdUser = 1,
-                    IdWell = 4,
-                    UpdateDate = DateTimeOffset.Now,
-                    VerticalDepth = 100,
-                    WellboreDepth = 100,
-                    ZenithAngle = 10
-                },
-               new TrajectoryGeoFactDto() {
-                    Id = 2,
-                    AzimuthGeo = 1,
-                    AzimuthMagnetic = 2,
-                    Comment = "комментарий",
-                    IdUser = 1,
-                    IdWell = 4,
-                    UpdateDate = DateTimeOffset.Now,
-                    VerticalDepth = 100,
-                    WellboreDepth = 100,
-                    ZenithAngle = 10
-                },
-            };
-
-        private readonly WellRelatedExportRequest exportOptions = new(idWell);
-
-        public TrajectoryExportTest()
-        {
-            wellService = Substitute.For<IWellService>();
-            trajectoryPlanRepository = Substitute.For<ITrajectoryEditableRepository<TrajectoryGeoPlanDto>>();
-            trajectoryPlanExportService = new TrajectoryPlanExportService(wellService, trajectoryPlanRepository);
-
-            trajectoryFactManualReposirory = Substitute.For<ITrajectoryEditableRepository<TrajectoryGeoFactDto>>();
-            trajectoryFactManualExportService = new TrajectoryFactManualExportService(wellService, trajectoryFactManualReposirory);
-
-            trajectoryFactNnbRepository = Substitute.For<ITrajectoryNnbRepository>();
-            trajectoryFactNnbExportService = new TrajectoryFactNnbExportService(wellService, trajectoryFactNnbRepository);
-        }
-
-        [Fact]
-        public async Task Export_trajectory_plan()
-        {
-            trajectoryPlanRepository.GetAsync(idWell, CancellationToken.None)
-                .Returns(trajectoryPlanRows);
-            
-            var stream = await trajectoryPlanExportService.ExportAsync(exportOptions, CancellationToken.None);
-            Assert.True(stream.File.Length > 0);
-        }
-
-        [Fact]
-        public async Task Export_trajectory_fact_manual()
-        {
-            trajectoryFactManualReposirory.GetAsync(idWell, CancellationToken.None)
-                .Returns(trajectoryFactRows);
-            
-            var stream = await trajectoryFactManualExportService.ExportAsync(exportOptions, CancellationToken.None);
-            Assert.True(stream.File.Length > 0);
-        }
-
-        [Fact]
-        public async Task Export_trajectory_fact_nnb()
-        {
-            trajectoryFactNnbRepository.GetAsync(idWell, CancellationToken.None)
-               .Returns(trajectoryFactRows);
-            
-            var stream = await trajectoryFactNnbExportService.ExportAsync(exportOptions, CancellationToken.None);
-            Assert.True(stream.File.Length > 0);
-        }
+    [Fact]
+    public async Task Export_trajectory_fact_nnb()
+    {
+        trajectoryFactNnbRepository.GetAsync(idWell, CancellationToken.None)
+           .Returns(trajectoryFactRows);
+        
+        var stream = await trajectoryFactNnbExportService.ExportAsync(exportOptions, CancellationToken.None);
+        Assert.True(stream.File.Length > 0);
     }
 }
diff --git a/AsbCloudWebApi.Tests/Services/WellCompositeOperation/WellCompositeOperationServiceTest.cs b/AsbCloudWebApi.Tests/Services/WellCompositeOperation/WellCompositeOperationServiceTest.cs
index 7216aa09..8c5961ed 100644
--- a/AsbCloudWebApi.Tests/Services/WellCompositeOperation/WellCompositeOperationServiceTest.cs
+++ b/AsbCloudWebApi.Tests/Services/WellCompositeOperation/WellCompositeOperationServiceTest.cs
@@ -12,303 +12,302 @@ using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace AsbCloudWebApi.Tests.Services.WellCompositeOperation
+namespace AsbCloudWebApi.Tests.Services.WellCompositeOperation;
+
+public class WellCompositeOperationServiceTest
 {
-    public class WellCompositeOperationServiceTest
+    private WellCompositeOperationService service;
+
+    private ICrudRepository<WellSectionTypeDto> wellSectionTypeRepository
+        = Substitute.For<ICrudRepository<WellSectionTypeDto>>();
+    private IWellOperationCategoryRepository wellOperationCategoryRepository
+        = Substitute.For<IWellOperationCategoryRepository>();
+    private IWellOperationService wellOperationService
+       = Substitute.For<IWellOperationService>();
+    private IWellService wellService
+       = Substitute.For<IWellService>();
+    private List<int> idsWells;
+    private readonly static IEnumerable<WellOperationCategoryDto> operationCategories = new List<WellOperationCategoryDto>()
     {
-        private WellCompositeOperationService service;
+        new(){Id = 5096, Name = "Шаблонирование перед спуском"},
+        new(){Id = 5008, Name = "Шаблонировка во время бурения"},
+        new(){Id = 5013, Name = "Подъем КНБК"},
+        new(){Id = 5003, Name = "Бурение ротором"},
+        new(){Id = 5036, Name = "Промывка"},
+        new(){Id = 5012, Name = "Подъем инструмента"},
+        new(){Id = 5083, Name = "Проработка принудительная"},
+        new(){Id = 5113, Name = "Бурение"},
+    };
 
-        private ICrudRepository<WellSectionTypeDto> wellSectionTypeRepository
-            = Substitute.For<ICrudRepository<WellSectionTypeDto>>();
-        private IWellOperationCategoryRepository wellOperationCategoryRepository
-            = Substitute.For<IWellOperationCategoryRepository>();
-        private IWellOperationService wellOperationService
-           = Substitute.For<IWellOperationService>();
-        private IWellService wellService
-           = Substitute.For<IWellService>();
-        private List<int> idsWells;
-        private readonly static IEnumerable<WellOperationCategoryDto> operationCategories = new List<WellOperationCategoryDto>()
+    private readonly static IEnumerable<WellSectionTypeDto> sectionTypes = new List<WellSectionTypeDto>()
+    {
+        new() {Id = 2, Caption = "Направление", Order = 0},
+        new() {Id = 3, Caption = "Кондуктор", Order = 1},
+        new() {Id = 31, Caption = "Техническая колонна", Order = 2}
+    };
+
+    private readonly static IEnumerable<WellDto> wells = new List<WellDto>()
+    {
+        new() {Id = 55, Caption = "Скважина с ключом 55"},
+        new() {Id = 64, Caption = "Скважина с ключом 64"},
+    };
+
+    private readonly static IEnumerable<WellOperationDto> wellOperations1 = new List<WellOperationDto>()
+    {
+        new()
         {
-            new(){Id = 5096, Name = "Шаблонирование перед спуском"},
-            new(){Id = 5008, Name = "Шаблонировка во время бурения"},
-            new(){Id = 5013, Name = "Подъем КНБК"},
-            new(){Id = 5003, Name = "Бурение ротором"},
-            new(){Id = 5036, Name = "Промывка"},
-            new(){Id = 5012, Name = "Подъем инструмента"},
-            new(){Id = 5083, Name = "Проработка принудительная"},
-            new(){Id = 5113, Name = "Бурение"},
-        };
-
-        private readonly static IEnumerable<WellSectionTypeDto> sectionTypes = new List<WellSectionTypeDto>()
+            DepthStart = 50,
+            DurationHours = 1,
+            IdCategory = 5096,
+            IdWell = 55,
+            IdWellSectionType = 2,
+            OperationCategoryName = "Шаблонирование перед спуском",
+            WellSectionTypeCaption = "Направление"
+        },
+        new()
         {
-            new() {Id = 2, Caption = "Направление", Order = 0},
-            new() {Id = 3, Caption = "Кондуктор", Order = 1},
-            new() {Id = 31, Caption = "Техническая колонна", Order = 2}
-        };
-
-        private readonly static IEnumerable<WellDto> wells = new List<WellDto>()
-        {
-            new() {Id = 55, Caption = "Скважина с ключом 55"},
-            new() {Id = 64, Caption = "Скважина с ключом 64"},
-        };
-
-        private readonly static IEnumerable<WellOperationDto> wellOperations1 = new List<WellOperationDto>()
-        {
-            new()
-            {
-                DepthStart = 50,
-                DurationHours = 1,
-                IdCategory = 5096,
-                IdWell = 55,
-                IdWellSectionType = 2,
-                OperationCategoryName = "Шаблонирование перед спуском",
-                WellSectionTypeCaption = "Направление"
-            },
-            new()
-            {
-                DepthStart = 84,
-                DurationHours = 1,
-                IdCategory = 5008,
-                IdWell = 64,
-                IdWellSectionType = 2,
-                OperationCategoryName = "Шаблонировка во время бурения",
-                WellSectionTypeCaption = "Направление"
-            }
-        };
-
-        private readonly static IEnumerable<WellOperationDto> wellOperations2 = new List<WellOperationDto>()
-        {
-            new()
-            {
-                DepthStart = 10,
-                DurationHours = 1.5,
-                IdCategory = 5003,
-                IdWell = 55,
-                IdWellSectionType = 2,
-                OperationCategoryName = "Бурение ротором",
-                WellSectionTypeCaption = "Направление"
-            },
-            new()
-            {
-                DepthStart = 20,
-                DurationHours = 3.5,
-                IdCategory = 5003,
-                IdWell = 64,
-                IdWellSectionType = 2,
-                OperationCategoryName = "Бурение ротором",
-                WellSectionTypeCaption = "Направление"
-            }
-        };
-
-        private readonly static IEnumerable<WellOperationDto> wellOperations3 = new List<WellOperationDto>()
-        {
-            new()
-            {
-                DepthStart = 1372,
-                DurationHours = 3,
-                IdCategory = 5036,
-                IdWell = 55,
-                IdWellSectionType = 3,
-                OperationCategoryName = "Промывка",
-                WellSectionTypeCaption = "Кондуктор"
-            },
-            new()
-            {
-                DepthStart = 1435,
-                DurationHours = 4,
-                IdCategory = 5036,
-                IdWell = 64,
-                IdWellSectionType = 3,
-                OperationCategoryName = "Промывка",
-                WellSectionTypeCaption = "Кондуктор"
-            }
-        };
-
-        private readonly static IEnumerable<WellOperationDto> wellOperations4 = new List<WellOperationDto>()
-        {
-            new()
-            {
-                DepthStart = 1000,
-                DurationHours = 10,
-                IdCategory = 5012,
-                IdWell = 55,
-                IdWellSectionType = 31,
-                OperationCategoryName = "Подъем инструмента",
-                WellSectionTypeCaption = "Техническая колонна"
-            },
-            new()
-            {
-                DepthStart = 500,
-                DurationHours = 5,
-                IdCategory = 5083,
-                IdWell = 55,
-                IdWellSectionType = 31,
-                OperationCategoryName = "Проработка принудительная",
-                WellSectionTypeCaption = "Техническая колонна"
-            },
-            new()
-            {
-                DepthStart = 600,
-                DurationHours = 5,
-                IdCategory = 5083,
-                IdWell = 64,
-                IdWellSectionType = 31,
-                OperationCategoryName = "Проработка принудительная",
-                WellSectionTypeCaption = "Техническая колонна"
-            }
-        };
-
-        public WellCompositeOperationServiceTest()
-        {
-
-            wellSectionTypeRepository.GetAllAsync(Arg.Any<CancellationToken>())
-                .Returns(sectionTypes);
-
-            wellOperationCategoryRepository.Get(Arg.Any<bool>())
-                .Returns(operationCategories);
-
-            idsWells = new List<int>() { 55, 64 };
-
-            wellService.GetAsync(Arg.Any<WellRequest>(), Arg.Any<CancellationToken>())
-                .Returns(wells);
-
-            service = new WellCompositeOperationService(
-                wellSectionTypeRepository,
-                wellOperationCategoryRepository,
-                wellService,
-                wellOperationService);
+            DepthStart = 84,
+            DurationHours = 1,
+            IdCategory = 5008,
+            IdWell = 64,
+            IdWellSectionType = 2,
+            OperationCategoryName = "Шаблонировка во время бурения",
+            WellSectionTypeCaption = "Направление"
         }
+    };
 
-        /// <summary>
-        /// На вход подаются 2 операции с одинаковыми секциями (id = 2), но разными категориями (ids = 5096, 5008) и ключами скважин (ids = 55, 64)
-        /// Метод возвращает объект с одной композитной операцией и списком операций в разрезе 2-х скважин
-        /// Композитная операция должна иметь категорию 5013
-        /// </summary>
-        /// <returns></returns>
-        [Fact]
-        public async Task GetAsync_return_composite_and_others_with_category_5013()
+    private readonly static IEnumerable<WellOperationDto> wellOperations2 = new List<WellOperationDto>()
+    {
+        new()
         {
-            // arrange
-            wellOperationService.GetAsync(Arg.Any<WellOperationRequest>(), Arg.Any<CancellationToken>())
-                .Returns(wellOperations1);
-
-            // act
-            var result = await service.GetAsync(idsWells, CancellationToken.None);
-
-            // assert
-            var compositeWellOperations = result.WellOperationsComposite;
-            Assert.Single(compositeWellOperations);
-            Assert.Equal(5013, compositeWellOperations.FirstOrDefault()?.IdCategory);
-            Assert.Equal(1, compositeWellOperations.FirstOrDefault()?.DurationHours);
-            Assert.Equal(84, compositeWellOperations.FirstOrDefault()?.DepthStart);
-
-            var categoryName = compositeWellOperations.Select(o => o.OperationCategoryName).First();
-            Assert.Equal("Подъем КНБК", categoryName);
-        }
-
-        /// <summary>
-        /// На вход подаются 2 операции с одинаковыми секциями (id = 2) и категориями (id = 5003), но разными ключами скважин (ids = 55, 64)
-        /// Метод возвращает объект с одной композитной операцией и списком операций в разрезе 2-х скважин
-        /// Операция композитной скважины должна содержать данные той операции, которая содержит минимальный duration_hours 
-        /// </summary>
-        /// <returns></returns>
-        [Fact]
-        public async Task GetAsync_return_composite_with_minimum_depth_start()
+            DepthStart = 10,
+            DurationHours = 1.5,
+            IdCategory = 5003,
+            IdWell = 55,
+            IdWellSectionType = 2,
+            OperationCategoryName = "Бурение ротором",
+            WellSectionTypeCaption = "Направление"
+        },
+        new()
         {
-            // arrange
-            wellOperationService.GetAsync(Arg.Any<WellOperationRequest>(), Arg.Any<CancellationToken>())
-                .Returns(wellOperations2);
-
-            // act
-            var result = await service.GetAsync(idsWells, CancellationToken.None);
-
-            // assert
-            var compositeWellOperations = result.WellOperationsComposite;
-            Assert.Single(compositeWellOperations);
-            Assert.Equal(5113, compositeWellOperations.FirstOrDefault()!.IdCategory);
-            Assert.Equal(1.5, compositeWellOperations.FirstOrDefault()!.DurationHours);
-            Assert.Equal(10, compositeWellOperations.FirstOrDefault()!.DepthStart);
+            DepthStart = 20,
+            DurationHours = 3.5,
+            IdCategory = 5003,
+            IdWell = 64,
+            IdWellSectionType = 2,
+            OperationCategoryName = "Бурение ротором",
+            WellSectionTypeCaption = "Направление"
         }
+    };
 
-        /// <summary>
-        /// На вход подаются 2 операции с одинаковыми секциями (id = 3) и категориями (id = 5036), но разными ключами скважин (ids = 55, 64)
-        /// Метод возвращает объект с одной композитной операцией и списком операций в разрезе 2-х скважин
-        /// Операция композитной скважины должна содержать данные той операции, которая содержит минимальный duration_hours 
-        /// </summary>
-        /// <returns></returns>
-        [Fact]
-        public async Task GetAsync_return_data3()
+    private readonly static IEnumerable<WellOperationDto> wellOperations3 = new List<WellOperationDto>()
+    {
+        new()
         {
-            // arrange
-            wellOperationService.GetAsync(Arg.Any<WellOperationRequest>(), Arg.Any<CancellationToken>())
-                .Returns(wellOperations3);
-
-            // act
-            var result = await service.GetAsync(idsWells, CancellationToken.None);
-
-            // assert
-            var compositeWellOperations = result.WellOperationsComposite;
-            Assert.Single(compositeWellOperations);
-            Assert.Equal(5036, compositeWellOperations.FirstOrDefault()!.IdCategory);
-            Assert.Equal(3, compositeWellOperations.FirstOrDefault()!.DurationHours);
-            Assert.Equal(1372, compositeWellOperations.FirstOrDefault()!.DepthStart);
-        }
-
-        /// <summary>
-        /// На вход подаются 3 операции с одинаковыми секциями (id = 31), но разными категориями (ids = 5012, 5083) и ключами скважин (ids = 55, 64)
-        /// Метод возвращает объект с одной композитной операцией и списком операций в разрезе 2-х скважин
-        /// Операция композитной скважины должна содержать:
-        ///     данные той операции, которая содержит минимальный duration_hours
-        ///     категорию с ключом 5013
-        /// </summary>
-        /// <returns></returns>
-        [Fact]
-        public async Task GetAsync_return_data4()
+            DepthStart = 1372,
+            DurationHours = 3,
+            IdCategory = 5036,
+            IdWell = 55,
+            IdWellSectionType = 3,
+            OperationCategoryName = "Промывка",
+            WellSectionTypeCaption = "Кондуктор"
+        },
+        new()
         {
-            // arrange
-            wellOperationService.GetAsync(Arg.Any<WellOperationRequest>(), Arg.Any<CancellationToken>())
-                .Returns(wellOperations4);
-
-            // act
-            var result = await service.GetAsync(idsWells, CancellationToken.None);
-
-            // assert
-            var compositeWellOperations = result.WellOperationsComposite;
-            Assert.Single(compositeWellOperations);
-            Assert.Equal(5013, compositeWellOperations.FirstOrDefault()!.IdCategory);
-            Assert.Equal(5, compositeWellOperations.FirstOrDefault()!.DurationHours);
-            Assert.Equal(600, compositeWellOperations.FirstOrDefault()!.DepthStart);
+            DepthStart = 1435,
+            DurationHours = 4,
+            IdCategory = 5036,
+            IdWell = 64,
+            IdWellSectionType = 3,
+            OperationCategoryName = "Промывка",
+            WellSectionTypeCaption = "Кондуктор"
         }
+    };
 
-        /// <summary>
-        /// На вход подаются список разных операций с разными ключами скважин (ids = 55, 64)
-        /// Метод возвращает объект с одной композитной операцией и списком операций в разрезе 2-х скважин
-        /// Операция композитной скважины должна содержать глубину забоя = 1372
-        /// </summary>
-        /// <returns></returns>
-        [Fact]
-        public async Task GetAsync_return_data5()
+    private readonly static IEnumerable<WellOperationDto> wellOperations4 = new List<WellOperationDto>()
+    {
+        new()
         {
-            // arrange
-            var wellOperations = new List<WellOperationDto>();
-            wellOperations.AddRange(wellOperations1);
-            wellOperations.AddRange(wellOperations2);
-            wellOperations.AddRange(wellOperations3);
-            wellOperations.AddRange(wellOperations4);
-
-            wellOperationService.GetAsync(Arg.Any<WellOperationRequest>(), Arg.Any<CancellationToken>())
-                .Returns(wellOperations);
-
-            // act
-            var result = await service.GetAsync(idsWells, CancellationToken.None);
-
-            // assert
-            var wellOperationsCount = result.WellCompositeSourceOperations
-                .SelectMany(o => o.Operations).Count();
-            Assert.Equal(wellOperations.Count(), wellOperationsCount);
-
-            var lastOperationComposite = result.WellOperationsComposite.Last();
-            Assert.Equal(1372, lastOperationComposite.DepthStart);
+            DepthStart = 1000,
+            DurationHours = 10,
+            IdCategory = 5012,
+            IdWell = 55,
+            IdWellSectionType = 31,
+            OperationCategoryName = "Подъем инструмента",
+            WellSectionTypeCaption = "Техническая колонна"
+        },
+        new()
+        {
+            DepthStart = 500,
+            DurationHours = 5,
+            IdCategory = 5083,
+            IdWell = 55,
+            IdWellSectionType = 31,
+            OperationCategoryName = "Проработка принудительная",
+            WellSectionTypeCaption = "Техническая колонна"
+        },
+        new()
+        {
+            DepthStart = 600,
+            DurationHours = 5,
+            IdCategory = 5083,
+            IdWell = 64,
+            IdWellSectionType = 31,
+            OperationCategoryName = "Проработка принудительная",
+            WellSectionTypeCaption = "Техническая колонна"
         }
+    };
+
+    public WellCompositeOperationServiceTest()
+    {
+
+        wellSectionTypeRepository.GetAllAsync(Arg.Any<CancellationToken>())
+            .Returns(sectionTypes);
+
+        wellOperationCategoryRepository.Get(Arg.Any<bool>())
+            .Returns(operationCategories);
+
+        idsWells = new List<int>() { 55, 64 };
+
+        wellService.GetAsync(Arg.Any<WellRequest>(), Arg.Any<CancellationToken>())
+            .Returns(wells);
+
+        service = new WellCompositeOperationService(
+            wellSectionTypeRepository,
+            wellOperationCategoryRepository,
+            wellService,
+            wellOperationService);
+    }
+
+    /// <summary>
+    /// На вход подаются 2 операции с одинаковыми секциями (id = 2), но разными категориями (ids = 5096, 5008) и ключами скважин (ids = 55, 64)
+    /// Метод возвращает объект с одной композитной операцией и списком операций в разрезе 2-х скважин
+    /// Композитная операция должна иметь категорию 5013
+    /// </summary>
+    /// <returns></returns>
+    [Fact]
+    public async Task GetAsync_return_composite_and_others_with_category_5013()
+    {
+        // arrange
+        wellOperationService.GetAsync(Arg.Any<WellOperationRequest>(), Arg.Any<CancellationToken>())
+            .Returns(wellOperations1);
+
+        // act
+        var result = await service.GetAsync(idsWells, CancellationToken.None);
+
+        // assert
+        var compositeWellOperations = result.WellOperationsComposite;
+        Assert.Single(compositeWellOperations);
+        Assert.Equal(5013, compositeWellOperations.FirstOrDefault()?.IdCategory);
+        Assert.Equal(1, compositeWellOperations.FirstOrDefault()?.DurationHours);
+        Assert.Equal(84, compositeWellOperations.FirstOrDefault()?.DepthStart);
+
+        var categoryName = compositeWellOperations.Select(o => o.OperationCategoryName).First();
+        Assert.Equal("Подъем КНБК", categoryName);
+    }
+
+    /// <summary>
+    /// На вход подаются 2 операции с одинаковыми секциями (id = 2) и категориями (id = 5003), но разными ключами скважин (ids = 55, 64)
+    /// Метод возвращает объект с одной композитной операцией и списком операций в разрезе 2-х скважин
+    /// Операция композитной скважины должна содержать данные той операции, которая содержит минимальный duration_hours 
+    /// </summary>
+    /// <returns></returns>
+    [Fact]
+    public async Task GetAsync_return_composite_with_minimum_depth_start()
+    {
+        // arrange
+        wellOperationService.GetAsync(Arg.Any<WellOperationRequest>(), Arg.Any<CancellationToken>())
+            .Returns(wellOperations2);
+
+        // act
+        var result = await service.GetAsync(idsWells, CancellationToken.None);
+
+        // assert
+        var compositeWellOperations = result.WellOperationsComposite;
+        Assert.Single(compositeWellOperations);
+        Assert.Equal(5113, compositeWellOperations.FirstOrDefault()!.IdCategory);
+        Assert.Equal(1.5, compositeWellOperations.FirstOrDefault()!.DurationHours);
+        Assert.Equal(10, compositeWellOperations.FirstOrDefault()!.DepthStart);
+    }
+
+    /// <summary>
+    /// На вход подаются 2 операции с одинаковыми секциями (id = 3) и категориями (id = 5036), но разными ключами скважин (ids = 55, 64)
+    /// Метод возвращает объект с одной композитной операцией и списком операций в разрезе 2-х скважин
+    /// Операция композитной скважины должна содержать данные той операции, которая содержит минимальный duration_hours 
+    /// </summary>
+    /// <returns></returns>
+    [Fact]
+    public async Task GetAsync_return_data3()
+    {
+        // arrange
+        wellOperationService.GetAsync(Arg.Any<WellOperationRequest>(), Arg.Any<CancellationToken>())
+            .Returns(wellOperations3);
+
+        // act
+        var result = await service.GetAsync(idsWells, CancellationToken.None);
+
+        // assert
+        var compositeWellOperations = result.WellOperationsComposite;
+        Assert.Single(compositeWellOperations);
+        Assert.Equal(5036, compositeWellOperations.FirstOrDefault()!.IdCategory);
+        Assert.Equal(3, compositeWellOperations.FirstOrDefault()!.DurationHours);
+        Assert.Equal(1372, compositeWellOperations.FirstOrDefault()!.DepthStart);
+    }
+
+    /// <summary>
+    /// На вход подаются 3 операции с одинаковыми секциями (id = 31), но разными категориями (ids = 5012, 5083) и ключами скважин (ids = 55, 64)
+    /// Метод возвращает объект с одной композитной операцией и списком операций в разрезе 2-х скважин
+    /// Операция композитной скважины должна содержать:
+    ///     данные той операции, которая содержит минимальный duration_hours
+    ///     категорию с ключом 5013
+    /// </summary>
+    /// <returns></returns>
+    [Fact]
+    public async Task GetAsync_return_data4()
+    {
+        // arrange
+        wellOperationService.GetAsync(Arg.Any<WellOperationRequest>(), Arg.Any<CancellationToken>())
+            .Returns(wellOperations4);
+
+        // act
+        var result = await service.GetAsync(idsWells, CancellationToken.None);
+
+        // assert
+        var compositeWellOperations = result.WellOperationsComposite;
+        Assert.Single(compositeWellOperations);
+        Assert.Equal(5013, compositeWellOperations.FirstOrDefault()!.IdCategory);
+        Assert.Equal(5, compositeWellOperations.FirstOrDefault()!.DurationHours);
+        Assert.Equal(600, compositeWellOperations.FirstOrDefault()!.DepthStart);
+    }
+
+    /// <summary>
+    /// На вход подаются список разных операций с разными ключами скважин (ids = 55, 64)
+    /// Метод возвращает объект с одной композитной операцией и списком операций в разрезе 2-х скважин
+    /// Операция композитной скважины должна содержать глубину забоя = 1372
+    /// </summary>
+    /// <returns></returns>
+    [Fact]
+    public async Task GetAsync_return_data5()
+    {
+        // arrange
+        var wellOperations = new List<WellOperationDto>();
+        wellOperations.AddRange(wellOperations1);
+        wellOperations.AddRange(wellOperations2);
+        wellOperations.AddRange(wellOperations3);
+        wellOperations.AddRange(wellOperations4);
+
+        wellOperationService.GetAsync(Arg.Any<WellOperationRequest>(), Arg.Any<CancellationToken>())
+            .Returns(wellOperations);
+
+        // act
+        var result = await service.GetAsync(idsWells, CancellationToken.None);
+
+        // assert
+        var wellOperationsCount = result.WellCompositeSourceOperations
+            .SelectMany(o => o.Operations).Count();
+        Assert.Equal(wellOperations.Count(), wellOperationsCount);
+
+        var lastOperationComposite = result.WellOperationsComposite.Last();
+        Assert.Equal(1372, lastOperationComposite.DepthStart);
     }
 }
diff --git a/AsbCloudWebApi.Tests/Services/WellOperationServiceTest.cs b/AsbCloudWebApi.Tests/Services/WellOperationServiceTest.cs
index 3927e9b0..48b52e2f 100644
--- a/AsbCloudWebApi.Tests/Services/WellOperationServiceTest.cs
+++ b/AsbCloudWebApi.Tests/Services/WellOperationServiceTest.cs
@@ -4,15 +4,12 @@ using AsbCloudApp.Repositories;
 using AsbCloudApp.Requests;
 using AsbCloudApp.Services;
 using AsbCloudDb.Model;
-using AsbCloudInfrastructure.Repository;
-using AsbCloudInfrastructure.Services;
 using AsbCloudInfrastructure.Services.WellOperationService.WellOperationService;
 using Mapster;
 using NSubstitute;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
diff --git a/AsbCloudWebApi/Controllers/AdminClusterController.cs b/AsbCloudWebApi/Controllers/AdminClusterController.cs
index e99c7d70..f60c9788 100644
--- a/AsbCloudWebApi/Controllers/AdminClusterController.cs
+++ b/AsbCloudWebApi/Controllers/AdminClusterController.cs
@@ -3,18 +3,17 @@ using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Редактор кустов для админки
+/// </summary>
+[Route("api/admin/cluster")]
+[ApiController]
+[Authorize]
+public class AdminClusterController : CrudController<ClusterDto, ICrudRepository<ClusterDto>>
 {
-    /// <summary>
-    /// Редактор кустов для админки
-    /// </summary>
-    [Route("api/admin/cluster")]
-    [ApiController]
-    [Authorize]
-    public class AdminClusterController : CrudController<ClusterDto, ICrudRepository<ClusterDto>>
-    {
-        public AdminClusterController(ICrudRepository<ClusterDto> service)
-            : base(service)
-        { }
-    }
+    public AdminClusterController(ICrudRepository<ClusterDto> service)
+        : base(service)
+    { }
 }
diff --git a/AsbCloudWebApi/Controllers/AdminCompanyController.cs b/AsbCloudWebApi/Controllers/AdminCompanyController.cs
index 819c79e0..a97a670b 100644
--- a/AsbCloudWebApi/Controllers/AdminCompanyController.cs
+++ b/AsbCloudWebApi/Controllers/AdminCompanyController.cs
@@ -3,19 +3,18 @@ using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Редактор компаний для админки
+/// </summary>
+[Route("api/admin/company")]
+[ApiController]
+[Authorize]
+public class AdminCompanyController : CrudController<CompanyDto, ICrudRepository<CompanyDto>>
 {
-    /// <summary>
-    /// Редактор компаний для админки
-    /// </summary>
-    [Route("api/admin/company")]
-    [ApiController]
-    [Authorize]
-    public class AdminCompanyController : CrudController<CompanyDto, ICrudRepository<CompanyDto>>
+    public AdminCompanyController(ICrudRepository<CompanyDto> service)
+        : base(service)
     {
-        public AdminCompanyController(ICrudRepository<CompanyDto> service)
-            : base(service)
-        {
-        }
     }
 }
diff --git a/AsbCloudWebApi/Controllers/AdminCompanyTypeController.cs b/AsbCloudWebApi/Controllers/AdminCompanyTypeController.cs
index 71cf7b61..13ebe885 100644
--- a/AsbCloudWebApi/Controllers/AdminCompanyTypeController.cs
+++ b/AsbCloudWebApi/Controllers/AdminCompanyTypeController.cs
@@ -3,18 +3,17 @@ using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Редактор типов компаний для админки
+/// </summary>
+[Route("api/admin/companyType")]
+[ApiController]
+[Authorize]
+public class AdminCompanyTypeController : CrudController<CompanyTypeDto, ICrudRepository<CompanyTypeDto>>
 {
-    /// <summary>
-    /// Редактор типов компаний для админки
-    /// </summary>
-    [Route("api/admin/companyType")]
-    [ApiController]
-    [Authorize]
-    public class AdminCompanyTypeController : CrudController<CompanyTypeDto, ICrudRepository<CompanyTypeDto>>
-    {
-        public AdminCompanyTypeController(ICrudRepository<CompanyTypeDto> service)
-            : base(service)
-        { }
-    }
+    public AdminCompanyTypeController(ICrudRepository<CompanyTypeDto> service)
+        : base(service)
+    { }
 }
\ No newline at end of file
diff --git a/AsbCloudWebApi/Controllers/AdminDepositController.cs b/AsbCloudWebApi/Controllers/AdminDepositController.cs
index c558d1d6..dead7e28 100644
--- a/AsbCloudWebApi/Controllers/AdminDepositController.cs
+++ b/AsbCloudWebApi/Controllers/AdminDepositController.cs
@@ -3,19 +3,18 @@ using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Редактор месторождений для админки
+/// </summary>
+[Route("api/admin/deposit")]
+[ApiController]
+[Authorize]
+public class AdminDepositController : CrudController<DepositDto, ICrudRepository<DepositDto>>
 {
-    /// <summary>
-    /// Редактор месторождений для админки
-    /// </summary>
-    [Route("api/admin/deposit")]
-    [ApiController]
-    [Authorize]
-    public class AdminDepositController : CrudController<DepositDto, ICrudRepository<DepositDto>>
+    public AdminDepositController(ICrudRepository<DepositDto> service)
+        : base(service)
     {
-        public AdminDepositController(ICrudRepository<DepositDto> service)
-            : base(service)
-        {
-        }
     }
 }
diff --git a/AsbCloudWebApi/Controllers/AdminPermissionController.cs b/AsbCloudWebApi/Controllers/AdminPermissionController.cs
index 4444f335..9ef9b053 100644
--- a/AsbCloudWebApi/Controllers/AdminPermissionController.cs
+++ b/AsbCloudWebApi/Controllers/AdminPermissionController.cs
@@ -7,56 +7,55 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Редактор разрешений пользователей для админки
+/// </summary>
+[Route("api/admin/permission")]
+[ApiController]
+[Authorize]
+public class AdminPermissionController : CrudController<PermissionDto, ICrudRepository<PermissionDto>>
 {
-    /// <summary>
-    /// Редактор разрешений пользователей для админки
-    /// </summary>
-    [Route("api/admin/permission")]
-    [ApiController]
-    [Authorize]
-    public class AdminPermissionController : CrudController<PermissionDto, ICrudRepository<PermissionDto>>
+    public AdminPermissionController(ICrudRepository<PermissionDto> service)
+        : base(service)
+    { }
+
+    [HttpGet("Autogenerated")]
+    [Permission]
+    public IActionResult GetAutogenerated()
     {
-        public AdminPermissionController(ICrudRepository<PermissionDto> service)
-            : base(service)
-        { }
+        var controllers = Assembly.GetExecutingAssembly().GetTypes().
+            Where(type => typeof(ControllerBase).IsAssignableFrom(type) && !type.IsAbstract)
+            .ToList();
 
-        [HttpGet("Autogenerated")]
-        [Permission]
-        public IActionResult GetAutogenerated()
+        var permissions = new SortedSet<string>();
+        foreach (var controller in controllers)
         {
-            var controllers = Assembly.GetExecutingAssembly().GetTypes().
-                Where(type => typeof(ControllerBase).IsAssignableFrom(type) && !type.IsAbstract)
-                .ToList();
-
-            var permissions = new SortedSet<string>();
-            foreach (var controller in controllers)
+            var methods = controller.GetMethods().Where(m => m.IsPublic);
+            var controllerName = controller.Name.Replace("Controller", "");
+            foreach (var method in methods)
             {
-                var methods = controller.GetMethods().Where(m => m.IsPublic);
-                var controllerName = controller.Name.Replace("Controller", "");
-                foreach (var method in methods)
+                var httpMethod = method.GetCustomAttribute<HttpMethodAttribute>()?.HttpMethods?.First().ToLower();
+                switch (httpMethod)
                 {
-                    var httpMethod = method.GetCustomAttribute<HttpMethodAttribute>()?.HttpMethods?.First().ToLower();
-                    switch (httpMethod)
-                    {
-                        case "get":
-                        case "delete":
-                            permissions.Add($"{controllerName}.{httpMethod.ToLower()}");
-                            continue;
-                        case "post":
-                        case "put":
-                        case "patch":
-                            permissions.Add($"{controllerName}.edit");
-                            continue;
-                        default:
-                            continue;
-                    }
-
+                    case "get":
+                    case "delete":
+                        permissions.Add($"{controllerName}.{httpMethod.ToLower()}");
+                        continue;
+                    case "post":
+                    case "put":
+                    case "patch":
+                        permissions.Add($"{controllerName}.edit");
+                        continue;
+                    default:
+                        continue;
                 }
+
             }
-
-            return Ok(permissions);
-
         }
+
+        return Ok(permissions);
+
     }
 }
\ No newline at end of file
diff --git a/AsbCloudWebApi/Controllers/AdminTelemetryController.cs b/AsbCloudWebApi/Controllers/AdminTelemetryController.cs
index 6a6eb16e..d81792bd 100644
--- a/AsbCloudWebApi/Controllers/AdminTelemetryController.cs
+++ b/AsbCloudWebApi/Controllers/AdminTelemetryController.cs
@@ -8,56 +8,55 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Редактор телеметрий для админки
+/// </summary>
+[Route("api/admin/telemetry")]
+[ApiController]
+[Authorize]
+public class AdminTelemetryController : CrudController<TelemetryDto, ICrudRepository<TelemetryDto>>
 {
-    /// <summary>
-    /// Редактор телеметрий для админки
-    /// </summary>
-    [Route("api/admin/telemetry")]
-    [ApiController]
-    [Authorize]
-    public class AdminTelemetryController : CrudController<TelemetryDto, ICrudRepository<TelemetryDto>>
+    private readonly ITelemetryService telemetryService;
+    private readonly ITelemetryDataEditorService telemetryEditorService;
+
+    public AdminTelemetryController(ICrudRepository<TelemetryDto> service,
+        ITelemetryService telemetryService,
+        ITelemetryDataEditorService telemetryEditorService)
+        : base(service)
     {
-        private readonly ITelemetryService telemetryService;
-        private readonly ITelemetryDataEditorService telemetryEditorService;
+        this.telemetryService = telemetryService;
+        this.telemetryEditorService = telemetryEditorService;
+    }
 
-        public AdminTelemetryController(ICrudRepository<TelemetryDto> service,
-            ITelemetryService telemetryService,
-            ITelemetryDataEditorService telemetryEditorService)
-            : base(service)
-        {
-            this.telemetryService = telemetryService;
-            this.telemetryEditorService = telemetryEditorService;
-        }
+    /// <summary>
+    /// Merge telemetries. No body required.
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("/merge/{idFrom}/{idTo}")]
+    [Permission]
+    public async Task<IActionResult> MergeTelemetriesAsync(int idFrom, int idTo, CancellationToken token)
+    {
+        var count = await telemetryService.MergeAsync(idFrom, idTo, token)
+            .ConfigureAwait(false);
+        return Ok(count);
+    }
 
-        /// <summary>
-        /// Merge telemetries. No body required.
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost("/merge/{idFrom}/{idTo}")]
-        [Permission]
-        public async Task<IActionResult> MergeTelemetriesAsync(int idFrom, int idTo, CancellationToken token)
-        {
-            var count = await telemetryService.MergeAsync(idFrom, idTo, token)
-                .ConfigureAwait(false);
-            return Ok(count);
-        }
+    /// <summary>
+    /// Удаление куска телеметрии по запросу
+    /// </summary>
+    /// <param name="request">запрос</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpDelete("part")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    [ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)]
+    public async Task<IActionResult> DeleteAsync([FromQuery] TelemetryPartDeleteRequest request,CancellationToken token)
+    {
+        var result = await telemetryEditorService.DeleteAsync(request, token);
 
-        /// <summary>
-        /// Удаление куска телеметрии по запросу
-        /// </summary>
-        /// <param name="request">запрос</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpDelete("part")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        [ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)]
-        public async Task<IActionResult> DeleteAsync([FromQuery] TelemetryPartDeleteRequest request,CancellationToken token)
-        {
-            var result = await telemetryEditorService.DeleteAsync(request, token);
-
-            return Ok(result);
-        }
+        return Ok(result);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/AdminUserController.cs b/AsbCloudWebApi/Controllers/AdminUserController.cs
index f0784c35..e864891a 100644
--- a/AsbCloudWebApi/Controllers/AdminUserController.cs
+++ b/AsbCloudWebApi/Controllers/AdminUserController.cs
@@ -5,19 +5,18 @@ using AsbCloudInfrastructure.Repository;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace AsbCloudWebApi.Controllers
-{
-    /// <summary>
-    /// Редактор пользователей для админки
-    /// </summary>
-    [Route("api/admin/user")]
-    [ApiController]
-    [Authorize]
-    public class AdminUserController : CrudController<UserExtendedDto, ICrudRepository<UserExtendedDto>>
-    {
-        public AdminUserController(IUserRepository service)
-            : base(service)
-        { }
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Редактор пользователей для админки
+/// </summary>
+[Route("api/admin/user")]
+[ApiController]
+[Authorize]
+public class AdminUserController : CrudController<UserExtendedDto, ICrudRepository<UserExtendedDto>>
+{
+    public AdminUserController(IUserRepository service)
+        : base(service)
+    { }
 
-    }
 }
diff --git a/AsbCloudWebApi/Controllers/AdminUserRoleController.cs b/AsbCloudWebApi/Controllers/AdminUserRoleController.cs
index 5c19378c..535ffcea 100644
--- a/AsbCloudWebApi/Controllers/AdminUserRoleController.cs
+++ b/AsbCloudWebApi/Controllers/AdminUserRoleController.cs
@@ -4,29 +4,28 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
-{
-    /// <summary>
-    /// Редактор ролей пользователей для админки
-    /// </summary>
-    [Route("api/admin/role")]
-    [ApiController]
-    [Authorize]
-    public class AdminUserRoleController : CrudController<UserRoleDto, IUserRoleRepository>
-    {
-        public AdminUserRoleController(IUserRoleRepository service)
-            : base(service)
-        {
-            UpdateForbidAsync = async (dto, token) =>
-            {
-                var role = await service.GetOrDefaultAsync(dto.Id, token);
-                return role?.Id == 1;
-            };
+namespace AsbCloudWebApi.Controllers;
 
-            DeleteForbidAsync = (id, token) =>
-            {
-                return Task.FromResult(id == 1);
-            };
-        }
+/// <summary>
+/// Редактор ролей пользователей для админки
+/// </summary>
+[Route("api/admin/role")]
+[ApiController]
+[Authorize]
+public class AdminUserRoleController : CrudController<UserRoleDto, IUserRoleRepository>
+{
+    public AdminUserRoleController(IUserRoleRepository service)
+        : base(service)
+    {
+        UpdateForbidAsync = async (dto, token) =>
+        {
+            var role = await service.GetOrDefaultAsync(dto.Id, token);
+            return role?.Id == 1;
+        };
+
+        DeleteForbidAsync = (id, token) =>
+        {
+            return Task.FromResult(id == 1);
+        };
     }
 }
diff --git a/AsbCloudWebApi/Controllers/AdminWellController.cs b/AsbCloudWebApi/Controllers/AdminWellController.cs
index fa4c6e60..8d55c760 100644
--- a/AsbCloudWebApi/Controllers/AdminWellController.cs
+++ b/AsbCloudWebApi/Controllers/AdminWellController.cs
@@ -5,18 +5,17 @@ using Microsoft.AspNetCore.Mvc;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Редактор скважин для админки
+/// </summary>
+[Route("api/admin/well")]
+[ApiController]
+[Authorize]
+public class AdminWellController : CrudController<WellDto, ICrudRepository<WellDto>>
 {
-    /// <summary>
-    /// Редактор скважин для админки
-    /// </summary>
-    [Route("api/admin/well")]
-    [ApiController]
-    [Authorize]
-    public class AdminWellController : CrudController<WellDto, ICrudRepository<WellDto>>
-    {
-        public AdminWellController(IWellService service)
-            : base(service)
-        { }
-    }
+    public AdminWellController(IWellService service)
+        : base(service)
+    { }
 }
diff --git a/AsbCloudWebApi/Controllers/AuthController.cs b/AsbCloudWebApi/Controllers/AuthController.cs
index 3497dcab..fba8b8c0 100644
--- a/AsbCloudWebApi/Controllers/AuthController.cs
+++ b/AsbCloudWebApi/Controllers/AuthController.cs
@@ -8,94 +8,93 @@ using Swashbuckle.AspNetCore.Annotations;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Авторизация
+/// </summary>
+[Route("/auth")]
+[ApiController]
+public class AuthController : ControllerBase
 {
-    /// <summary>
-    /// Авторизация
-    /// </summary>
-    [Route("/auth")]
-    [ApiController]
-    public class AuthController : ControllerBase
+    private readonly IAuthService authService;
+    private readonly IUserRepository userRepository;
+
+    public AuthController(IAuthService authService, IUserRepository userRepository)
     {
-        private readonly IAuthService authService;
-        private readonly IUserRepository userRepository;
+        this.authService = authService;
+        this.userRepository = userRepository;
+    }
 
-        public AuthController(IAuthService authService, IUserRepository userRepository)
-        {
-            this.authService = authService;
-            this.userRepository = userRepository;
-        }
+    /// <summary>
+    /// Аутентификация пользователя
+    /// </summary>
+    /// <param name="auth"></param>
+    /// <param name="token">Токен отмены задачи</param>
+    /// <response code="200">новый токен</response>
+    /// <response code="400">логин и пароль не подходят</response>
+    [AllowAnonymous]
+    [HttpPost("login")]
+    [SwaggerOperation(OperationId = "login")]
+    [ProducesResponseType(typeof(UserTokenDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> LoginAsync([FromBody] AuthDto auth, CancellationToken token)
+    {
+        var userToken = await authService.LoginAsync(auth.Login, auth.Password, token);
 
-        /// <summary>
-        /// Аутентификация пользователя
-        /// </summary>
-        /// <param name="auth"></param>
-        /// <param name="token">Токен отмены задачи</param>
-        /// <response code="200">новый токен</response>
-        /// <response code="400">логин и пароль не подходят</response>
-        [AllowAnonymous]
-        [HttpPost("login")]
-        [SwaggerOperation(OperationId = "login")]
-        [ProducesResponseType(typeof(UserTokenDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> LoginAsync([FromBody] AuthDto auth, CancellationToken token)
-        {
-            var userToken = await authService.LoginAsync(auth.Login, auth.Password, token);
+        if (userToken is null)
+            Forbid();
 
-            if (userToken is null)
-                Forbid();
+        return Ok(userToken);
+    }
 
-            return Ok(userToken);
-        }
+    /// <summary>
+    /// Продление срока действия токена
+    /// </summary>
+    /// <returns code="200">новый токен</returns>
+    [Authorize]
+    [HttpGet("refresh")]
+    [ProducesResponseType(typeof(UserTokenDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> RefreshAsync(CancellationToken token)
+    {
+        var userToken = await authService.RefreshAsync(User, token);
 
-        /// <summary>
-        /// Продление срока действия токена
-        /// </summary>
-        /// <returns code="200">новый токен</returns>
-        [Authorize]
-        [HttpGet("refresh")]
-        [ProducesResponseType(typeof(UserTokenDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> RefreshAsync(CancellationToken token)
-        {
-            var userToken = await authService.RefreshAsync(User, token);
+        if (userToken is null)
+            Forbid();
 
-            if (userToken is null)
-                Forbid();
+        return Ok(userToken);
+    }
 
-            return Ok(userToken);
-        }
+    /// <summary>
+    /// Отправить заявку на регистрацию. Заявка подтверждается администратором.
+    /// </summary>
+    /// <param name="user">Информация о новом пользователе</param>
+    /// <returns code="200">Ок</returns>
+    [HttpPost]
+    [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
+    public IActionResult Register(UserRegistrationDto user)
+    {
+        authService.Register(user);
+        return Ok();
+    }
 
-        /// <summary>
-        /// Отправить заявку на регистрацию. Заявка подтверждается администратором.
-        /// </summary>
-        /// <param name="user">Информация о новом пользователе</param>
-        /// <returns code="200">Ок</returns>
-        [HttpPost]
-        [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
-        public IActionResult Register(UserRegistrationDto user)
-        {
-            authService.Register(user);
-            return Ok();
-        }
+    /// <summary>
+    /// Смена пароля пользователя. Доступна пользователю и администратору
+    /// </summary>
+    /// <returns code="200">Ок</returns>
+    [Authorize]
+    [HttpPut("{idUser}/ChangePassword")]
+    [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
+    public IActionResult ChangePassword([FromRoute] int idUser, [FromBody] string newPassword)
+    {
+        var editorUserId = User.GetUserId();
 
-        /// <summary>
-        /// Смена пароля пользователя. Доступна пользователю и администратору
-        /// </summary>
-        /// <returns code="200">Ок</returns>
-        [Authorize]
-        [HttpPut("{idUser}/ChangePassword")]
-        [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
-        public IActionResult ChangePassword([FromRoute] int idUser, [FromBody] string newPassword)
-        {
-            var editorUserId = User.GetUserId();
+        if (editorUserId is null)
+            return Forbid();
 
-            if (editorUserId is null)
-                return Forbid();
+        if (!((editorUserId == idUser) || userRepository.HasPermission((int)editorUserId, "Auth.edit")))
+            return Forbid();
 
-            if (!((editorUserId == idUser) || userRepository.HasPermission((int)editorUserId, "Auth.edit")))
-                return Forbid();
-
-            authService.ChangePassword(idUser, newPassword);
-            return Ok();
-        }
+        authService.ChangePassword(idUser, newPassword);
+        return Ok();
     }
 }
diff --git a/AsbCloudWebApi/Controllers/BackgroundWorkController.cs b/AsbCloudWebApi/Controllers/BackgroundWorkController.cs
index 58be1362..afbb1d9d 100644
--- a/AsbCloudWebApi/Controllers/BackgroundWorkController.cs
+++ b/AsbCloudWebApi/Controllers/BackgroundWorkController.cs
@@ -7,63 +7,62 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+[Route("api/[controller]")]
+[Authorize]
+[ApiController]
+public class BackgroundWorkController : ControllerBase
 {
-    [Route("api/[controller]")]
-    [Authorize]
-    [ApiController]
-    public class BackgroundWorkController : ControllerBase
+    private readonly BackgroundWorker worker;
+
+    public BackgroundWorkController(BackgroundWorker worker)
     {
-        private readonly BackgroundWorker worker;
+        this.worker = worker;
+    }
 
-        public BackgroundWorkController(BackgroundWorker worker)
-        {
-            this.worker = worker;
-        }
+    [HttpGet]
+    public IActionResult GetAll()
+    {
+        var result = new {
+            CurrentWork = (BackgroundWorkDto?)worker.CurrentWork,
+            worker.MainLoopLastException,
+            RunOnceQueue = worker.Works.Select(work => (BackgroundWorkDto)work),
+            Done = worker.Done.Select(work => (BackgroundWorkDto)work),
+            Felled = worker.Felled.Select(work => (BackgroundWorkDto)work),
+        };
+        return Ok(result);
+    }
 
-        [HttpGet]
-        public IActionResult GetAll()
-        {
-            var result = new {
-                CurrentWork = (BackgroundWorkDto?)worker.CurrentWork,
-                worker.MainLoopLastException,
-                RunOnceQueue = worker.Works.Select(work => (BackgroundWorkDto)work),
-                Done = worker.Done.Select(work => (BackgroundWorkDto)work),
-                Felled = worker.Felled.Select(work => (BackgroundWorkDto)work),
-            };
-            return Ok(result);
-        }
+    [HttpGet("current")]
+    public IActionResult GetCurrent()
+    {
+        var work = worker.CurrentWork;
+        if (work == null)
+            return NoContent();
 
-        [HttpGet("current")]
-        public IActionResult GetCurrent()
-        {
-            var work = worker.CurrentWork;
-            if (work == null)
-                return NoContent();
+        return Ok(work);
+    }
 
-            return Ok(work);
-        }
+    [HttpGet("failed")]
+    public IActionResult GetFelled()
+    {
+        var result = worker.Felled.Select(work => (BackgroundWorkDto)work);
+        return Ok(result);
+    }
 
-        [HttpGet("failed")]
-        public IActionResult GetFelled()
-        {
-            var result = worker.Felled.Select(work => (BackgroundWorkDto)work);
-            return Ok(result);
-        }
+    [HttpGet("done")]
+    public IActionResult GetDone()
+    {
+        var result = worker.Done.Select(work => (BackgroundWorkDto)work);
+        return Ok(result);
+    }
 
-        [HttpGet("done")]
-        public IActionResult GetDone()
-        {
-            var result = worker.Done.Select(work => (BackgroundWorkDto)work);
-            return Ok(result);
-        }
-
-        [HttpPost("restart"), Obsolete("temporary method")]
-        public async Task<IActionResult> RestartAsync(CancellationToken token)
-        {
-            await worker.StopAsync(token);
-            await worker.StartAsync(token);
-            return Ok();
-        }
+    [HttpPost("restart"), Obsolete("temporary method")]
+    public async Task<IActionResult> RestartAsync(CancellationToken token)
+    {
+        await worker.StopAsync(token);
+        await worker.StartAsync(token);
+        return Ok();
     }
 }
diff --git a/AsbCloudWebApi/Controllers/CrudController.cs b/AsbCloudWebApi/Controllers/CrudController.cs
index 08b422c0..24ffd166 100644
--- a/AsbCloudWebApi/Controllers/CrudController.cs
+++ b/AsbCloudWebApi/Controllers/CrudController.cs
@@ -9,138 +9,136 @@ using System.Threading;
 using System.Threading.Tasks;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+
+/// <summary>
+/// CRUD контроллер для админки.
+/// </summary>
+/// <typeparam name="T"></typeparam>
+/// <typeparam name="TService"></typeparam>
+[ApiController]
+[Route("api/[controller]")]
+[Authorize]
+public abstract class CrudController<T, TService> : ControllerBase
+    where T : IId
+    where TService : ICrudRepository<T>
 {
+    protected readonly TService service;
 
-    /// <summary>
-    /// CRUD контроллер для админки.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <typeparam name="TService"></typeparam>
-    [ApiController]
-    [Route("api/[controller]")]
-    [Authorize]
-    public abstract class CrudController<T, TService> : ControllerBase
-        where T : IId
-        where TService : ICrudRepository<T>
+    public Func<T, CancellationToken, Task<bool>> InsertForbidAsync { get; protected set; } = null!;
+    public Func<T, CancellationToken, Task<bool>> UpdateForbidAsync { get; protected set; } = null!;
+    public Func<int, CancellationToken, Task<bool>> DeleteForbidAsync { get; protected set; } = null!;
+
+    public CrudController(TService service)
     {
-        protected readonly TService service;
-
-        public Func<T, CancellationToken, Task<bool>> InsertForbidAsync { get; protected set; } = null!;
-        public Func<T, CancellationToken, Task<bool>> UpdateForbidAsync { get; protected set; } = null!;
-        public Func<int, CancellationToken, Task<bool>> DeleteForbidAsync { get; protected set; } = null!;
-
-        public CrudController(TService service)
-        {
-            this.service = service;
-        }
-
-        /// <summary>
-        /// Получить все записи
-        /// </summary>
-        /// <param name="token">CancellationToken</param>
-        /// <returns>все записи</returns>
-        [HttpGet]
-        [Permission]
-        public virtual async Task<ActionResult<IEnumerable<T>>> GetAllAsync(CancellationToken token)
-        {
-            var result = await service.GetAllAsync(token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получить одну запись по Id
-        /// </summary>
-        /// <param name="id">id записи</param>
-        /// <param name="token"></param>
-        /// <returns>запись</returns>
-        [HttpGet("{id}")]
-        [Permission]
-        public virtual async Task<ActionResult<T?>> GetOrDefaultAsync(int id, CancellationToken token)
-        {
-            var result = await service.GetOrDefaultAsync(id, token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Добавить запись
-        /// </summary>
-        /// <param name="value">запись</param>
-        /// <param name="token"></param>
-        /// <returns>id</returns>
-        [HttpPost]
-        [Permission]
-        public virtual async Task<ActionResult<int>> InsertAsync([FromBody] T value, CancellationToken token)
-        {
-            if (InsertForbidAsync is not null && await InsertForbidAsync(value, token))
-                return Forbid();
-
-            var result = await service.InsertAsync(value, token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Добавить несколько записей<br/>
-        /// При невозможности добавить любую из записей, все не будут добавлены.
-        /// </summary>
-        /// <param name="values">записи</param>
-        /// <param name="token"></param>
-        /// <returns>id</returns>
-        [HttpPost("range")]
-        [Permission]
-        [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
-        public virtual async Task<ActionResult<int>> InsertRangeAsync([FromBody] IEnumerable<T> values, CancellationToken token)
-        {
-            if (!values.Any())
-                return this.ValidationBadRequest(nameof(values), "there is no values to add");
-
-            if (InsertForbidAsync is not null)
-                foreach (var value in values)
-                    if (await InsertForbidAsync(value, token))
-                        return Forbid();
-
-            var result = await service.InsertRangeAsync(values, token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Редактировать запись по id
-        /// </summary>
-        /// <param name="value">запись</param>
-        /// <param name="token"></param>
-        /// <returns>1 - успешно отредактировано, 0 - нет</returns>
-        [HttpPut]
-        [Permission]
-        [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
-        public virtual async Task<ActionResult<int>> UpdateAsync([FromBody] T value, CancellationToken token)
-        {
-            if (UpdateForbidAsync is not null && await UpdateForbidAsync(value, token))
-                return Forbid();
-
-            var result = await service.UpdateAsync(value, token).ConfigureAwait(false);
-            if (result == ICrudRepository<T>.ErrorIdNotFound)
-                return this.ValidationBadRequest(nameof(value.Id), $"id:{value.Id} does not exist");
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Удалить запись по id
-        /// </summary>
-        /// <param name="id">id записи</param>
-        /// <param name="token"></param>
-        /// <returns>1 - успешно удалено, 0 - нет</returns>
-        [HttpDelete("{id}")]
-        [Permission]
-        public virtual async Task<ActionResult<int>> DeleteAsync(int id, CancellationToken token)
-        {
-            if (DeleteForbidAsync is not null && await DeleteForbidAsync(id, token))
-                return Forbid();
-
-            var result = await service.DeleteAsync(id, token).ConfigureAwait(false);
-            if (result == ICrudRepository<T>.ErrorIdNotFound)
-                return NoContent();
-            return Ok(result);
-        }
+        this.service = service;
     }
 
+    /// <summary>
+    /// Получить все записи
+    /// </summary>
+    /// <param name="token">CancellationToken</param>
+    /// <returns>все записи</returns>
+    [HttpGet]
+    [Permission]
+    public virtual async Task<ActionResult<IEnumerable<T>>> GetAllAsync(CancellationToken token)
+    {
+        var result = await service.GetAllAsync(token).ConfigureAwait(false);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получить одну запись по Id
+    /// </summary>
+    /// <param name="id">id записи</param>
+    /// <param name="token"></param>
+    /// <returns>запись</returns>
+    [HttpGet("{id}")]
+    [Permission]
+    public virtual async Task<ActionResult<T?>> GetOrDefaultAsync(int id, CancellationToken token)
+    {
+        var result = await service.GetOrDefaultAsync(id, token).ConfigureAwait(false);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Добавить запись
+    /// </summary>
+    /// <param name="value">запись</param>
+    /// <param name="token"></param>
+    /// <returns>id</returns>
+    [HttpPost]
+    [Permission]
+    public virtual async Task<ActionResult<int>> InsertAsync([FromBody] T value, CancellationToken token)
+    {
+        if (InsertForbidAsync is not null && await InsertForbidAsync(value, token))
+            return Forbid();
+
+        var result = await service.InsertAsync(value, token).ConfigureAwait(false);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Добавить несколько записей<br/>
+    /// При невозможности добавить любую из записей, все не будут добавлены.
+    /// </summary>
+    /// <param name="values">записи</param>
+    /// <param name="token"></param>
+    /// <returns>id</returns>
+    [HttpPost("range")]
+    [Permission]
+    [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
+    public virtual async Task<ActionResult<int>> InsertRangeAsync([FromBody] IEnumerable<T> values, CancellationToken token)
+    {
+        if (!values.Any())
+            return this.ValidationBadRequest(nameof(values), "there is no values to add");
+
+        if (InsertForbidAsync is not null)
+            foreach (var value in values)
+                if (await InsertForbidAsync(value, token))
+                    return Forbid();
+
+        var result = await service.InsertRangeAsync(values, token).ConfigureAwait(false);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Редактировать запись по id
+    /// </summary>
+    /// <param name="value">запись</param>
+    /// <param name="token"></param>
+    /// <returns>1 - успешно отредактировано, 0 - нет</returns>
+    [HttpPut]
+    [Permission]
+    [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
+    public virtual async Task<ActionResult<int>> UpdateAsync([FromBody] T value, CancellationToken token)
+    {
+        if (UpdateForbidAsync is not null && await UpdateForbidAsync(value, token))
+            return Forbid();
+
+        var result = await service.UpdateAsync(value, token).ConfigureAwait(false);
+        if (result == ICrudRepository<T>.ErrorIdNotFound)
+            return this.ValidationBadRequest(nameof(value.Id), $"id:{value.Id} does not exist");
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Удалить запись по id
+    /// </summary>
+    /// <param name="id">id записи</param>
+    /// <param name="token"></param>
+    /// <returns>1 - успешно удалено, 0 - нет</returns>
+    [HttpDelete("{id}")]
+    [Permission]
+    public virtual async Task<ActionResult<int>> DeleteAsync(int id, CancellationToken token)
+    {
+        if (DeleteForbidAsync is not null && await DeleteForbidAsync(id, token))
+            return Forbid();
+
+        var result = await service.DeleteAsync(id, token).ConfigureAwait(false);
+        if (result == ICrudRepository<T>.ErrorIdNotFound)
+            return NoContent();
+        return Ok(result);
+    }
 }
diff --git a/AsbCloudWebApi/Controllers/CrudWellRelatedController.cs b/AsbCloudWebApi/Controllers/CrudWellRelatedController.cs
index 245e0db8..98efad98 100644
--- a/AsbCloudWebApi/Controllers/CrudWellRelatedController.cs
+++ b/AsbCloudWebApi/Controllers/CrudWellRelatedController.cs
@@ -8,158 +8,156 @@ using System.Threading;
 using System.Threading.Tasks;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+
+/// <summary>
+/// CRUD контроллер dto связных со скважиной для админки.
+/// </summary>
+/// <typeparam name="T"></typeparam>
+/// <typeparam name="TService"></typeparam>
+[ApiController]
+[Route("api/[controller]")]
+[Authorize]
+public abstract class CrudWellRelatedController<T, TService> : CrudController<T, TService>
+    where T : IId, IWellRelated
+    where TService : IRepositoryWellRelated<T>
 {
+    protected readonly IWellService wellService;
 
-    /// <summary>
-    /// CRUD контроллер dto связных со скважиной для админки.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <typeparam name="TService"></typeparam>
-    [ApiController]
-    [Route("api/[controller]")]
-    [Authorize]
-    public abstract class CrudWellRelatedController<T, TService> : CrudController<T, TService>
-        where T : IId, IWellRelated
-        where TService : IRepositoryWellRelated<T>
+    protected CrudWellRelatedController(IWellService wellService, TService service)
+        : base(service)
     {
-        protected readonly IWellService wellService;
-
-        protected CrudWellRelatedController(IWellService wellService, TService service)
-            : base(service)
-        {
-            this.wellService = wellService;
-        }
-
-        /// <summary>
-        /// Получение всех записей, доступных компании пользователя.
-        /// </summary>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet]
-        public override async Task<ActionResult<IEnumerable<T>>> GetAllAsync(CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            var wells = await wellService.GetAsync(new() { IdCompany = idCompany }, token);
-            if (!wells.Any())
-                return NoContent();
-
-            var idsWells = wells.Select(w => w.Id);
-            var result = await service.GetByIdWellAsync(idsWells, token);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получение всех записей, для скважины.
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("well/{idWell}")]
-        public async Task<ActionResult<IEnumerable<T>>> GetByIdWellAsync(int idWell, CancellationToken token)
-        {
-            if (!await UserHasAccesToWellAsync(idWell, token))
-                return Forbid();
-
-            var result = await service.GetByIdWellAsync(idWell, token);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получить одну запись по Id
-        /// </summary>
-        /// <param name="id">id записи</param>
-        /// <param name="token"></param>
-        /// <returns>запись</returns>
-        [HttpGet("{id}")]
-        public override async Task<ActionResult<T?>> GetOrDefaultAsync(int id, CancellationToken token)
-        {
-            var actionResult = await base.GetOrDefaultAsync(id, token);
-            if(actionResult.Result is OkObjectResult okResult)
-            {
-                if (okResult.Value is IWellRelated wellRelated)
-                    if (!await UserHasAccesToWellAsync(wellRelated.IdWell, token))
-                        return Forbid();
-            }
-            
-            return actionResult;
-        }
-
-        /// <summary>
-        /// Добавить запись
-        /// </summary>
-        /// <param name="value">запись</param>
-        /// <param name="token"></param>
-        /// <returns>id</returns>
-        [HttpPost]
-        public override async Task<ActionResult<int>> InsertAsync([FromBody] T value, CancellationToken token)
-        {
-            if (!await UserHasAccesToWellAsync(value.IdWell, token))
-                return Forbid();
-            return await base.InsertAsync(value, token);
-        }
-
-        /// <summary>
-        /// Добавить несколько записей<br/>
-        /// При невозможности добавить любую из записей, все не будут добавлены.
-        /// </summary>
-        /// <param name="values">записи</param>
-        /// <param name="token"></param>
-        /// <returns>id</returns>
-        [HttpPost("range")]
-        public override async Task<ActionResult<int>> InsertRangeAsync([FromBody] IEnumerable<T> values, CancellationToken token)
-        {
-            var idsWells = values.Select(v => v.IdWell).Distinct();
-            foreach (var idWell in idsWells)
-                if (!await UserHasAccesToWellAsync(idWell, token))
-                    return Forbid();
-            return await base.InsertRangeAsync(values, token);
-        }
-
-        /// <summary>
-        /// Редактировать запись по id
-        /// </summary>
-        /// <param name="value">запись</param>
-        /// <param name="token"></param>
-        /// <returns>1 - успешно отредактировано, 0 - нет</returns>
-        [HttpPut]
-        public override async Task<ActionResult<int>> UpdateAsync([FromBody] T value, CancellationToken token)
-        {
-            if (!await UserHasAccesToWellAsync(value.IdWell, token))
-                return Forbid();
-            return await base.UpdateAsync(value, token);
-        }
-
-        /// <summary>
-        /// Удалить запись по id
-        /// </summary>
-        /// <param name="id">id записи</param>
-        /// <param name="token"></param>
-        /// <returns>1 - успешно удалено, 0 - нет</returns>
-        [HttpDelete("{id}")]
-        public override async Task<ActionResult<int>> DeleteAsync(int id, CancellationToken token)
-        {
-            var item = await service.GetOrDefaultAsync(id, token);
-            if (item is null)
-                return NoContent();
-            if (!await UserHasAccesToWellAsync(item.IdWell, token))
-                return Forbid();
-            return await base.DeleteAsync(id, token);
-        }
-
-        protected async Task<bool> UserHasAccesToWellAsync(int idWell, CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
-            if (idCompany is not null &&
-                await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, token)
-                    .ConfigureAwait(false))
-                return true;
-            return false;
-        }
+        this.wellService = wellService;
     }
 
+    /// <summary>
+    /// Получение всех записей, доступных компании пользователя.
+    /// </summary>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet]
+    public override async Task<ActionResult<IEnumerable<T>>> GetAllAsync(CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
+
+        if (idCompany is null)
+            return Forbid();
+
+        var wells = await wellService.GetAsync(new() { IdCompany = idCompany }, token);
+        if (!wells.Any())
+            return NoContent();
+
+        var idsWells = wells.Select(w => w.Id);
+        var result = await service.GetByIdWellAsync(idsWells, token);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получение всех записей, для скважины.
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("well/{idWell}")]
+    public async Task<ActionResult<IEnumerable<T>>> GetByIdWellAsync(int idWell, CancellationToken token)
+    {
+        if (!await UserHasAccesToWellAsync(idWell, token))
+            return Forbid();
+
+        var result = await service.GetByIdWellAsync(idWell, token);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получить одну запись по Id
+    /// </summary>
+    /// <param name="id">id записи</param>
+    /// <param name="token"></param>
+    /// <returns>запись</returns>
+    [HttpGet("{id}")]
+    public override async Task<ActionResult<T?>> GetOrDefaultAsync(int id, CancellationToken token)
+    {
+        var actionResult = await base.GetOrDefaultAsync(id, token);
+        if(actionResult.Result is OkObjectResult okResult)
+        {
+            if (okResult.Value is IWellRelated wellRelated)
+                if (!await UserHasAccesToWellAsync(wellRelated.IdWell, token))
+                    return Forbid();
+        }
+        
+        return actionResult;
+    }
+
+    /// <summary>
+    /// Добавить запись
+    /// </summary>
+    /// <param name="value">запись</param>
+    /// <param name="token"></param>
+    /// <returns>id</returns>
+    [HttpPost]
+    public override async Task<ActionResult<int>> InsertAsync([FromBody] T value, CancellationToken token)
+    {
+        if (!await UserHasAccesToWellAsync(value.IdWell, token))
+            return Forbid();
+        return await base.InsertAsync(value, token);
+    }
+
+    /// <summary>
+    /// Добавить несколько записей<br/>
+    /// При невозможности добавить любую из записей, все не будут добавлены.
+    /// </summary>
+    /// <param name="values">записи</param>
+    /// <param name="token"></param>
+    /// <returns>id</returns>
+    [HttpPost("range")]
+    public override async Task<ActionResult<int>> InsertRangeAsync([FromBody] IEnumerable<T> values, CancellationToken token)
+    {
+        var idsWells = values.Select(v => v.IdWell).Distinct();
+        foreach (var idWell in idsWells)
+            if (!await UserHasAccesToWellAsync(idWell, token))
+                return Forbid();
+        return await base.InsertRangeAsync(values, token);
+    }
+
+    /// <summary>
+    /// Редактировать запись по id
+    /// </summary>
+    /// <param name="value">запись</param>
+    /// <param name="token"></param>
+    /// <returns>1 - успешно отредактировано, 0 - нет</returns>
+    [HttpPut]
+    public override async Task<ActionResult<int>> UpdateAsync([FromBody] T value, CancellationToken token)
+    {
+        if (!await UserHasAccesToWellAsync(value.IdWell, token))
+            return Forbid();
+        return await base.UpdateAsync(value, token);
+    }
+
+    /// <summary>
+    /// Удалить запись по id
+    /// </summary>
+    /// <param name="id">id записи</param>
+    /// <param name="token"></param>
+    /// <returns>1 - успешно удалено, 0 - нет</returns>
+    [HttpDelete("{id}")]
+    public override async Task<ActionResult<int>> DeleteAsync(int id, CancellationToken token)
+    {
+        var item = await service.GetOrDefaultAsync(id, token);
+        if (item is null)
+            return NoContent();
+        if (!await UserHasAccesToWellAsync(item.IdWell, token))
+            return Forbid();
+        return await base.DeleteAsync(id, token);
+    }
+
+    protected async Task<bool> UserHasAccesToWellAsync(int idWell, CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
+        if (idCompany is not null &&
+            await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, token)
+                .ConfigureAwait(false))
+            return true;
+        return false;
+    }
 }
diff --git a/AsbCloudWebApi/Controllers/DepositController.cs b/AsbCloudWebApi/Controllers/DepositController.cs
index b18464b1..d7823a9b 100644
--- a/AsbCloudWebApi/Controllers/DepositController.cs
+++ b/AsbCloudWebApi/Controllers/DepositController.cs
@@ -6,64 +6,63 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Инфо о месторождениях
+/// </summary>
+[Route("api/deposit")]
+[ApiController]
+[Authorize]
+public class DepositController : ControllerBase
 {
-    /// <summary>
-    /// Инфо о месторождениях
-    /// </summary>
-    [Route("api/deposit")]
-    [ApiController]
-    [Authorize]
-    public class DepositController : ControllerBase
+    private readonly IDepositRepository depositService;
+
+    public DepositController(IDepositRepository depositService)
     {
-        private readonly IDepositRepository depositService;
-
-        public DepositController(IDepositRepository depositService)
-        {
-            this.depositService = depositService;
-        }
-
-        /// <summary>
-        /// Получает список доступных пользователю месторождений
-        /// </summary>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns></returns>
-        [HttpGet]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<DepositDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetDepositsAsync(CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            var result = await depositService.GetAsync((int)idCompany,
-                token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получает список доступных пользователю кустов месторождения
-        /// </summary>
-        /// <param name="depositId"></param>
-        /// <param name="token"> Токен отмены задачи </param> 
-        /// <returns></returns>
-        [HttpGet("{depositId}")]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<ClusterDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetClustersAsync(int depositId,
-            CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            var result = await depositService.GetClustersAsync((int)idCompany,
-                depositId, token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
+        this.depositService = depositService;
     }
+
+    /// <summary>
+    /// Получает список доступных пользователю месторождений
+    /// </summary>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns></returns>
+    [HttpGet]
+    [Permission]
+    [ProducesResponseType(typeof(IEnumerable<DepositDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetDepositsAsync(CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+
+        if (idCompany is null)
+            return Forbid();
+
+        var result = await depositService.GetAsync((int)idCompany,
+            token).ConfigureAwait(false);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получает список доступных пользователю кустов месторождения
+    /// </summary>
+    /// <param name="depositId"></param>
+    /// <param name="token"> Токен отмены задачи </param> 
+    /// <returns></returns>
+    [HttpGet("{depositId}")]
+    [Permission]
+    [ProducesResponseType(typeof(IEnumerable<ClusterDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetClustersAsync(int depositId,
+        CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+
+        if (idCompany is null)
+            return Forbid();
+
+        var result = await depositService.GetClustersAsync((int)idCompany,
+            depositId, token).ConfigureAwait(false);
+        return Ok(result);
+    }
+
 }
diff --git a/AsbCloudWebApi/Controllers/DrillerController.cs b/AsbCloudWebApi/Controllers/DrillerController.cs
index 347abe6e..6c078f7d 100644
--- a/AsbCloudWebApi/Controllers/DrillerController.cs
+++ b/AsbCloudWebApi/Controllers/DrillerController.cs
@@ -9,48 +9,47 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Справочник бурильщиков
+/// </summary>
+[Route("api/driller")]
+[ApiController]
+[Authorize]
+public class DrillerController : CrudController<DrillerDto, ICrudRepository<DrillerDto>>
 {
-    /// <summary>
-    /// Справочник бурильщиков
-    /// </summary>
-    [Route("api/driller")]
-    [ApiController]
-    [Authorize]
-    public class DrillerController : CrudController<DrillerDto, ICrudRepository<DrillerDto>>
+    private IScheduleRepository scheduleRepository;
+
+    public DrillerController(ICrudRepository<DrillerDto> service, IScheduleRepository scheduleRepository)
+        : base(service)
     {
-        private IScheduleRepository scheduleRepository;
+        this.scheduleRepository = scheduleRepository;
+    }
 
-        public DrillerController(ICrudRepository<DrillerDto> service, IScheduleRepository scheduleRepository)
-            : base(service)
+    /// <summary>
+    /// Получить список бурильщиков по ключам скважин
+    /// </summary>
+    /// <param name="idsWells">массив ключей скважин</param>
+    /// <param name="token">token</param>
+    /// <returns>все записи</returns>
+    [HttpGet("/api/drillers")]
+    [Permission]
+    [ProducesResponseType(typeof(IEnumerable<DrillerDto>), StatusCodes.Status200OK)]
+    public async Task<IActionResult> GetAsync([FromQuery] IEnumerable<int> idsWells, CancellationToken token)
+    {
+        var request = new GetStatRequest()
         {
-            this.scheduleRepository = scheduleRepository;
-        }
+            IdsWells = idsWells,
+        };
+        var schedulePage = await scheduleRepository.GetPageAsync(request, token);
+        var drillers = schedulePage
+            .Select(s => s.Driller)
+            .Where(d => d is not null)
+            .GroupBy(d => d!.Id)
+            .Select(group => group.First())
+            .OrderBy(d => d!.Surname);
 
-        /// <summary>
-        /// Получить список бурильщиков по ключам скважин
-        /// </summary>
-        /// <param name="idsWells">массив ключей скважин</param>
-        /// <param name="token">token</param>
-        /// <returns>все записи</returns>
-        [HttpGet("/api/drillers")]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<DrillerDto>), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GetAsync([FromQuery] IEnumerable<int> idsWells, CancellationToken token)
-        {
-            var request = new GetStatRequest()
-            {
-                IdsWells = idsWells,
-            };
-            var schedulePage = await scheduleRepository.GetPageAsync(request, token);
-            var drillers = schedulePage
-                .Select(s => s.Driller)
-                .Where(d => d is not null)
-                .GroupBy(d => d!.Id)
-                .Select(group => group.First())
-                .OrderBy(d => d!.Surname);
-
-            return Ok(drillers);
-        }
+        return Ok(drillers);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/DrillingProgramController.cs b/AsbCloudWebApi/Controllers/DrillingProgramController.cs
index 94e987df..b04b27bc 100644
--- a/AsbCloudWebApi/Controllers/DrillingProgramController.cs
+++ b/AsbCloudWebApi/Controllers/DrillingProgramController.cs
@@ -9,286 +9,285 @@ using System.ComponentModel.DataAnnotations;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Формирование программы бурения
+/// </summary>
+[Route("api/well/{idWell}/drillingProgram")]
+[ApiController]
+[Authorize]
+public class DrillingProgramController : ControllerBase
 {
-    /// <summary>
-    /// Формирование программы бурения
-    /// </summary>
-    [Route("api/well/{idWell}/drillingProgram")]
-    [ApiController]
-    [Authorize]
-    public class DrillingProgramController : ControllerBase
+    private readonly IDrillingProgramService drillingProgramService;
+    private readonly IWellService wellService;
+
+    public DrillingProgramController(IDrillingProgramService drillingProgramService, IWellService wellService)
     {
-        private readonly IDrillingProgramService drillingProgramService;
-        private readonly IWellService wellService;
+        this.drillingProgramService = drillingProgramService;
+        this.wellService = wellService;
+    }
 
-        public DrillingProgramController(IDrillingProgramService drillingProgramService, IWellService wellService)
-        {
-            this.drillingProgramService = drillingProgramService;
-            this.wellService = wellService;
-        }
+    /// <summary>
+    /// Список категорий файлов из которых состоит программа бурения
+    /// </summary>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("categories")]
+    [ProducesResponseType(typeof(FileCategoryDto[]), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetCategories(CancellationToken token)
+    {
+        var result = await drillingProgramService.GetCategoriesAsync(token);
+        return Ok(result);
+    }
 
-        /// <summary>
-        /// Список категорий файлов из которых состоит программа бурения
-        /// </summary>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("categories")]
-        [ProducesResponseType(typeof(FileCategoryDto[]), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetCategories(CancellationToken token)
-        {
-            var result = await drillingProgramService.GetCategoriesAsync(token);
-            return Ok(result);
-        }
+    /// <summary>
+    /// Список пользователей 
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("availableUsers")]
+    [ProducesResponseType(typeof(FileCategoryDto[]), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetAvailableUsers(int idWell, CancellationToken token)
+    {
+        var result = await drillingProgramService.GetAvailableUsers(idWell, token);
+        return Ok(result);
+    }
 
-        /// <summary>
-        /// Список пользователей 
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("availableUsers")]
-        [ProducesResponseType(typeof(FileCategoryDto[]), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetAvailableUsers(int idWell, CancellationToken token)
-        {
-            var result = await drillingProgramService.GetAvailableUsers(idWell, token);
-            return Ok(result);
-        }
+    /// <summary>
+    /// Состояние процесса согласования программы бурения
+    /// </summary>
+    /// <param name="idWell"> id скважины </param>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns> Возвращает файл программы бурения </returns>
+    [HttpGet]
+    [ProducesResponseType(typeof(DrillingProgramStateDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetStateAsync(int idWell, CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
 
-        /// <summary>
-        /// Состояние процесса согласования программы бурения
-        /// </summary>
-        /// <param name="idWell"> id скважины </param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns> Возвращает файл программы бурения </returns>
-        [HttpGet]
-        [ProducesResponseType(typeof(DrillingProgramStateDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetStateAsync(int idWell, CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
+        var idUser = User.GetUserId();
 
-            var idUser = User.GetUserId();
-
-            if (idCompany is null || idUser is null ||
-                !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                    idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await drillingProgramService.GetStateAsync(idWell, (int)idUser, token);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Сброс ошибки формирования ПБ
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <returns></returns>
-        [HttpDelete("errors")]
-        [Permission("DrillingProgram.get")]
-        public IActionResult ClearError(int idWell)
-        {
-            drillingProgramService.ClearError(idWell);
-            return Ok();
-        }
-
-        /// <summary>
-        /// Загрузка файла для части программы бурения
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idFileCategory">ID части программы. Не путать с категорией файла</param>
-        /// <param name="files"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPost("part/{idFileCategory}")]
-        [Permission("DrillingProgram.get")]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> AddFile(
-            int idWell,
-            int idFileCategory,
-            [FromForm] IFormFileCollection files,
-            CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-            int? idUser = User.GetUserId();
-
-            if (idCompany is null || idUser is null)
-                return Forbid();
-
-            if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+        if (idCompany is null || idUser is null ||
+            !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
                 idWell, token).ConfigureAwait(false))
-                return Forbid();
+            return Forbid();
 
-            if (files.Count > 1)
-                return this.ValidationBadRequest(nameof(files), "only 1 file can be uploaded");
+        var result = await drillingProgramService.GetStateAsync(idWell, (int)idUser, token);
+        return Ok(result);
+    }
 
-            if (files.Count == 0)
-                return this.ValidationBadRequest(nameof(files), "at list 1 file should be uploaded");
+    /// <summary>
+    /// Сброс ошибки формирования ПБ
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <returns></returns>
+    [HttpDelete("errors")]
+    [Permission("DrillingProgram.get")]
+    public IActionResult ClearError(int idWell)
+    {
+        drillingProgramService.ClearError(idWell);
+        return Ok();
+    }
 
-            var fileName = files[0].FileName;
-            
-            var fileStream = files[0].OpenReadStream();
-            var result = await drillingProgramService.AddFile(idWell, idFileCategory, (int)idUser, fileName, fileStream, token);
+    /// <summary>
+    /// Загрузка файла для части программы бурения
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idFileCategory">ID части программы. Не путать с категорией файла</param>
+    /// <param name="files"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPost("part/{idFileCategory}")]
+    [Permission("DrillingProgram.get")]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> AddFile(
+        int idWell,
+        int idFileCategory,
+        [FromForm] IFormFileCollection files,
+        CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+        int? idUser = User.GetUserId();
 
-            return Ok(result);
-        }
+        if (idCompany is null || idUser is null)
+            return Forbid();
 
-        /// <summary>
-        /// Добавляет разделы программы бурения
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idFileCategories">Список категорий файлов, по которым будут добавлены части ПБ</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPost("part")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> AddPartsAsync(int idWell, [Required] IEnumerable<int> idFileCategories, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-            int? idUser = User.GetUserId();
+        if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-            if (idCompany is null || idUser is null)
-                return Forbid();
+        if (files.Count > 1)
+            return this.ValidationBadRequest(nameof(files), "only 1 file can be uploaded");
 
-            if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+        if (files.Count == 0)
+            return this.ValidationBadRequest(nameof(files), "at list 1 file should be uploaded");
+
+        var fileName = files[0].FileName;
+        
+        var fileStream = files[0].OpenReadStream();
+        var result = await drillingProgramService.AddFile(idWell, idFileCategory, (int)idUser, fileName, fileStream, token);
+
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Добавляет разделы программы бурения
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idFileCategories">Список категорий файлов, по которым будут добавлены части ПБ</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPost("part")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> AddPartsAsync(int idWell, [Required] IEnumerable<int> idFileCategories, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+        int? idUser = User.GetUserId();
+
+        if (idCompany is null || idUser is null)
+            return Forbid();
+
+        if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var result = await drillingProgramService.AddPartsAsync(idWell, idFileCategories, token);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Удаляет разделы программы бурения
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idFileCategories">Список категорий файлов, по которым будут удалены части ПБ</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpDelete("part")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> RemovePartsAsync(int idWell, [Required] IEnumerable<int> idFileCategories, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+        int? idUser = User.GetUserId();
+
+        if (idCompany is null || idUser is null)
+            return Forbid();
+
+        if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var result = await drillingProgramService.RemovePartsAsync(idWell, idFileCategories, token);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Добавить пользователя в список publishers или approvers части программы бурения
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idUser"></param>
+    /// <param name="idFileCategory"></param>
+    /// <param name="idUserRole"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPost("part/{idFileCategory}/user")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> AddUserAsync(int idWell, [Required] int idUser, int idFileCategory, [Required] int idUserRole, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+        int? idUserEditor = User.GetUserId();
+
+        if (idCompany is null || idUserEditor is null)
+            return Forbid();
+
+        if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var result = await drillingProgramService.AddUserAsync(idWell, idFileCategory, idUser, idUserRole, token);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Удалить пользователя из списка publishers или approvers части программы бурения
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idUser"></param>
+    /// <param name="idFileCategory"></param>
+    /// <param name="idUserRole"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpDelete("part/{idFileCategory}/user/{idUser}")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> RemoveUserAsync(int idWell, int idUser, int idFileCategory, [Required] int idUserRole, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+        int? idUserEditor = User.GetUserId();
+
+        if (idCompany is null || idUserEditor is null)
+            return Forbid();
+
+        if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var result = await drillingProgramService.RemoveUserAsync(idWell, idFileCategory, idUser, idUserRole, token);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Создает метку для файла входящего в программу бурения, заменить существующую
+    /// </summary>
+    /// <param name="idWell"> id скважины </param>
+    /// <param name="markDto">метка файла</param>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns></returns>
+    [HttpPost("fileMark")]
+    [Permission("DrillingProgram.get")]
+    public async Task<IActionResult> AddOrReplaceFileMarkAsync(int idWell, FileMarkDto markDto, CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
+
+        var idUser = User.GetUserId();
+
+        if (idCompany is null || idUser is null ||
+            !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
                 idWell, token).ConfigureAwait(false))
-                return Forbid();
+            return Forbid();
 
-            var result = await drillingProgramService.AddPartsAsync(idWell, idFileCategories, token);
-            return Ok(result);
-        }
+        var result = await drillingProgramService.AddOrReplaceFileMarkAsync(markDto, (int)idUser, token)
+            .ConfigureAwait(false);
 
-        /// <summary>
-        /// Удаляет разделы программы бурения
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idFileCategories">Список категорий файлов, по которым будут удалены части ПБ</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpDelete("part")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> RemovePartsAsync(int idWell, [Required] IEnumerable<int> idFileCategories, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-            int? idUser = User.GetUserId();
+        return Ok(result);
+    }
 
-            if (idCompany is null || idUser is null)
-                return Forbid();
+    /// <summary>
+    /// Помечает метку у файла входящего, в программу бурения, как удаленную
+    /// </summary>
+    /// <param name="idWell"> id скважины </param>
+    /// <param name="idMark"> id метки </param>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns></returns>
+    [HttpDelete("fileMark/{idMark}")]
+    [Permission("DrillingProgram.get")]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> MarkAsDeletedFileMarkAsync(int idWell, int idMark,
+        CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
 
-            if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false))
-                return Forbid();
+        if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-            var result = await drillingProgramService.RemovePartsAsync(idWell, idFileCategories, token);
-            return Ok(result);
-        }
+        var result = await drillingProgramService.MarkAsDeletedFileMarkAsync(idMark, token)
+            .ConfigureAwait(false);
 
-        /// <summary>
-        /// Добавить пользователя в список publishers или approvers части программы бурения
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idUser"></param>
-        /// <param name="idFileCategory"></param>
-        /// <param name="idUserRole"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPost("part/{idFileCategory}/user")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> AddUserAsync(int idWell, [Required] int idUser, int idFileCategory, [Required] int idUserRole, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-            int? idUserEditor = User.GetUserId();
-
-            if (idCompany is null || idUserEditor is null)
-                return Forbid();
-
-            if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await drillingProgramService.AddUserAsync(idWell, idFileCategory, idUser, idUserRole, token);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Удалить пользователя из списка publishers или approvers части программы бурения
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idUser"></param>
-        /// <param name="idFileCategory"></param>
-        /// <param name="idUserRole"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpDelete("part/{idFileCategory}/user/{idUser}")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> RemoveUserAsync(int idWell, int idUser, int idFileCategory, [Required] int idUserRole, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-            int? idUserEditor = User.GetUserId();
-
-            if (idCompany is null || idUserEditor is null)
-                return Forbid();
-
-            if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await drillingProgramService.RemoveUserAsync(idWell, idFileCategory, idUser, idUserRole, token);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Создает метку для файла входящего в программу бурения, заменить существующую
-        /// </summary>
-        /// <param name="idWell"> id скважины </param>
-        /// <param name="markDto">метка файла</param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns></returns>
-        [HttpPost("fileMark")]
-        [Permission("DrillingProgram.get")]
-        public async Task<IActionResult> AddOrReplaceFileMarkAsync(int idWell, FileMarkDto markDto, CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
-
-            var idUser = User.GetUserId();
-
-            if (idCompany is null || idUser is null ||
-                !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                    idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await drillingProgramService.AddOrReplaceFileMarkAsync(markDto, (int)idUser, token)
-                .ConfigureAwait(false);
-
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Помечает метку у файла входящего, в программу бурения, как удаленную
-        /// </summary>
-        /// <param name="idWell"> id скважины </param>
-        /// <param name="idMark"> id метки </param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns></returns>
-        [HttpDelete("fileMark/{idMark}")]
-        [Permission("DrillingProgram.get")]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> MarkAsDeletedFileMarkAsync(int idWell, int idMark,
-            CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
-
-            if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await drillingProgramService.MarkAsDeletedFileMarkAsync(idMark, token)
-                .ConfigureAwait(false);
-
-            return Ok(result);
-        }
+        return Ok(result);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/FaqController.cs b/AsbCloudWebApi/Controllers/FaqController.cs
index 6af362b0..8cec0bf5 100644
--- a/AsbCloudWebApi/Controllers/FaqController.cs
+++ b/AsbCloudWebApi/Controllers/FaqController.cs
@@ -8,126 +8,125 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// контроллер по работе с faq-вопросами
+/// </summary>
+[Route("api/faq")]
+[ApiController]
+[Authorize]
+public class FaqController : ControllerBase
 {
-    /// <summary>
-    /// контроллер по работе с faq-вопросами
-    /// </summary>
-    [Route("api/faq")]
-    [ApiController]
-    [Authorize]
-    public class FaqController : ControllerBase
+    private readonly IFaqRepository faqRepository;
+
+    public FaqController(IFaqRepository faqRepository)
     {
-        private readonly IFaqRepository faqRepository;
+        this.faqRepository = faqRepository;
+    }
 
-        public FaqController(IFaqRepository faqRepository)
-        {
-            this.faqRepository = faqRepository;
-        }
+    /// <summary>
+    /// получение списка faq-вопросов
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet]
+    [ProducesResponseType(typeof(IEnumerable<FaqDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetFilteredAsync(
+        [FromQuery] FaqRequest request,
+        CancellationToken token)
+    {
+        var result = await faqRepository.GetFilteredAsync(request, token).ConfigureAwait(false);
+        return Ok(result);
+    }
 
-        /// <summary>
-        /// получение списка faq-вопросов
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [ProducesResponseType(typeof(IEnumerable<FaqDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetFilteredAsync(
-            [FromQuery] FaqRequest request,
+    /// <summary>
+    /// добавление нового вопроса
+    /// </summary>
+    /// <param name="faqDto">вопрос</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [ProducesResponseType(typeof(FaqDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> InsertAsync(
+            [FromBody] FaqDto faqDto,
             CancellationToken token)
-        {
-            var result = await faqRepository.GetFilteredAsync(request, token).ConfigureAwait(false);
-            return Ok(result);
-        }
+    {
+        faqDto.IdAuthorQuestion = User.GetUserId()!.Value;
 
-        /// <summary>
-        /// добавление нового вопроса
-        /// </summary>
-        /// <param name="faqDto">вопрос</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [ProducesResponseType(typeof(FaqDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> InsertAsync(
-                [FromBody] FaqDto faqDto,
-                CancellationToken token)
-        {
-            faqDto.IdAuthorQuestion = User.GetUserId()!.Value;
+        var result = await faqRepository.InsertAsync(faqDto, token)
+            .ConfigureAwait(false);
 
-            var result = await faqRepository.InsertAsync(faqDto, token)
-                .ConfigureAwait(false);
+        return Ok(result);
+    }
 
-            return Ok(result);
-        }
+    [HttpPut]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> UpdateAsync([FromBody] FaqDto faqDto, CancellationToken token)
+    {
+        faqDto.IdAuthorAnswer = User.GetUserId()!.Value;
 
-        [HttpPut]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> UpdateAsync([FromBody] FaqDto faqDto, CancellationToken token)
-        {
-            faqDto.IdAuthorAnswer = User.GetUserId()!.Value;
+        var result = await faqRepository.UpdateAsync(faqDto, token)
+            .ConfigureAwait(false);
+        return Ok(result);
+    }
 
-            var result = await faqRepository.UpdateAsync(faqDto, token)
-                .ConfigureAwait(false);
-            return Ok(result);
-        }
+    /// <summary>
+    /// Объединение 2 вопросов в один
+    /// </summary>
+    /// <param name="sourceId1"></param>
+    /// <param name="sourceId2"></param>        
+    /// <param name="mergeQuestions">настройка, объединять ли текст 2-х вопросов в один или нет</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    /// <exception cref="ArgumentInvalidException"></exception>
+    [HttpPost("merge")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> MergeAsync(
+        [FromQuery] int sourceId1,
+        [FromQuery] int sourceId2,
+        [FromQuery] bool mergeQuestions,
+        CancellationToken token)
+    {
+        var result = await faqRepository.MergeAsync(sourceId1, sourceId2, mergeQuestions, token)
+            .ConfigureAwait(false);
+        return Ok(result);
+    }
 
-        /// <summary>
-        /// Объединение 2 вопросов в один
-        /// </summary>
-        /// <param name="sourceId1"></param>
-        /// <param name="sourceId2"></param>        
-        /// <param name="mergeQuestions">настройка, объединять ли текст 2-х вопросов в один или нет</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        /// <exception cref="ArgumentInvalidException"></exception>
-        [HttpPost("merge")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> MergeAsync(
-            [FromQuery] int sourceId1,
-            [FromQuery] int sourceId2,
-            [FromQuery] bool mergeQuestions,
-            CancellationToken token)
-        {
-            var result = await faqRepository.MergeAsync(sourceId1, sourceId2, mergeQuestions, token)
-                .ConfigureAwait(false);
-            return Ok(result);
-        }
+    /// <summary>
+    /// Помечает вопрос как удаленный
+    /// </summary>
+    /// <param name="id">id вопроса</param>
+    /// <param name="token">Токен отмены задачи</param>
+    /// <returns>Количество удаленных из БД строк</returns>
+    [HttpPut("{id}")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> MarkAsDeletedAsync(int id, CancellationToken token)
+    {
+        var result = await faqRepository.MarkAsDeletedAsync(id, token)
+            .ConfigureAwait(false);
 
-        /// <summary>
-        /// Помечает вопрос как удаленный
-        /// </summary>
-        /// <param name="id">id вопроса</param>
-        /// <param name="token">Токен отмены задачи</param>
-        /// <returns>Количество удаленных из БД строк</returns>
-        [HttpPut("{id}")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> MarkAsDeletedAsync(int id, CancellationToken token)
-        {
-            var result = await faqRepository.MarkAsDeletedAsync(id, token)
-                .ConfigureAwait(false);
+        return Ok(result);
+    }
 
-            return Ok(result);
-        }
+    /// <summary>
+    /// Удаление вопроса
+    /// </summary>
+    /// <param name="id">id вопроса</param>
+    /// <param name="token">Токен отмены задачи</param>
+    /// <returns>Количество удаленных из БД строк</returns>
+    [HttpDelete("{id}")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> DeleteAsync(int id, CancellationToken token)
+    {
+        var result = await faqRepository.DeleteAsync(id, token)
+            .ConfigureAwait(false);
 
-        /// <summary>
-        /// Удаление вопроса
-        /// </summary>
-        /// <param name="id">id вопроса</param>
-        /// <param name="token">Токен отмены задачи</param>
-        /// <returns>Количество удаленных из БД строк</returns>
-        [HttpDelete("{id}")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> DeleteAsync(int id, CancellationToken token)
-        {
-            var result = await faqRepository.DeleteAsync(id, token)
-                .ConfigureAwait(false);
-
-            return Ok(result);
-        }
+        return Ok(result);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/FileController.cs b/AsbCloudWebApi/Controllers/FileController.cs
index 0c11e9a0..561f2df5 100644
--- a/AsbCloudWebApi/Controllers/FileController.cs
+++ b/AsbCloudWebApi/Controllers/FileController.cs
@@ -9,235 +9,233 @@ using System.Threading;
 using System.Threading.Tasks;
 using AsbCloudApp.Repositories;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+
+/// <summary>
+/// Хранение файлов
+/// </summary>
+[Route("api/well/{idWell}/files")]
+[ApiController]
+[Authorize]
+public class FileController : ControllerBase
 {
+    private readonly FileService fileService;
+    private readonly IWellService wellService;
 
-    /// <summary>
-    /// Хранение файлов
-    /// </summary>
-    [Route("api/well/{idWell}/files")]
-    [ApiController]
-    [Authorize]
-    public class FileController : ControllerBase
+    public FileController(FileService fileService, IWellService wellService)
     {
-        private readonly FileService fileService;
-        private readonly IWellService wellService;
-
-        public FileController(FileService fileService, IWellService wellService)
-        {
-            this.fileService = fileService;
-            this.wellService = wellService;
-        }
-
-        /// <summary>
-        /// Сохраняет переданные файлы и информацию о них
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="idCategory">id категории файла</param>
-        /// <param name="files">Коллекция файлов</param>
-        /// <param name="userRepository">dependency</param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns></returns>
-        [HttpPost]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> SaveFilesAsync(int idWell, int idCategory,
-            [FromForm] IFormFileCollection files, [FromServices] IUserRepository userRepository, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-            int? idUser = User.GetUserId();
-
-            if (idCompany is null || idUser is null)
-                return Forbid();
-
-            if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            if (!userRepository.HasPermission((int)idUser, $"File.edit{idCategory}"))
-                return Forbid();
-
-            foreach (var file in files)
-            {
-                var fileStream = file.OpenReadStream();
-                await fileService.SaveAsync(idWell, idUser ?? 0, idCategory, file.FileName,
-                     fileStream, token).ConfigureAwait(false);
-            }
-
-            return Ok();
-        }
-
-        /// <summary>
-        /// Возвращает информацию о файлах для скважины в выбраной категории
-        /// </summary>
-        /// <param name="request"> </param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns>Список информации о файлах в этой категории</returns>
-        [HttpGet("/api/files")]
-        [Permission]
-        [ProducesResponseType(typeof(PaginationContainer<FileInfoDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetFilesInfoAsync(
-            [FromQuery] FileRequest request,
-            CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (request.IdCategory is null || idCompany is null)
-                return Forbid();
-
-            if (!await wellService.IsCompanyInvolvedInWellAsync(idCompany.Value,
-                request.IdWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var filesInfo = await fileService.GetInfosPaginatedAsync(request, token).ConfigureAwait(false);
-
-            return Ok(filesInfo);
-        }
-
-        /// <summary>
-        /// Возвращает файл с диска на сервере
-        /// </summary>
-        /// <param name="idFile">id запрашиваемого файла</param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns>Запрашиваемый файл</returns>
-        [HttpGet("{idFile}")]
-        [Permission]
-        [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetFileAsync(
-            int idFile, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            var fileInfo = await fileService.GetOrDefaultAsync(idFile, token);
-
-            if (fileInfo is null)
-                return NotFound(idFile);
-
-            if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-            fileInfo.IdWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var fileStream = fileService.GetFileStream(fileInfo);
-
-            return File(fileStream, "application/octet-stream", fileInfo.Name);
-        }
-
-        /// <summary>
-        /// Помечает файл как удаленный
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="idFile">id запрашиваемого файла</param>
-        /// <param name="userRepository">dependency</param>
-        /// <param name="token">Токен отмены задачи </param>
-        /// <returns></returns>
-        [HttpDelete("{idFile}")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> DeleteAsync(int idWell, int idFile,
-             [FromServices] IUserRepository userRepository,
-            CancellationToken token)
-        {
-            int? idUser = User.GetUserId();
-
-            int? idCompany = User.GetCompanyId();
-
-            if (idUser is null || idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var fileInfo = await fileService.GetOrDefaultAsync(idFile, token);
-
-            if (fileInfo is null)
-                return NotFound(idFile);
-
-            if (!userRepository.HasPermission((int)idUser, $"File.edit{fileInfo?.IdCategory}"))
-                return Forbid();
-
-            var result = await fileService.MarkAsDeletedAsync(idFile, token);
-
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Создает метку для файла
-        /// </summary>
-        /// <param name="idWell">id скважины </param>
-        /// <param name="markDto">метка файла</param>
-        /// <param name="token">Токен отмены задачи </param>
-        /// <returns></returns>
-        [HttpPost("fileMark")]
-        [Permission]
-        public async Task<IActionResult> CreateFileMarkAsync(int idWell, FileMarkDto markDto, CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
-
-            var idUser = User.GetUserId();
-
-            if (idCompany is null || idUser is null ||
-                !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                    idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await fileService.CreateFileMarkAsync(markDto, (int)idUser, token)
-                .ConfigureAwait(false);
-
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Помечает метку у файла как удаленную
-        /// </summary>
-        /// <param name="idWell">id скважины </param>
-        /// <param name="idMark">id метки </param>
-        /// <param name="token">Токен отмены задачи </param>
-        /// <returns></returns>
-        [HttpDelete("fileMark")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> DeleteFileMarkAsync(int idWell, int idMark,
-            CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
-
-            if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await fileService.MarkFileMarkAsDeletedAsync(idMark, token)
-                .ConfigureAwait(false);
-
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Возвращает информацию о файле
-        /// </summary>
-        /// <param name="idFile">id запрашиваемого файла</param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns>Запрашиваемый файл</returns>
-        [HttpGet("/api/files/{idFile}")]
-        [Permission]
-        [ProducesResponseType(typeof(FileInfoDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetFileInfoAsync([FromRoute] int idFile, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            try
-            {
-                var fileInfo = await fileService.GetOrDefaultAsync(idFile, token).ConfigureAwait(false);
-                return Ok(fileInfo);
-            }
-            catch (FileNotFoundException ex)
-            {
-                return NotFound(ex.FileName);
-            }
-        }
+        this.fileService = fileService;
+        this.wellService = wellService;
     }
 
+    /// <summary>
+    /// Сохраняет переданные файлы и информацию о них
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="idCategory">id категории файла</param>
+    /// <param name="files">Коллекция файлов</param>
+    /// <param name="userRepository">dependency</param>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns></returns>
+    [HttpPost]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> SaveFilesAsync(int idWell, int idCategory,
+        [FromForm] IFormFileCollection files, [FromServices] IUserRepository userRepository, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+        int? idUser = User.GetUserId();
+
+        if (idCompany is null || idUser is null)
+            return Forbid();
+
+        if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        if (!userRepository.HasPermission((int)idUser, $"File.edit{idCategory}"))
+            return Forbid();
+
+        foreach (var file in files)
+        {
+            var fileStream = file.OpenReadStream();
+            await fileService.SaveAsync(idWell, idUser ?? 0, idCategory, file.FileName,
+                 fileStream, token).ConfigureAwait(false);
+        }
+
+        return Ok();
+    }
+
+    /// <summary>
+    /// Возвращает информацию о файлах для скважины в выбраной категории
+    /// </summary>
+    /// <param name="request"> </param>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns>Список информации о файлах в этой категории</returns>
+    [HttpGet("/api/files")]
+    [Permission]
+    [ProducesResponseType(typeof(PaginationContainer<FileInfoDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetFilesInfoAsync(
+        [FromQuery] FileRequest request,
+        CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+
+        if (request.IdCategory is null || idCompany is null)
+            return Forbid();
+
+        if (!await wellService.IsCompanyInvolvedInWellAsync(idCompany.Value,
+            request.IdWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var filesInfo = await fileService.GetInfosPaginatedAsync(request, token).ConfigureAwait(false);
+
+        return Ok(filesInfo);
+    }
+
+    /// <summary>
+    /// Возвращает файл с диска на сервере
+    /// </summary>
+    /// <param name="idFile">id запрашиваемого файла</param>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns>Запрашиваемый файл</returns>
+    [HttpGet("{idFile}")]
+    [Permission]
+    [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetFileAsync(
+        int idFile, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+
+        if (idCompany is null)
+            return Forbid();
+
+        var fileInfo = await fileService.GetOrDefaultAsync(idFile, token);
+
+        if (fileInfo is null)
+            return NotFound(idFile);
+
+        if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+        fileInfo.IdWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var fileStream = fileService.GetFileStream(fileInfo);
+
+        return File(fileStream, "application/octet-stream", fileInfo.Name);
+    }
+
+    /// <summary>
+    /// Помечает файл как удаленный
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="idFile">id запрашиваемого файла</param>
+    /// <param name="userRepository">dependency</param>
+    /// <param name="token">Токен отмены задачи </param>
+    /// <returns></returns>
+    [HttpDelete("{idFile}")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> DeleteAsync(int idWell, int idFile,
+         [FromServices] IUserRepository userRepository,
+        CancellationToken token)
+    {
+        int? idUser = User.GetUserId();
+
+        int? idCompany = User.GetCompanyId();
+
+        if (idUser is null || idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var fileInfo = await fileService.GetOrDefaultAsync(idFile, token);
+
+        if (fileInfo is null)
+            return NotFound(idFile);
+
+        if (!userRepository.HasPermission((int)idUser, $"File.edit{fileInfo?.IdCategory}"))
+            return Forbid();
+
+        var result = await fileService.MarkAsDeletedAsync(idFile, token);
+
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Создает метку для файла
+    /// </summary>
+    /// <param name="idWell">id скважины </param>
+    /// <param name="markDto">метка файла</param>
+    /// <param name="token">Токен отмены задачи </param>
+    /// <returns></returns>
+    [HttpPost("fileMark")]
+    [Permission]
+    public async Task<IActionResult> CreateFileMarkAsync(int idWell, FileMarkDto markDto, CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
+
+        var idUser = User.GetUserId();
+
+        if (idCompany is null || idUser is null ||
+            !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+                idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var result = await fileService.CreateFileMarkAsync(markDto, (int)idUser, token)
+            .ConfigureAwait(false);
+
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Помечает метку у файла как удаленную
+    /// </summary>
+    /// <param name="idWell">id скважины </param>
+    /// <param name="idMark">id метки </param>
+    /// <param name="token">Токен отмены задачи </param>
+    /// <returns></returns>
+    [HttpDelete("fileMark")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> DeleteFileMarkAsync(int idWell, int idMark,
+        CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
+
+        if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var result = await fileService.MarkFileMarkAsDeletedAsync(idMark, token)
+            .ConfigureAwait(false);
+
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Возвращает информацию о файле
+    /// </summary>
+    /// <param name="idFile">id запрашиваемого файла</param>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns>Запрашиваемый файл</returns>
+    [HttpGet("/api/files/{idFile}")]
+    [Permission]
+    [ProducesResponseType(typeof(FileInfoDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetFileInfoAsync([FromRoute] int idFile, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+
+        if (idCompany is null)
+            return Forbid();
+
+        try
+        {
+            var fileInfo = await fileService.GetOrDefaultAsync(idFile, token).ConfigureAwait(false);
+            return Ok(fileInfo);
+        }
+        catch (FileNotFoundException ex)
+        {
+            return NotFound(ex.FileName);
+        }
+    }
 }
diff --git a/AsbCloudWebApi/Controllers/LimitingParameterController.cs b/AsbCloudWebApi/Controllers/LimitingParameterController.cs
index 527e1646..3b2a67b1 100644
--- a/AsbCloudWebApi/Controllers/LimitingParameterController.cs
+++ b/AsbCloudWebApi/Controllers/LimitingParameterController.cs
@@ -7,59 +7,58 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Threading;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+[Route("api/[controller]")]
+[ApiController]
+[Authorize]
+public class LimitingParameterController : ControllerBase
 {
-    [Route("api/[controller]")]
-    [ApiController]
-    [Authorize]
-    public class LimitingParameterController : ControllerBase
+    private readonly ILimitingParameterService limitingParameterService;
+    private readonly IWellService wellService;
+
+    public LimitingParameterController(ILimitingParameterService limitingParameterService,
+        IWellService wellService)
+    { 
+        this.limitingParameterService = limitingParameterService;
+        this.wellService = wellService;
+    }
+
+    /// <summary>
+    /// Получение статистики по ограничивающим параметрам
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("stat")]
+    [ProducesResponseType(typeof(IEnumerable<LimitingParameterDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetStatAsync([FromQuery] LimitingParameterRequest request, CancellationToken token)
     {
-        private readonly ILimitingParameterService limitingParameterService;
-        private readonly IWellService wellService;
+        if (!await UserHasAccesToWellAsync(request.IdWell, token))
+            return Forbid();
+        var subsystemResult = await limitingParameterService.GetStatAsync(request, token);
+        return Ok(subsystemResult);
+    }
 
-        public LimitingParameterController(ILimitingParameterService limitingParameterService,
-            IWellService wellService)
-        { 
-            this.limitingParameterService = limitingParameterService;
-            this.wellService = wellService;
-        }
+    /// <summary>
+    /// Получение словаря названий ограничений
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("names")]
+    [ProducesResponseType(typeof(Dictionary<int, string>), (int)System.Net.HttpStatusCode.OK)]
+    public IActionResult GetLimitingParameteraNames()
+    { 
+        var feedRegulatorData = limitingParameterService.GetLimitingParameteraNames();
+        return Ok(feedRegulatorData);
+    }
 
-        /// <summary>
-        /// Получение статистики по ограничивающим параметрам
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("stat")]
-        [ProducesResponseType(typeof(IEnumerable<LimitingParameterDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetStatAsync([FromQuery] LimitingParameterRequest request, CancellationToken token)
-        {
-            if (!await UserHasAccesToWellAsync(request.IdWell, token))
-                return Forbid();
-            var subsystemResult = await limitingParameterService.GetStatAsync(request, token);
-            return Ok(subsystemResult);
-        }
-
-        /// <summary>
-        /// Получение словаря названий ограничений
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("names")]
-        [ProducesResponseType(typeof(Dictionary<int, string>), (int)System.Net.HttpStatusCode.OK)]
-        public IActionResult GetLimitingParameteraNames()
-        { 
-            var feedRegulatorData = limitingParameterService.GetLimitingParameteraNames();
-            return Ok(feedRegulatorData);
-        }
-
-        protected async Task<bool> UserHasAccesToWellAsync(int idWell, CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
-            if (idCompany is not null &&
-                await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, token)
-                    .ConfigureAwait(false))
-                return true;
-            return false;
-        }
+    protected async Task<bool> UserHasAccesToWellAsync(int idWell, CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
+        if (idCompany is not null &&
+            await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, token)
+                .ConfigureAwait(false))
+            return true;
+        return false;
     }
 }
diff --git a/AsbCloudWebApi/Controllers/MeasureController.cs b/AsbCloudWebApi/Controllers/MeasureController.cs
index f92ef71f..a4d597ea 100644
--- a/AsbCloudWebApi/Controllers/MeasureController.cs
+++ b/AsbCloudWebApi/Controllers/MeasureController.cs
@@ -5,104 +5,103 @@ using Microsoft.AspNetCore.Mvc;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Измерения
+/// </summary>
+[ApiController]
+[Authorize]
+[Route("api/well/{idWell}/measure")]
+public class MeasureController : ControllerBase
 {
-    /// <summary>
-    /// Измерения
-    /// </summary>
-    [ApiController]
-    [Authorize]
-    [Route("api/well/{idWell}/measure")]
-    public class MeasureController : ControllerBase
+    private readonly IMeasureService measureService;
+    private readonly IWellService wellService;
+
+    public MeasureController(IMeasureService measureService, IWellService wellService)
     {
-        private readonly IMeasureService measureService;
-        private readonly IWellService wellService;
+        this.measureService = measureService;
+        this.wellService = wellService;
+    }
 
-        public MeasureController(IMeasureService measureService, IWellService wellService)
-        {
-            this.measureService = measureService;
-            this.wellService = wellService;
-        }
+    [HttpGet("categories")]
+    [Permission]
+    public async Task<IActionResult> GetCategoriesAsync([FromRoute] int idWell, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-        [HttpGet("categories")]
-        [Permission]
-        public async Task<IActionResult> GetCategoriesAsync([FromRoute] int idWell, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
+        var result = await measureService.GetCategoriesAsync(token).ConfigureAwait(false);
+        return Ok(result);
+    }
 
-            var result = await measureService.GetCategoriesAsync(token).ConfigureAwait(false);
-            return Ok(result);
-        }
+    [HttpGet("last/{idCategory}")]
+    [Permission]
+    public async Task<IActionResult> GetLastAsync([FromRoute] int idWell, [FromRoute] int idCategory, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-        [HttpGet("last/{idCategory}")]
-        [Permission]
-        public async Task<IActionResult> GetLastAsync([FromRoute] int idWell, [FromRoute] int idCategory, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
+        var result = await measureService.GetLastOrDefaultAsync(idWell, idCategory, token).ConfigureAwait(false);
+        return Ok(result);
+    }
 
-            var result = await measureService.GetLastOrDefaultAsync(idWell, idCategory, token).ConfigureAwait(false);
-            return Ok(result);
-        }
+    /// <summary>
+    /// История замеров по скважине
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idCategory">Категория скважины. Не обязательный параметр.</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("history")]
+    [Permission]
+    public async Task<IActionResult> GetHisoryAsync([FromRoute] int idWell, CancellationToken token,
+        int? idCategory = null)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-        /// <summary>
-        /// История замеров по скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idCategory">Категория скважины. Не обязательный параметр.</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("history")]
-        [Permission]
-        public async Task<IActionResult> GetHisoryAsync([FromRoute] int idWell, CancellationToken token,
-            int? idCategory = null)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
+        var result = await measureService.GetHisoryAsync(idWell, idCategory, token).ConfigureAwait(false);
+        return Ok(result);
+    }
 
-            var result = await measureService.GetHisoryAsync(idWell, idCategory, token).ConfigureAwait(false);
-            return Ok(result);
-        }
+    [HttpPost]
+    [Permission]
+    public async Task<IActionResult> InsertAsync([FromRoute] int idWell, MeasureDto data, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-        [HttpPost]
-        [Permission]
-        public async Task<IActionResult> InsertAsync([FromRoute] int idWell, MeasureDto data, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
+        var result = await measureService.InsertAsync(idWell, data, token).ConfigureAwait(false);
+        return Ok(result);
+    }
 
-            var result = await measureService.InsertAsync(idWell, data, token).ConfigureAwait(false);
-            return Ok(result);
-        }
+    [HttpPut]
+    [Permission]
+    public async Task<IActionResult> UpdateAsync([FromRoute] int idWell, MeasureDto data, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-        [HttpPut]
-        [Permission]
-        public async Task<IActionResult> UpdateAsync([FromRoute] int idWell, MeasureDto data, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
+        var result = await measureService.UpdateAsync(idWell, data, token).ConfigureAwait(false);
+        return Ok(result);
+    }
 
-            var result = await measureService.UpdateAsync(idWell, data, token).ConfigureAwait(false);
-            return Ok(result);
-        }
+    [HttpDelete("history/{idData}")]
+    [Permission]
+    public async Task<IActionResult> MarkAsDeleteAsync([FromRoute] int idWell, [FromRoute] int idData, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-        [HttpDelete("history/{idData}")]
-        [Permission]
-        public async Task<IActionResult> MarkAsDeleteAsync([FromRoute] int idWell, [FromRoute] int idData, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
+        var result = await measureService.MarkAsDeleteAsync(idWell, idData, token).ConfigureAwait(false);
+        return Ok(result);
+    }
 
-            var result = await measureService.MarkAsDeleteAsync(idWell, idData, token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        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);
-        }
+    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);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/OperationStatController.cs b/AsbCloudWebApi/Controllers/OperationStatController.cs
index 59f907bd..7f0e06c6 100644
--- a/AsbCloudWebApi/Controllers/OperationStatController.cs
+++ b/AsbCloudWebApi/Controllers/OperationStatController.cs
@@ -1,4 +1,3 @@
-using System;
 using AsbCloudApp.Data;
 using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
@@ -9,164 +8,162 @@ using System.Threading;
 using System.Threading.Tasks;
 using AsbCloudApp.Data.WellOperation;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+
+/// <summary>
+/// Статистика по операциям (заведенным вручную) на скважине
+/// </summary>
+[ApiController]
+[Authorize]
+[Route("api")]
+public class OperationStatController : ControllerBase
 {
+    private readonly IOperationsStatService operationsStatService;
+    private readonly IWellOperationService wellOperationService;
+    private readonly IWellService wellService;
 
-    /// <summary>
-    /// Статистика по операциям (заведенным вручную) на скважине
-    /// </summary>
-    [ApiController]
-    [Authorize]
-    [Route("api")]
-    public class OperationStatController : ControllerBase
+    public OperationStatController(
+        IOperationsStatService operationsStatService, 
+        IWellService wellService,
+        IWellOperationService wellOperationService)
     {
-        private readonly IOperationsStatService operationsStatService;
-        private readonly IWellOperationService wellOperationService;
-        private readonly IWellService wellService;
-
-        public OperationStatController(
-            IOperationsStatService sectionsService, 
-            IWellService wellService,
-            IWellOperationService wellOperationService)
-        {
-            this.operationsStatService = sectionsService;
-            this.wellService = wellService;
-            this.wellOperationService = wellOperationService;
-        }
-
-        /// <summary>
-        /// Формирует данные по среднему и максимальному МСП на кусту по id скважины
-        /// </summary>
-        /// <param name="idWell">id скважины с данного куста (через нее будут получены данные)</param>
-        /// <param name="token"></param>
-        /// <returns>Возвращает данные по среднему и максимальному МСП на кусту</returns>
-        [HttpGet("well/{idWell}/ropStat")]
-        [Permission]
-        [ProducesResponseType(typeof(ClusterRopStatDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetClusterRopStatByIdWellAsync([FromRoute] int idWell,
-            CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await operationsStatService.GetOrDefaultRopStatAsync(
-                idWell, token).ConfigureAwait(false);
-
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Формирует данные по среднему и максимальному МСП на кусту по uid панели
-        /// </summary>
-        /// <param name="uid">id передающей данные панели</param>
-        /// <param name="token"></param>
-        /// <returns>Возвращает данные по среднему и максимальному МСП на кусту</returns>
-        [HttpGet("telemetry/{uid}/ropStat")]
-        [ProducesResponseType(typeof(ClusterRopStatDto), (int)System.Net.HttpStatusCode.OK)]
-        [AllowAnonymous]
-        public async Task<IActionResult> GetClusterRopStatByUidAsync([FromRoute] string uid,
-            CancellationToken token)
-        {
-            var idWell = wellService.TelemetryService.GetIdWellByTelemetryUid(uid);
-
-            if (idWell is null)
-                return NoContent();
-
-            var result = await operationsStatService.GetOrDefaultRopStatAsync(
-                (int)idWell, token).ConfigureAwait(false);
-
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получает статистику по скважинам куста
-        /// </summary>
-        /// <param name="idCluster">id куста</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("cluster/{idCluster}/stat")]
-        [Permission]
-        [ProducesResponseType(typeof(StatClusterDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetStatClusterAsync(int idCluster,
-            CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-            if (idCompany is null)
-                return Forbid();
-
-            var result = await operationsStatService.GetOrDefaultStatClusterAsync(idCluster, idCompany.Value, token)
-                .ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получает статистику по списку скважин
-        /// </summary>
-        /// <param name="idWells">список скважин</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("wellsStats")]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<StatWellDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetWellsStatAsync([FromQuery] IEnumerable<int> idWells, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-            if (idCompany is null)
-                return Forbid();
-
-            var allowedWells = await wellService.GetAsync(new() { IdCompany = idCompany }, token);
-
-            var protectedIdWells = idWells.Where(id => allowedWells.Any(allowed => allowed.Id == id));
-            var result = await operationsStatService.GetWellsStatAsync(protectedIdWells, token)
-                .ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получает статистику по скважине
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("well/{idWell}/stat")]
-        [Permission]
-        [ProducesResponseType(typeof(StatWellDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetStatWellAsync(int idWell,
-            CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await operationsStatService.GetOrDefaultWellStatAsync(idWell, token)
-                .ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получает данные для графика глубина-день
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("well/{idWell}/tvd")]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<PlanFactPredictBase<WellOperationDto>>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetTvdAsync(int idWell,
-            CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-            
-            var result = await wellOperationService.GetTvdAsync(idWell, token);
-            return Ok(result);
-        }
-
-        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);
-        }
+        this.operationsStatService = operationsStatService;
+        this.wellService = wellService;
+        this.wellOperationService = wellOperationService;
     }
 
+    /// <summary>
+    /// Формирует данные по среднему и максимальному МСП на кусту по id скважины
+    /// </summary>
+    /// <param name="idWell">id скважины с данного куста (через нее будут получены данные)</param>
+    /// <param name="token"></param>
+    /// <returns>Возвращает данные по среднему и максимальному МСП на кусту</returns>
+    [HttpGet("well/{idWell}/ropStat")]
+    [Permission]
+    [ProducesResponseType(typeof(ClusterRopStatDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetClusterRopStatByIdWellAsync([FromRoute] int idWell,
+        CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var result = await operationsStatService.GetOrDefaultRopStatAsync(
+            idWell, token).ConfigureAwait(false);
+
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Формирует данные по среднему и максимальному МСП на кусту по uid панели
+    /// </summary>
+    /// <param name="uid">id передающей данные панели</param>
+    /// <param name="token"></param>
+    /// <returns>Возвращает данные по среднему и максимальному МСП на кусту</returns>
+    [HttpGet("telemetry/{uid}/ropStat")]
+    [ProducesResponseType(typeof(ClusterRopStatDto), (int)System.Net.HttpStatusCode.OK)]
+    [AllowAnonymous]
+    public async Task<IActionResult> GetClusterRopStatByUidAsync([FromRoute] string uid,
+        CancellationToken token)
+    {
+        var idWell = wellService.TelemetryService.GetIdWellByTelemetryUid(uid);
+
+        if (idWell is null)
+            return NoContent();
+
+        var result = await operationsStatService.GetOrDefaultRopStatAsync(
+            (int)idWell, token).ConfigureAwait(false);
+
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получает статистику по скважинам куста
+    /// </summary>
+    /// <param name="idCluster">id куста</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("cluster/{idCluster}/stat")]
+    [Permission]
+    [ProducesResponseType(typeof(StatClusterDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetStatClusterAsync(int idCluster,
+        CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+        if (idCompany is null)
+            return Forbid();
+
+        var result = await operationsStatService.GetOrDefaultStatClusterAsync(idCluster, idCompany.Value, token)
+            .ConfigureAwait(false);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получает статистику по списку скважин
+    /// </summary>
+    /// <param name="idWells">список скважин</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("wellsStats")]
+    [Permission]
+    [ProducesResponseType(typeof(IEnumerable<StatWellDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetWellsStatAsync([FromQuery] IEnumerable<int> idWells, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+        if (idCompany is null)
+            return Forbid();
+
+        var allowedWells = await wellService.GetAsync(new() { IdCompany = idCompany }, token);
+
+        var protectedIdWells = idWells.Where(id => allowedWells.Any(allowed => allowed.Id == id));
+        var result = await operationsStatService.GetWellsStatAsync(protectedIdWells, token)
+            .ConfigureAwait(false);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получает статистику по скважине
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("well/{idWell}/stat")]
+    [Permission]
+    [ProducesResponseType(typeof(StatWellDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetStatWellAsync(int idWell,
+        CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var result = await operationsStatService.GetOrDefaultWellStatAsync(idWell, token)
+            .ConfigureAwait(false);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получает данные для графика глубина-день
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("well/{idWell}/tvd")]
+    [Permission]
+    [ProducesResponseType(typeof(IEnumerable<PlanFactPredictBase<WellOperationDto>>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetTvdAsync(int idWell,
+        CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+        
+        var result = await wellOperationService.GetTvdAsync(idWell, token);
+        return Ok(result);
+    }
+
+    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);
+    }
 }
diff --git a/AsbCloudWebApi/Controllers/OperationValueController.cs b/AsbCloudWebApi/Controllers/OperationValueController.cs
index cc0ce11f..a4be7910 100644
--- a/AsbCloudWebApi/Controllers/OperationValueController.cs
+++ b/AsbCloudWebApi/Controllers/OperationValueController.cs
@@ -3,18 +3,17 @@ using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Целевые и нормативные значения по глубине
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+[Authorize]
+public class OperationValueController : CrudWellRelatedController<OperationValueDto, IRepositoryWellRelated<OperationValueDto>>
 {
-    /// <summary>
-    /// Целевые и нормативные значения по глубине
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    [Authorize]
-    public class OperationValueController : CrudWellRelatedController<OperationValueDto, IRepositoryWellRelated<OperationValueDto>>
+    public OperationValueController(IRepositoryWellRelated<OperationValueDto> service, IWellService wellService) : base(wellService, service)
     {
-        public OperationValueController(IRepositoryWellRelated<OperationValueDto> service, IWellService wellService) : base(wellService, service)
-        {
-        }
     }
 }
diff --git a/AsbCloudWebApi/Controllers/PeriodicBackgroundWorkerController.cs b/AsbCloudWebApi/Controllers/PeriodicBackgroundWorkerController.cs
index 836f57be..7bc172a7 100644
--- a/AsbCloudWebApi/Controllers/PeriodicBackgroundWorkerController.cs
+++ b/AsbCloudWebApi/Controllers/PeriodicBackgroundWorkerController.cs
@@ -8,63 +8,62 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+[Route("api/[controller]")]
+[Authorize]
+[ApiController]
+public class PeriodicBackgroundWorkerController : ControllerBase
 {
-    [Route("api/[controller]")]
-    [Authorize]
-    [ApiController]
-    public class PeriodicBackgroundWorkerController : ControllerBase
+    private readonly PeriodicBackgroundWorker worker;
+    private readonly IServiceProvider serviceProvider;
+
+    public PeriodicBackgroundWorkerController(
+        PeriodicBackgroundWorker worker,
+        IServiceProvider serviceProvider)
     {
-        private readonly PeriodicBackgroundWorker worker;
-        private readonly IServiceProvider serviceProvider;
+        this.worker = worker;
+        this.serviceProvider = serviceProvider;
+    }
 
-        public PeriodicBackgroundWorkerController(
-            PeriodicBackgroundWorker worker,
-            IServiceProvider serviceProvider)
+    [HttpGet]
+    public IActionResult GetAll()
+    {
+        var result = new
         {
-            this.worker = worker;
-            this.serviceProvider = serviceProvider;
-        }
+            currentWork = (BackgroundWorkDto?)worker.CurrentWork,
+            worker.MainLoopLastException,
+            works = worker.Works.Select(work => (BackgroundWorkDto)work.Work),
+        };
+        return Ok(result);
+    }
 
-        [HttpGet]
-        public IActionResult GetAll()
+    /// <summary>
+    /// Запуск задачи по Id
+    /// </summary>
+    /// <param name="workId">Id задачи</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("start/{workId}")]
+    public async Task<IActionResult> Start(string workId, CancellationToken token)
+    {
+        var targetWork = worker.Works.FirstOrDefault(w => w.Work.Id == workId);
+        if(targetWork is not null)
         {
-            var result = new
-            {
-                currentWork = (BackgroundWorkDto?)worker.CurrentWork,
-                worker.MainLoopLastException,
-                works = worker.Works.Select(work => (BackgroundWorkDto)work.Work),
-            };
-            return Ok(result);
-        }
+            using (var scope = serviceProvider.CreateScope()) {
 
-        /// <summary>
-        /// Запуск задачи по Id
-        /// </summary>
-        /// <param name="workId">Id задачи</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("start/{workId}")]
-        public async Task<IActionResult> Start(string workId, CancellationToken token)
-        {
-            var targetWork = worker.Works.FirstOrDefault(w => w.Work.Id == workId);
-            if(targetWork is not null)
-            {
-                using (var scope = serviceProvider.CreateScope()) {
-
-                    var result = await targetWork.Work.Start(scope.ServiceProvider, token);
-                    return Ok(result);
-                }                
-            }
-            return BadRequest("Work not found by workId");
+                var result = await targetWork.Work.Start(scope.ServiceProvider, token);
+                return Ok(result);
+            }                
         }
+        return BadRequest("Work not found by workId");
+    }
 
-        [HttpPost("restart"), Obsolete("temporary method")]
-        public async Task<IActionResult> RestartAsync(CancellationToken token)
-        {
-            await worker.StopAsync(token);
-            await worker.StartAsync(token);
-            return Ok();
-        }
+    [HttpPost("restart"), Obsolete("temporary method")]
+    public async Task<IActionResult> RestartAsync(CancellationToken token)
+    {
+        await worker.StopAsync(token);
+        await worker.StartAsync(token);
+        return Ok();
     }
 }
diff --git a/AsbCloudWebApi/Controllers/ProtobufController.cs b/AsbCloudWebApi/Controllers/ProtobufController.cs
index 298f38bb..9ec9976f 100644
--- a/AsbCloudWebApi/Controllers/ProtobufController.cs
+++ b/AsbCloudWebApi/Controllers/ProtobufController.cs
@@ -3,81 +3,80 @@ using ProtoBuf.Meta;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Схемы ProtoBuf
+/// </summary>
+[Route("api/proto")]
+[ApiController]
+public class ProtobufController : ControllerBase
 {
-    /// <summary>
-    /// Схемы ProtoBuf
-    /// </summary>
-    [Route("api/proto")]
-    [ApiController]
-    public class ProtobufController : ControllerBase
+    private IEnumerable<MetaType> GetMetaTypes()
     {
-        private IEnumerable<MetaType> GetMetaTypes()
-        {
-            var metaTypes = RuntimeTypeModel.Default
-                .GetTypes()
-                .OfType<MetaType>();
-            var fileteredMetaTypes = metaTypes
-                .Where(t => t.Type.MemberType == System.Reflection.MemberTypes.TypeInfo)
-                .Where(t => !t.Type.IsGenericType)
-                .Where(t => !t.Type.IsArray);
-            return fileteredMetaTypes;
-        }
+        var metaTypes = RuntimeTypeModel.Default
+            .GetTypes()
+            .OfType<MetaType>();
+        var fileteredMetaTypes = metaTypes
+            .Where(t => t.Type.MemberType == System.Reflection.MemberTypes.TypeInfo)
+            .Where(t => !t.Type.IsGenericType)
+            .Where(t => !t.Type.IsArray);
+        return fileteredMetaTypes;
+    }
 
-        /// <summary>
-        /// названия доступных типов
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("types")]
-        [ProducesResponseType(typeof(IEnumerable<string>), (int)System.Net.HttpStatusCode.OK)]
-        public IActionResult GetTypes()
-        {
-            var typesNames = GetMetaTypes()
-                .Select(t => t.Type?.Name);
-            return Ok(typesNames);
-        }
+    /// <summary>
+    /// названия доступных типов
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("types")]
+    [ProducesResponseType(typeof(IEnumerable<string>), (int)System.Net.HttpStatusCode.OK)]
+    public IActionResult GetTypes()
+    {
+        var typesNames = GetMetaTypes()
+            .Select(t => t.Type?.Name);
+        return Ok(typesNames);
+    }
 
-        /// <summary>
-        /// .proto файл со всеми доступными типами
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("schema")]
-        [ProducesResponseType(typeof(IEnumerable<string>), (int)System.Net.HttpStatusCode.OK)]
-        public IActionResult GetSchema()
-        {
-            var types = GetMetaTypes().Select(mt => mt.Type);
-            SchemaGenerationOptions opts = new() { };
-            opts.Types.AddRange(types);
-            var protoFileContentString = ProtoBuf.Serializer.GetProto(opts);
-            var protoFileContentBytes = System.Text.Encoding.UTF8.GetBytes(protoFileContentString);
-            return File(protoFileContentBytes, "text/plain", "types.proto");
-        }
+    /// <summary>
+    /// .proto файл со всеми доступными типами
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("schema")]
+    [ProducesResponseType(typeof(IEnumerable<string>), (int)System.Net.HttpStatusCode.OK)]
+    public IActionResult GetSchema()
+    {
+        var types = GetMetaTypes().Select(mt => mt.Type);
+        SchemaGenerationOptions opts = new() { };
+        opts.Types.AddRange(types);
+        var protoFileContentString = ProtoBuf.Serializer.GetProto(opts);
+        var protoFileContentBytes = System.Text.Encoding.UTF8.GetBytes(protoFileContentString);
+        return File(protoFileContentBytes, "text/plain", "types.proto");
+    }
 
-        /// <summary>
-        /// .proto файл со всеми доступными типами
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("schema/{typeName}")]
-        [ProducesResponseType(typeof(IEnumerable<string>), (int)System.Net.HttpStatusCode.OK)]
-        [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
-        public IActionResult GetSchema(string typeName)
-        {
-            if (string.IsNullOrEmpty(typeName))
-                return this.ValidationBadRequest(nameof(typeName), "require typeName");
+    /// <summary>
+    /// .proto файл со всеми доступными типами
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("schema/{typeName}")]
+    [ProducesResponseType(typeof(IEnumerable<string>), (int)System.Net.HttpStatusCode.OK)]
+    [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
+    public IActionResult GetSchema(string typeName)
+    {
+        if (string.IsNullOrEmpty(typeName))
+            return this.ValidationBadRequest(nameof(typeName), "require typeName");
 
-            var type = RuntimeTypeModel.Default
-                .GetTypes()
-                .OfType<MetaType>()
-                .FirstOrDefault(t => t.Type.Name.Equals(typeName, System.StringComparison.InvariantCultureIgnoreCase));
+        var type = RuntimeTypeModel.Default
+            .GetTypes()
+            .OfType<MetaType>()
+            .FirstOrDefault(t => t.Type.Name.Equals(typeName, System.StringComparison.InvariantCultureIgnoreCase));
 
-            if (type is null)
-                return NoContent();
+        if (type is null)
+            return NoContent();
 
-            SchemaGenerationOptions opts = new() { };
-            opts.Types.Add(type.Type);
-            var protoFileContentString = ProtoBuf.Serializer.GetProto(opts);
-            var protoFileContentBytes = System.Text.Encoding.UTF8.GetBytes(protoFileContentString);
-            return File(protoFileContentBytes, "text/plain", $"{typeName}.proto");
-        }
+        SchemaGenerationOptions opts = new() { };
+        opts.Types.Add(type.Type);
+        var protoFileContentString = ProtoBuf.Serializer.GetProto(opts);
+        var protoFileContentBytes = System.Text.Encoding.UTF8.GetBytes(protoFileContentString);
+        return File(protoFileContentBytes, "text/plain", $"{typeName}.proto");
     }
 }
diff --git a/AsbCloudWebApi/Controllers/ReduceSamplingController.cs b/AsbCloudWebApi/Controllers/ReduceSamplingController.cs
index 4edc1db2..3dd754be 100644
--- a/AsbCloudWebApi/Controllers/ReduceSamplingController.cs
+++ b/AsbCloudWebApi/Controllers/ReduceSamplingController.cs
@@ -8,71 +8,70 @@ using System.Linq;
 using AsbCloudWebApi.SignalR;
 using Microsoft.AspNetCore.SignalR;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Редактор кустов для админки
+/// </summary>
+[Route("api/admin/[controller]")]
+[ApiController]
+[Authorize]
+public class ReduceSamplingController: ControllerBase
 {
-    /// <summary>
-    /// Редактор кустов для админки
-    /// </summary>
-    [Route("api/admin/[controller]")]
-    [ApiController]
-    [Authorize]
-    public class ReduceSamplingController: ControllerBase
+    private readonly IReduceSamplingService service;
+    private readonly IHubContext<TelemetryHub> telemetryHubContext;
+    private const string sirnalRGroupName = "ReduceSampling";
+    private const string sirnalRMethodOnProgress = "OnProgress";
+
+    public ReduceSamplingController(
+        IReduceSamplingService service,
+        IHubContext<TelemetryHub> telemetryHubContext )
     {
-        private readonly IReduceSamplingService service;
-        private readonly IHubContext<TelemetryHub> telemetryHubContext;
-        private const string sirnalRGroupName = "ReduceSampling";
-        private const string sirnalRMethodOnProgress = "OnProgress";
+        this.service = service;
+        this.telemetryHubContext = telemetryHubContext;
+    }
 
-        public ReduceSamplingController(
-            IReduceSamplingService service,
-            IHubContext<TelemetryHub> telemetryHubContext )
-        {
-            this.service = service;
-            this.telemetryHubContext = telemetryHubContext;
-        }
-
-        /// <summary>
-        /// Получить все задания. Задания удаляются минимум через 10 сек после выполнения, возможно позднее.
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <returns></returns>
-        [HttpGet]
-        public virtual ActionResult<IEnumerable<JobDto>> GetAll(int idTelemetry)
-        {
-            var result = service.GetJobs();
-            if (result.Any())
-                return Ok(result);
-            else
-                return NoContent();
-        }
-
-        /// <summary>
-        /// Получить состояние определенной задачи
-        /// </summary>
-        /// <param name="idTelemetry"></param>
-        /// <returns></returns>
-        [HttpGet("{idTelemetry}")]
-        public virtual ActionResult<JobDto> GetOrDefault(int idTelemetry)
-        {
-            var result = service.GetOrDefaultState(idTelemetry);
+    /// <summary>
+    /// Получить все задания. Задания удаляются минимум через 10 сек после выполнения, возможно позднее.
+    /// </summary>
+    /// <param name="idTelemetry"></param>
+    /// <returns></returns>
+    [HttpGet]
+    public virtual ActionResult<IEnumerable<JobDto>> GetAll(int idTelemetry)
+    {
+        var result = service.GetJobs();
+        if (result.Any())
             return Ok(result);
-        }
+        else
+            return NoContent();
+    }
 
-        /// <summary>
-        /// Создать задачу прореживанию архива и добавить её в очередь на выполнение.
-        /// Если задача есть в очереди, она же и возвращается, но подписка не происходит.
-        /// </summary>
-        [HttpPost]
-        [Permission]
-        public virtual ActionResult<JobDto> Enqueue(int idTelemetry)
-        {
-            void onProgress(JobDto job) =>
-                Task.Run(async () =>
-                    await telemetryHubContext.Clients.Group(sirnalRGroupName)
-                      .SendAsync(sirnalRMethodOnProgress, job));
+    /// <summary>
+    /// Получить состояние определенной задачи
+    /// </summary>
+    /// <param name="idTelemetry"></param>
+    /// <returns></returns>
+    [HttpGet("{idTelemetry}")]
+    public virtual ActionResult<JobDto> GetOrDefault(int idTelemetry)
+    {
+        var result = service.GetOrDefaultState(idTelemetry);
+        return Ok(result);
+    }
 
-            service.TryEnqueueRediceSamplingJob(idTelemetry, onProgress, out JobDto job);
-            return Ok(job);
-        }
+    /// <summary>
+    /// Создать задачу прореживанию архива и добавить её в очередь на выполнение.
+    /// Если задача есть в очереди, она же и возвращается, но подписка не происходит.
+    /// </summary>
+    [HttpPost]
+    [Permission]
+    public virtual ActionResult<JobDto> Enqueue(int idTelemetry)
+    {
+        void onProgress(JobDto job) =>
+            Task.Run(async () =>
+                await telemetryHubContext.Clients.Group(sirnalRGroupName)
+                  .SendAsync(sirnalRMethodOnProgress, job));
+
+        service.TryEnqueueRediceSamplingJob(idTelemetry, onProgress, out JobDto job);
+        return Ok(job);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/ReportController.cs b/AsbCloudWebApi/Controllers/ReportController.cs
index 423f36c4..45d5aa42 100644
--- a/AsbCloudWebApi/Controllers/ReportController.cs
+++ b/AsbCloudWebApi/Controllers/ReportController.cs
@@ -10,150 +10,149 @@ using System.Threading.Tasks;
 using AsbCloudApp.Requests;
 using AsbCloudWebApi.SignalR.Clients;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Отчет (временная диаграмма с сообщениями)
+/// </summary>
+[Route("api/well/{idWell}/report")]
+[ApiController]
+public class ReportController : ControllerBase
 {
-    /// <summary>
-    /// Отчет (временная диаграмма с сообщениями)
-    /// </summary>
-    [Route("api/well/{idWell}/report")]
-    [ApiController]
-    public class ReportController : ControllerBase
+    private readonly IReportService reportService;
+    private readonly IWellService wellService;
+    private readonly IHubContext<ReportsHub, IReportHubClient> reportsHubContext;
+
+    public ReportController(
+        IReportService reportService, 
+        IWellService wellService, 
+        IHubContext<ReportsHub, 
+        IReportHubClient> reportsHubContext)
     {
-        private readonly IReportService reportService;
-        private readonly IWellService wellService;
-        private readonly IHubContext<ReportsHub, IReportHubClient> reportsHubContext;
+        this.reportService = reportService;
+        this.wellService = wellService;
+        this.reportsHubContext = reportsHubContext;
+    }
 
-        public ReportController(
-            IReportService reportService, 
-            IWellService wellService, 
-            IHubContext<ReportsHub, 
-            IReportHubClient> reportsHubContext)
-        {
-            this.reportService = reportService;
-            this.wellService = wellService;
-            this.reportsHubContext = reportsHubContext;
-        }
+    /// <summary>
+    /// Создает отчет по скважине с указанными параметрами
+    /// </summary>
+    /// <param name="idWell">Id скважины</param>
+    /// <param name="request">Параметры запроса</param>
+    /// <param name="token">Токен для отмены задачи</param>
+    /// <returns>id фоновой задачи формирования отчета</returns>
+    [HttpPost]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> CreateReportAsync([Required] int idWell, 
+        [FromQuery] ReportParametersRequest request, 
+        CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
+        var idUser = User.GetUserId();
 
-        /// <summary>
-        /// Создает отчет по скважине с указанными параметрами
-        /// </summary>
-        /// <param name="idWell">Id скважины</param>
-        /// <param name="request">Параметры запроса</param>
-        /// <param name="token">Токен для отмены задачи</param>
-        /// <returns>id фоновой задачи формирования отчета</returns>
-        [HttpPost]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> CreateReportAsync([Required] int idWell, 
-            [FromQuery] ReportParametersRequest request, 
-            CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
-            var idUser = User.GetUserId();
+        if ((idCompany is null) || (idUser is null))
+            return Forbid();
 
-            if ((idCompany is null) || (idUser is null))
-                return Forbid();
-
-            if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, 
-                    idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            void HandleReportProgressAsync(object progress, string id) =>
-                Task.Run(async() =>
-                {
-                    await reportsHubContext.Clients.Group($"Report_{id}")
-                        .GetReportProgress(progress, token);
-                }, token);
-
-            var id = reportService.EnqueueCreateReportWork(idWell, (int)idUser, request, HandleReportProgressAsync);
-
-            return Ok(id);
-        }
-
-        /// <summary>
-        /// Возвращает имена всех отчетов по скважине
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="token">Токен для отмены задачи</param>
-        /// <returns>Список имен существующих отчетов (отчетов)</returns>
-        [HttpGet]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<string>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetAllReportsNamesByWellAsync(int idWell, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+        if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, 
                 idWell, token).ConfigureAwait(false))
-                return Forbid();
+            return Forbid();
 
-            var reports = await reportService.GetAllReportsByWellAsync(idWell, token).ConfigureAwait(false);
+        void HandleReportProgressAsync(object progress, string id) =>
+            Task.Run(async() =>
+            {
+                await reportsHubContext.Clients.Group($"Report_{id}")
+                    .GetReportProgress(progress, token);
+            }, token);
 
-            return Ok(reports);
-        }
+        var id = reportService.EnqueueCreateReportWork(idWell, (int)idUser, request, HandleReportProgressAsync);
 
-        /// <summary>
-        /// Возвращает прогнозируемое количество страниц будущего отчета
-        /// </summary>
-        /// <param name="idWell">Id скважины</param>
-        /// <param name="request">Параметры запроса</param>
-        /// <param name="token">Токен для отмены задачи</param>
-        /// <returns>прогнозируемое кол-во страниц отчета</returns>
-        [HttpGet("reportSize")]
-        [Permission]
-        [ProducesResponseType(typeof(string), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetReportSizeAsync([Required] int idWell, 
-            [FromQuery] ReportParametersRequest request,
-            CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
+        return Ok(id);
+    }
 
-            if (idCompany is null)
-                return Forbid();
+    /// <summary>
+    /// Возвращает имена всех отчетов по скважине
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="token">Токен для отмены задачи</param>
+    /// <returns>Список имен существующих отчетов (отчетов)</returns>
+    [HttpGet]
+    [Permission]
+    [ProducesResponseType(typeof(IEnumerable<string>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetAllReportsNamesByWellAsync(int idWell, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
 
-            if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, 
-                    idWell, token).ConfigureAwait(false))
-                return Forbid();
-        
-            int reportSize = reportService.GetReportPagesCount(idWell,
-                request.Begin, request.End, request.StepSeconds, request.Format);
+        if (idCompany is null)
+            return Forbid();
 
-            return Ok(reportSize);
-        }
+        if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-        /// <summary>
-        /// Возвращает даты самого старого и самого свежего отчетов в БД
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="token">Токен для отмены задачи</param>
-        /// <returns>Даты самого старого и самого свежего отчетов в БД</returns>
-        [HttpGet("datesRange")]
-        [Permission]
-        [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)]
-        [ProducesResponseType((int)System.Net.HttpStatusCode.NoContent)]
-        public async Task<IActionResult> GetReportsDateRangeAsync(int idWell, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
+        var reports = await reportService.GetAllReportsByWellAsync(idWell, token).ConfigureAwait(false);
 
-            if (idCompany is null)
-                return Forbid();
+        return Ok(reports);
+    }
 
-            if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+    /// <summary>
+    /// Возвращает прогнозируемое количество страниц будущего отчета
+    /// </summary>
+    /// <param name="idWell">Id скважины</param>
+    /// <param name="request">Параметры запроса</param>
+    /// <param name="token">Токен для отмены задачи</param>
+    /// <returns>прогнозируемое кол-во страниц отчета</returns>
+    [HttpGet("reportSize")]
+    [Permission]
+    [ProducesResponseType(typeof(string), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetReportSizeAsync([Required] int idWell, 
+        [FromQuery] ReportParametersRequest request,
+        CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+
+        if (idCompany is null)
+            return Forbid();
+
+        if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, 
                 idWell, token).ConfigureAwait(false))
-                return Forbid();
+            return Forbid();
+    
+        int reportSize = reportService.GetReportPagesCount(idWell,
+            request.Begin, request.End, request.StepSeconds, request.Format);
 
-            var wellReportsDatesRange = reportService.GetDatesRangeOrDefault(idWell);
+        return Ok(reportSize);
+    }
 
-            if (wellReportsDatesRange is null)
-                return NoContent();
+    /// <summary>
+    /// Возвращает даты самого старого и самого свежего отчетов в БД
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="token">Токен для отмены задачи</param>
+    /// <returns>Даты самого старого и самого свежего отчетов в БД</returns>
+    [HttpGet("datesRange")]
+    [Permission]
+    [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)]
+    [ProducesResponseType((int)System.Net.HttpStatusCode.NoContent)]
+    public async Task<IActionResult> GetReportsDateRangeAsync(int idWell, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
 
-            if (wellReportsDatesRange.From == wellReportsDatesRange.To)
-                return NoContent();
+        if (idCompany is null)
+            return Forbid();
 
-            return Ok(wellReportsDatesRange);
-        }
+        if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var wellReportsDatesRange = reportService.GetDatesRangeOrDefault(idWell);
+
+        if (wellReportsDatesRange is null)
+            return NoContent();
+
+        if (wellReportsDatesRange.From == wellReportsDatesRange.To)
+            return NoContent();
+
+        return Ok(wellReportsDatesRange);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/RequestTrackerController.cs b/AsbCloudWebApi/Controllers/RequestTrackerController.cs
index 82e3a433..1158838d 100644
--- a/AsbCloudWebApi/Controllers/RequestTrackerController.cs
+++ b/AsbCloudWebApi/Controllers/RequestTrackerController.cs
@@ -4,89 +4,87 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+
+/// <summary>
+/// Мониторинг запросов, ошибок, пользователей
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+[Authorize]
+public class RequestTrackerController : ControllerBase
 {
+    private readonly IRequerstTrackerService service;
 
-    /// <summary>
-    /// Мониторинг запросов, ошибок, пользователей
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    [Authorize]
-    public class RequestTrackerController : ControllerBase
+    public RequestTrackerController(IRequerstTrackerService service)
     {
-        private readonly IRequerstTrackerService service;
-
-        public RequestTrackerController(IRequerstTrackerService service)
-        {
-            this.service = service;
-        }
-
-        /// <summary>
-        /// Получить последние `take` запросов к серверу
-        /// </summary>
-        /// <param name="take">от 1 до 1000</param>
-        /// <returns></returns>
-        [HttpGet]
-        [Permission]
-        public IActionResult GetAll(int take = 512)
-        {
-            var result = service.GetAll(take);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получить последние `take` быстрых запросов к серверу
-        /// </summary>
-        /// <param name="take">от 1 до 1000</param>
-        /// <returns></returns>
-        [HttpGet("fast")]
-        [Permission]
-        public IActionResult GetFast(int take = 512)
-        {
-            var result = service.GetFast(take);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получить последние `take` медленных запросов к серверу
-        /// </summary>
-        /// <param name="take">от 1 до 1000</param>
-        /// <returns></returns>
-        [HttpGet("slow")]
-        [Permission]
-        public IActionResult GetSlow(int take = 512)
-        {
-            var result = service.GetSlow(take);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получить последние `take` ошибок при выполнении запросов
-        /// </summary>
-        /// <param name="take">от 1 до 1000</param>
-        /// <returns></returns>
-        [HttpGet("error")]
-        [Permission]
-        public IActionResult GetError(int take = 512)
-        {
-            var result = service.GetError(take);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получить последних пользователей обращавшихся к серверу. Уникальность пользователя проверяется по логину и Ip.
-        /// </summary>
-        /// <param name="take">от 1 до 1000</param>
-        /// <returns></returns>
-        [HttpGet("users")]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<RequestLogUserDto>), (int)System.Net.HttpStatusCode.OK)]
-        public IActionResult GetUsersStat(int take = 512)
-        {
-            var result = service.GetUsersStat(take);
-            return Ok(result);
-        }
+        this.service = service;
     }
 
+    /// <summary>
+    /// Получить последние `take` запросов к серверу
+    /// </summary>
+    /// <param name="take">от 1 до 1000</param>
+    /// <returns></returns>
+    [HttpGet]
+    [Permission]
+    public IActionResult GetAll(int take = 512)
+    {
+        var result = service.GetAll(take);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получить последние `take` быстрых запросов к серверу
+    /// </summary>
+    /// <param name="take">от 1 до 1000</param>
+    /// <returns></returns>
+    [HttpGet("fast")]
+    [Permission]
+    public IActionResult GetFast(int take = 512)
+    {
+        var result = service.GetFast(take);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получить последние `take` медленных запросов к серверу
+    /// </summary>
+    /// <param name="take">от 1 до 1000</param>
+    /// <returns></returns>
+    [HttpGet("slow")]
+    [Permission]
+    public IActionResult GetSlow(int take = 512)
+    {
+        var result = service.GetSlow(take);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получить последние `take` ошибок при выполнении запросов
+    /// </summary>
+    /// <param name="take">от 1 до 1000</param>
+    /// <returns></returns>
+    [HttpGet("error")]
+    [Permission]
+    public IActionResult GetError(int take = 512)
+    {
+        var result = service.GetError(take);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получить последних пользователей обращавшихся к серверу. Уникальность пользователя проверяется по логину и Ip.
+    /// </summary>
+    /// <param name="take">от 1 до 1000</param>
+    /// <returns></returns>
+    [HttpGet("users")]
+    [Permission]
+    [ProducesResponseType(typeof(IEnumerable<RequestLogUserDto>), (int)System.Net.HttpStatusCode.OK)]
+    public IActionResult GetUsersStat(int take = 512)
+    {
+        var result = service.GetUsersStat(take);
+        return Ok(result);
+    }
 }
diff --git a/AsbCloudWebApi/Controllers/SAUB/DetectedOperationController.cs b/AsbCloudWebApi/Controllers/SAUB/DetectedOperationController.cs
index d4171f25..2cd6b7e7 100644
--- a/AsbCloudWebApi/Controllers/SAUB/DetectedOperationController.cs
+++ b/AsbCloudWebApi/Controllers/SAUB/DetectedOperationController.cs
@@ -14,184 +14,183 @@ using AsbCloudApp.Repositories;
 using AsbCloudInfrastructure.Services.DetectOperations;
 using Microsoft.AspNetCore.Http;
 
-namespace AsbCloudWebApi.Controllers.SAUB
+namespace AsbCloudWebApi.Controllers.SAUB;
+
+/// <summary>
+/// Операции определенные по телеметрии САУБ
+/// </summary>
+[Route("api/well/{idWell}/[controller]")]
+[ApiController]
+[Authorize]
+public class DetectedOperationController : ControllerBase
 {
-   /// <summary>
-   /// Операции определенные по телеметрии САУБ
-   /// </summary>
-   [Route("api/well/{idWell}/[controller]")]
-   [ApiController]
-   [Authorize]
-   public class DetectedOperationController : ControllerBase
-   {
-      private readonly IDetectedOperationRepository detectedOperationRepository;
-      private readonly IDetectedOperationService detectedOperationService;
-      private readonly IWellService wellService;
-      private readonly DetectedOperationExportService detectedOperationExportService;
+  private readonly IDetectedOperationRepository detectedOperationRepository;
+  private readonly IDetectedOperationService detectedOperationService;
+  private readonly IWellService wellService;
+  private readonly DetectedOperationExportService detectedOperationExportService;
 
-      public DetectedOperationController(IDetectedOperationService detectedOperationService,
-         IWellService wellService,
-         DetectedOperationExportService detectedOperationExportService,
-         IDetectedOperationRepository detectedOperationRepository)
-      {
-         this.detectedOperationService = detectedOperationService;
-         this.wellService = wellService;
-         this.detectedOperationExportService = detectedOperationExportService;
-         this.detectedOperationRepository = detectedOperationRepository;
-      }
+  public DetectedOperationController(IDetectedOperationService detectedOperationService,
+     IWellService wellService,
+     DetectedOperationExportService detectedOperationExportService,
+     IDetectedOperationRepository detectedOperationRepository)
+  {
+     this.detectedOperationService = detectedOperationService;
+     this.wellService = wellService;
+     this.detectedOperationExportService = detectedOperationExportService;
+     this.detectedOperationRepository = detectedOperationRepository;
+  }
 
-      /// <summary>
-      /// Добавить операции
-      /// </summary>
-      /// <param name="idWell"></param>
-      /// <param name="dtos"></param>
-      /// <param name="token"></param>
-      /// <returns></returns>
-      [HttpPost]
-      [ProducesResponseType(typeof(int), StatusCodes.Status200OK)]
-      public async Task<IActionResult> InsertRangeAsync(int idWell, IEnumerable<DetectedOperationDto> dtos, CancellationToken token)
-      {
-         var idUser = await AssertUserHasAccessToWellAsync(idWell, token);
+  /// <summary>
+  /// Добавить операции
+  /// </summary>
+  /// <param name="idWell"></param>
+  /// <param name="dtos"></param>
+  /// <param name="token"></param>
+  /// <returns></returns>
+  [HttpPost]
+  [ProducesResponseType(typeof(int), StatusCodes.Status200OK)]
+  public async Task<IActionResult> InsertRangeAsync(int idWell, IEnumerable<DetectedOperationDto> dtos, CancellationToken token)
+  {
+     var idUser = await AssertUserHasAccessToWellAsync(idWell, token);
 
-         var result = await detectedOperationService.InsertRangeManualAsync(idUser, idWell, dtos, token);
+     var result = await detectedOperationService.InsertRangeManualAsync(idUser, idWell, dtos, token);
 
-         return Ok(result);
-      }
+     return Ok(result);
+  }
 
-      /// <summary>
-      /// Обновить операции
-      /// </summary>
-      /// <param name="idWell"></param>
-      /// <param name="dtos"></param>
-      /// <param name="token"></param>
-      /// <returns></returns>
-      [HttpPut]
-      [ProducesResponseType(typeof(int), StatusCodes.Status200OK)]
-      public async Task<IActionResult> UpdateRangeAsync(int idWell, IEnumerable<DetectedOperationDto> dtos, CancellationToken token)
-      {
-         var idUser = await AssertUserHasAccessToWellAsync(idWell, token);
+  /// <summary>
+  /// Обновить операции
+  /// </summary>
+  /// <param name="idWell"></param>
+  /// <param name="dtos"></param>
+  /// <param name="token"></param>
+  /// <returns></returns>
+  [HttpPut]
+  [ProducesResponseType(typeof(int), StatusCodes.Status200OK)]
+  public async Task<IActionResult> UpdateRangeAsync(int idWell, IEnumerable<DetectedOperationDto> dtos, CancellationToken token)
+  {
+     var idUser = await AssertUserHasAccessToWellAsync(idWell, token);
 
-         var result = await detectedOperationService.UpdateRangeManualAsync(idUser, idWell, dtos, token);
+     var result = await detectedOperationService.UpdateRangeManualAsync(idUser, idWell, dtos, token);
 
-         return Ok(result);
-      }
+     return Ok(result);
+  }
 
-      /// <summary>
-      /// Удалить операции
-      /// </summary>
-      /// <param name="idWell"></param>
-      /// <param name="ids"></param>
-      /// <param name="token"></param>
-      /// <returns></returns>
-      [HttpDelete]
-      [ProducesResponseType(typeof(int), StatusCodes.Status200OK)]
-      public async Task<IActionResult> DeleteRangeAsync(int idWell, IEnumerable<int> ids, CancellationToken token)
-      {
-         await AssertUserHasAccessToWellAsync(idWell, token);
+  /// <summary>
+  /// Удалить операции
+  /// </summary>
+  /// <param name="idWell"></param>
+  /// <param name="ids"></param>
+  /// <param name="token"></param>
+  /// <returns></returns>
+  [HttpDelete]
+  [ProducesResponseType(typeof(int), StatusCodes.Status200OK)]
+  public async Task<IActionResult> DeleteRangeAsync(int idWell, IEnumerable<int> ids, CancellationToken token)
+  {
+     await AssertUserHasAccessToWellAsync(idWell, token);
 
-         var result = await detectedOperationRepository.DeleteRangeAsync(ids, token);
+     var result = await detectedOperationRepository.DeleteRangeAsync(ids, token);
 
-         return Ok(result);
-      }
+     return Ok(result);
+  }
 
-      /// <summary>
-      /// получить справочник операций. Отличается от операций заводимых вручную.
-      /// При задании id скважины вернет только те операции, которые определились в телеметрии этой скважины.
-      /// </summary>
-      /// <param name="idWell">[опционально] id скважины</param>
-      /// <param name="token"></param>
-      /// <returns></returns>
-      [HttpGet]
-      [Route("/api/well/[controller]/categories")]
-      [ProducesResponseType(typeof(IEnumerable<WellOperationCategoryDto>), StatusCodes.Status200OK)]
-      public async Task<IActionResult> GetCategoriesAsync([FromQuery] int? idWell, CancellationToken token)
-      {
-         var result = await detectedOperationService.GetCategoriesAsync(idWell, token);
-         return Ok(result);
-      }
+  /// <summary>
+  /// получить справочник операций. Отличается от операций заводимых вручную.
+  /// При задании id скважины вернет только те операции, которые определились в телеметрии этой скважины.
+  /// </summary>
+  /// <param name="idWell">[опционально] id скважины</param>
+  /// <param name="token"></param>
+  /// <returns></returns>
+  [HttpGet]
+  [Route("/api/well/[controller]/categories")]
+  [ProducesResponseType(typeof(IEnumerable<WellOperationCategoryDto>), StatusCodes.Status200OK)]
+  public async Task<IActionResult> GetCategoriesAsync([FromQuery] int? idWell, CancellationToken token)
+  {
+     var result = await detectedOperationService.GetCategoriesAsync(idWell, token);
+     return Ok(result);
+  }
 
-      /// <summary>
-      /// Получить список авто определенных операций для редактирования
-      /// </summary>
-      /// <param name="idWell"></param>
-      /// <param name="request"></param>
-      /// <param name="token"></param>
-      /// <returns></returns>
-      [HttpGet]
-      [ProducesResponseType(typeof(PaginationContainer<DetectedOperationDto>), StatusCodes.Status200OK)]
-      public async Task<IActionResult> GetPageAsync(int idWell, [FromQuery] DetectedOperationRequest request,
-         CancellationToken token)
-      {
-         await AssertUserHasAccessToWellAsync(idWell, token);
+  /// <summary>
+  /// Получить список авто определенных операций для редактирования
+  /// </summary>
+  /// <param name="idWell"></param>
+  /// <param name="request"></param>
+  /// <param name="token"></param>
+  /// <returns></returns>
+  [HttpGet]
+  [ProducesResponseType(typeof(PaginationContainer<DetectedOperationDto>), StatusCodes.Status200OK)]
+  public async Task<IActionResult> GetPageAsync(int idWell, [FromQuery] DetectedOperationRequest request,
+     CancellationToken token)
+  {
+     await AssertUserHasAccessToWellAsync(idWell, token);
 
-         var well = await wellService.GetOrDefaultAsync(idWell, token);
+     var well = await wellService.GetOrDefaultAsync(idWell, token);
 
-         if (well?.IdTelemetry is null)
-            return NoContent();
+     if (well?.IdTelemetry is null)
+        return NoContent();
 
-         var requestToService = new DetectedOperationByTelemetryRequest(well.IdTelemetry.Value, request);
+     var requestToService = new DetectedOperationByTelemetryRequest(well.IdTelemetry.Value, request);
 
-         var result = await detectedOperationRepository.GetPageAsync(requestToService, token);
-         return Ok(result);
-      }
-      
-      /// <summary>
-      /// Получить статистику по авто определенным операциям
-      /// </summary>
-      /// <param name="idWell"></param>
-      /// <param name="request"></param>
-      /// <param name="token"></param>
-      /// <returns></returns>
-      [HttpGet("stat")]
-      [ProducesResponseType(typeof(DetectedOperationListDto), StatusCodes.Status200OK)]
-      public async Task<IActionResult> GetAsync(int idWell, [FromQuery] DetectedOperationRequest request, CancellationToken token)
-      {
-         await AssertUserHasAccessToWellAsync(idWell, token);
-         
-         var requestToService = new DetectedOperationByWellRequest(idWell, request);
+     var result = await detectedOperationRepository.GetPageAsync(requestToService, token);
+     return Ok(result);
+  }
+  
+  /// <summary>
+  /// Получить статистику по авто определенным операциям
+  /// </summary>
+  /// <param name="idWell"></param>
+  /// <param name="request"></param>
+  /// <param name="token"></param>
+  /// <returns></returns>
+  [HttpGet("stat")]
+  [ProducesResponseType(typeof(DetectedOperationListDto), StatusCodes.Status200OK)]
+  public async Task<IActionResult> GetAsync(int idWell, [FromQuery] DetectedOperationRequest request, CancellationToken token)
+  {
+     await AssertUserHasAccessToWellAsync(idWell, token);
+     
+     var requestToService = new DetectedOperationByWellRequest(idWell, request);
 
-         var result = await detectedOperationService.GetAsync(requestToService, token);
-         return Ok(result);
-      }
+     var result = await detectedOperationService.GetAsync(requestToService, token);
+     return Ok(result);
+  }
 
-      /// <summary>
-      /// Создает excel файл с операциями по скважине
-      /// </summary>
-      /// <param name="idWell">id скважины</param>
-      /// <param name="token"></param>
-      [HttpGet("export")]
-      [Permission]
-      [ProducesResponseType(typeof(PhysicalFileResult), StatusCodes.Status200OK, "application/octet-stream")]
-      [ProducesResponseType(StatusCodes.Status204NoContent)]
-      [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
-      public async Task<IActionResult> ExportAsync(int idWell, CancellationToken token)
-      {
-         var idCompany = User.GetCompanyId();
-      
-         if (idCompany is null)
-            return Forbid();
-      
-         var host = $"{HttpContext.Request.Scheme}://{HttpContext.Request.Host}";
-         var stream = await detectedOperationExportService.ExportAsync(idWell, host, token);
-      
-         return File(stream, "application/octet-stream", "operations.xlsx");
-      }
+  /// <summary>
+  /// Создает excel файл с операциями по скважине
+  /// </summary>
+  /// <param name="idWell">id скважины</param>
+  /// <param name="token"></param>
+  [HttpGet("export")]
+  [Permission]
+  [ProducesResponseType(typeof(PhysicalFileResult), StatusCodes.Status200OK, "application/octet-stream")]
+  [ProducesResponseType(StatusCodes.Status204NoContent)]
+  [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
+  public async Task<IActionResult> ExportAsync(int idWell, CancellationToken token)
+  {
+     var idCompany = User.GetCompanyId();
+  
+     if (idCompany is null)
+        return Forbid();
+  
+     var host = $"{HttpContext.Request.Scheme}://{HttpContext.Request.Host}";
+     var stream = await detectedOperationExportService.ExportAsync(idWell, host, token);
+  
+     return File(stream, "application/octet-stream", "operations.xlsx");
+  }
 
-      private async Task<int> AssertUserHasAccessToWellAsync(int idWell, CancellationToken token)
-      {
-         var idUser = User.GetUserId();
-         var idCompany = User.GetCompanyId();
+  private async Task<int> AssertUserHasAccessToWellAsync(int idWell, CancellationToken token)
+  {
+     var idUser = User.GetUserId();
+     var idCompany = User.GetCompanyId();
 
-         if (!idUser.HasValue)
-            throw new ForbidException("Неизвестный пользователь");
+     if (!idUser.HasValue)
+        throw new ForbidException("Неизвестный пользователь");
 
-         if (!idCompany.HasValue)
-            throw new ForbidException("Нет доступа к скважине");
+     if (!idCompany.HasValue)
+        throw new ForbidException("Нет доступа к скважине");
 
-         if (!await wellService.IsCompanyInvolvedInWellAsync(idCompany.Value, idWell, token))
-            throw new ForbidException("Нет доступа к скважине");
+     if (!await wellService.IsCompanyInvolvedInWellAsync(idCompany.Value, idWell, token))
+        throw new ForbidException("Нет доступа к скважине");
 
-         return idUser.Value;
-      }
-   }
+     return idUser.Value;
+  }
 }
\ No newline at end of file
diff --git a/AsbCloudWebApi/Controllers/SAUB/GtrWitsController.cs b/AsbCloudWebApi/Controllers/SAUB/GtrWitsController.cs
index 460eb773..e292408c 100644
--- a/AsbCloudWebApi/Controllers/SAUB/GtrWitsController.cs
+++ b/AsbCloudWebApi/Controllers/SAUB/GtrWitsController.cs
@@ -15,169 +15,167 @@ using AsbCloudApp.Data;
 using System;
 using Org.BouncyCastle.Asn1.Ocsp;
 
-namespace AsbCloudWebApi.Controllers.SAUB
+namespace AsbCloudWebApi.Controllers.SAUB;
+
+
+[Route("api/[controller]")]
+[ApiController]
+public class GtrWitsController : ControllerBase
+
 {
+    protected readonly IWellService wellService;
+    private readonly ITelemetryService telemetryService;
+    private readonly IGtrRepository gtrRepository;
+    private readonly IHubContext<TelemetryHub> telemetryHubContext;
 
-    [Route("api/[controller]")]
-    [ApiController]
-    public class GtrWitsController : ControllerBase
+    public string SignalRMethodGetDataName { get; protected set; } = "ReceiveData";
 
+    public GtrWitsController(
+        ITelemetryService telemetryService,
+        IGtrRepository gtrRepository,
+        IWellService wellService,
+        IHubContext<TelemetryHub> telemetryHubContext)
     {
-        protected readonly IWellService wellService;
-        private readonly ITelemetryService telemetryService;
-        private readonly IGtrRepository gtrRepository;
-        private readonly IHubContext<TelemetryHub> telemetryHubContext;
-
-        public string SignalRMethodGetDataName { get; protected set; } = "ReceiveData";
-
-        public GtrWitsController(
-            ITelemetryService telemetryService,
-            IGtrRepository gtrRepository,
-            IWellService wellService,
-            IHubContext<TelemetryHub> telemetryHubContext)
-        {
-            this.telemetryService = telemetryService;
-            this.gtrRepository = gtrRepository;
-            this.wellService = wellService;
-            this.telemetryHubContext = telemetryHubContext;
-        }
-
-        /// <summary>
-        /// Получить значение от ГТИ
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="request"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<GtrWitsDto>), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GetAllAsync([Required] int idWell, [FromQuery] GtrRequest request, CancellationToken token)
-        {
-            await AssertUserHasAccessToWellAsync(idWell, token);
-
-            var dtos = await gtrRepository.GetAsync(idWell, request, token);
-
-            return Ok(dtos);
-        }
-
-        /// <summary>
-        /// Возвращает диапазон дат за которые есть телеметрия за период времени
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="geDate"></param>
-        /// <param name="leDate"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("{idWell}/dateRange")]
-        [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)]
-        [ProducesResponseType((int)System.Net.HttpStatusCode.NotFound)]
-        [ProducesResponseType((int)System.Net.HttpStatusCode.NoContent)]
-        public virtual async Task<ActionResult<DatesRangeDto?>> GetRangeAsync(
-            [FromRoute] int idWell,
-            DateTimeOffset? geDate,
-            DateTimeOffset? leDate,
-            CancellationToken token)
-        {
-            await AssertUserHasAccessToWellAsync(idWell, token);
-
-            var range = await gtrRepository.GetRangeAsync(idWell, geDate, leDate, token);
-
-            return Ok(range);
-        }
-
-        /// <summary>
-        /// Получить загруженные данные ГТИ по скважине
-        /// </summary>
-        /// <param name="idWell">Id скважины</param>
-        /// <param name="request">Параметры запроса</param>
-        /// <param name = "token" >Токен завершения задачи</param>
-        /// <returns></returns>
-        [HttpGet("{idWell}")]
-        public async Task<ActionResult<IEnumerable<WitsRecordDto>>> GetDataAsync([Required] int idWell, 
-            [FromQuery] GtrRequest request,
-            CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false);
-
-            if (!isCompanyOwnsWell)
-                return Forbid();
-
-            var content = await gtrRepository.GetAsync(idWell, request.Begin?.DateTime,
-              request.IntervalSec, request.ApproxPointsCount, token).ConfigureAwait(false);
-
-            return Ok(content);
-        }
-
-        /// <summary>
-        /// получение последних данных ГТИ по ключу record
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="idRecord">id record</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("{idWell}/{idRecord}")]
-        public async Task<ActionResult<IEnumerable<WitsItemRecordDto>>> GetLastDataByRecordIdAsync(int idWell, int idRecord, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false);
-
-            if (!isCompanyOwnsWell)
-                return Forbid();
-
-            var content = gtrRepository.GetLastDataByRecordId(idWell, idRecord);
-
-            return Ok(content);
-        }
-
-        /// <summary>
-        /// Метод для получения WITS записи от панели оператора.
-        /// Сохраняет в БД.        
-        /// </summary>
-        /// <param name="uid">уникальный идентификатор телеметрии</param>
-        /// <param name="dtos">WITS запись</param>        
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPost("{uid}")]
-        public async Task<IActionResult> PostDataAsync(
-            string uid,
-            [FromBody] IEnumerable<WitsRecordDto> dtos,
-            CancellationToken token)
-        {
-            var telemetry = telemetryService.GetOrCreateTelemetryByUid(uid);
-            await gtrRepository.SaveDataAsync(telemetry.Id, dtos, token).ConfigureAwait(false);
-            var idWell = telemetryService.GetIdWellByTelemetryUid(uid);
-            if (idWell is not null && dtos is not null)
-                _ = Task.Run(() => telemetryHubContext.Clients.Group($"well_{idWell}_gtr")
-                      .SendAsync(SignalRMethodGetDataName, dtos), CancellationToken.None);
-            return Ok();
-        }
-        
-        private async Task AssertUserHasAccessToWellAsync(int idWell, CancellationToken token)
-        {
-            var idUser = User.GetUserId();
-            var idCompany = User.GetCompanyId();
-
-            if (!idUser.HasValue)
-                throw new ForbidException("Нет доступа к скважине");
-
-            if (!idCompany.HasValue)
-                throw new ForbidException("Нет доступа к скважине");
-
-            if (!await wellService.IsCompanyInvolvedInWellAsync(idCompany.Value, idWell, token))
-                throw new ForbidException("Нет доступа к скважине");
-        }
+        this.telemetryService = telemetryService;
+        this.gtrRepository = gtrRepository;
+        this.wellService = wellService;
+        this.telemetryHubContext = telemetryHubContext;
     }
 
+    /// <summary>
+    /// Получить значение от ГТИ
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="request"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet]
+    [Permission]
+    [ProducesResponseType(typeof(IEnumerable<GtrWitsDto>), StatusCodes.Status200OK)]
+    public async Task<IActionResult> GetAllAsync([Required] int idWell, [FromQuery] GtrRequest request, CancellationToken token)
+    {
+        await AssertUserHasAccessToWellAsync(idWell, token);
+
+        var dtos = await gtrRepository.GetAsync(idWell, request, token);
+
+        return Ok(dtos);
+    }
+
+    /// <summary>
+    /// Возвращает диапазон дат за которые есть телеметрия за период времени
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="geDate"></param>
+    /// <param name="leDate"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("{idWell}/dateRange")]
+    [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)]
+    [ProducesResponseType((int)System.Net.HttpStatusCode.NotFound)]
+    [ProducesResponseType((int)System.Net.HttpStatusCode.NoContent)]
+    public virtual async Task<ActionResult<DatesRangeDto?>> GetRangeAsync(
+        [FromRoute] int idWell,
+        DateTimeOffset? geDate,
+        DateTimeOffset? leDate,
+        CancellationToken token)
+    {
+        await AssertUserHasAccessToWellAsync(idWell, token);
+
+        var range = await gtrRepository.GetRangeAsync(idWell, geDate, leDate, token);
+
+        return Ok(range);
+    }
+
+    /// <summary>
+    /// Получить загруженные данные ГТИ по скважине
+    /// </summary>
+    /// <param name="idWell">Id скважины</param>
+    /// <param name="request">Параметры запроса</param>
+    /// <param name = "token" >Токен завершения задачи</param>
+    /// <returns></returns>
+    [HttpGet("{idWell}")]
+    public async Task<ActionResult<IEnumerable<WitsRecordDto>>> GetDataAsync([Required] int idWell, 
+        [FromQuery] GtrRequest request,
+        CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+
+        if (idCompany is null)
+            return Forbid();
+
+        bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false);
+
+        if (!isCompanyOwnsWell)
+            return Forbid();
+
+        var content = await gtrRepository.GetAsync(idWell, request.Begin?.DateTime,
+          request.IntervalSec, request.ApproxPointsCount, token).ConfigureAwait(false);
+
+        return Ok(content);
+    }
+
+    /// <summary>
+    /// получение последних данных ГТИ по ключу record
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="idRecord">id record</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("{idWell}/{idRecord}")]
+    public async Task<ActionResult<IEnumerable<WitsItemRecordDto>>> GetLastDataByRecordIdAsync(int idWell, int idRecord, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+
+        if (idCompany is null)
+            return Forbid();
+
+        bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false);
+
+        if (!isCompanyOwnsWell)
+            return Forbid();
+
+        var content = gtrRepository.GetLastDataByRecordId(idWell, idRecord);
+
+        return Ok(content);
+    }
+
+    /// <summary>
+    /// Метод для получения WITS записи от панели оператора.
+    /// Сохраняет в БД.        
+    /// </summary>
+    /// <param name="uid">уникальный идентификатор телеметрии</param>
+    /// <param name="dtos">WITS запись</param>        
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPost("{uid}")]
+    public async Task<IActionResult> PostDataAsync(
+        string uid,
+        [FromBody] IEnumerable<WitsRecordDto> dtos,
+        CancellationToken token)
+    {
+        var telemetry = telemetryService.GetOrCreateTelemetryByUid(uid);
+        await gtrRepository.SaveDataAsync(telemetry.Id, dtos, token).ConfigureAwait(false);
+        var idWell = telemetryService.GetIdWellByTelemetryUid(uid);
+        if (idWell is not null && dtos is not null)
+            _ = Task.Run(() => telemetryHubContext.Clients.Group($"well_{idWell}_gtr")
+                  .SendAsync(SignalRMethodGetDataName, dtos), CancellationToken.None);
+        return Ok();
+    }
+    
+    private async Task AssertUserHasAccessToWellAsync(int idWell, CancellationToken token)
+    {
+        var idUser = User.GetUserId();
+        var idCompany = User.GetCompanyId();
+
+        if (!idUser.HasValue)
+            throw new ForbidException("Нет доступа к скважине");
+
+        if (!idCompany.HasValue)
+            throw new ForbidException("Нет доступа к скважине");
+
+        if (!await wellService.IsCompanyInvolvedInWellAsync(idCompany.Value, idWell, token))
+            throw new ForbidException("Нет доступа к скважине");
+    }
 }
diff --git a/AsbCloudWebApi/Controllers/SAUB/MessageController.cs b/AsbCloudWebApi/Controllers/SAUB/MessageController.cs
index 086ddd69..bc89b861 100644
--- a/AsbCloudWebApi/Controllers/SAUB/MessageController.cs
+++ b/AsbCloudWebApi/Controllers/SAUB/MessageController.cs
@@ -5,95 +5,94 @@ using Microsoft.AspNetCore.Mvc;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers.SAUB
+namespace AsbCloudWebApi.Controllers.SAUB;
+
+/// <summary>
+/// Сообщения панели бурильщика
+/// </summary>
+[Route("api/well/{idWell}/message")]
+[ApiController]
+public class MessageController : ControllerBase
 {
-    /// <summary>
-    /// Сообщения панели бурильщика
-    /// </summary>
-    [Route("api/well/{idWell}/message")]
-    [ApiController]
-    public class MessageController : ControllerBase
+    private readonly IMessageService messageService;
+    private readonly IWellService wellService;
+
+    public MessageController(IMessageService messageService, IWellService wellService)
     {
-        private readonly IMessageService messageService;
-        private readonly IWellService wellService;
+        this.messageService = messageService;
+        this.wellService = wellService;
+    }
 
-        public MessageController(IMessageService messageService, IWellService wellService)
-        {
-            this.messageService = messageService;
-            this.wellService = wellService;
-        }
+    /// <summary>
+    /// Выдает список сообщений по скважине
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="request">Параметры запроса</param>
+    /// <param name="token">Токен для отмены задачи</param>
+    /// <returns>список сообщений по скважине</returns>
+    [HttpGet]
+    [Permission]
+    [ProducesResponseType(typeof(PaginationContainer<MessageDto>), (int)System.Net.HttpStatusCode.OK)]
+    [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
+    public async Task<IActionResult> GetMessagesAsync(
+       [FromRoute] int idWell,
+       [FromQuery] MessageRequestBase request,
+       CancellationToken token)
+    {
 
-        /// <summary>
-        /// Выдает список сообщений по скважине
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="request">Параметры запроса</param>
-        /// <param name="token">Токен для отмены задачи</param>
-        /// <returns>список сообщений по скважине</returns>
-        [HttpGet]
-        [Permission]
-        [ProducesResponseType(typeof(PaginationContainer<MessageDto>), (int)System.Net.HttpStatusCode.OK)]
-        [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
-        public async Task<IActionResult> GetMessagesAsync(
-           [FromRoute] int idWell,
-           [FromQuery] MessageRequestBase request,
-           CancellationToken token)
-        {
+        if (!await UserHasAccesToWellAsync(idWell, token))
+            return Forbid();
 
-            if (!await UserHasAccesToWellAsync(idWell, token))
-                return Forbid();
+        if (request.Take > 1024)
+            return this.ValidationBadRequest(nameof(request.Take), "limit mast be less then 1024");
 
-            if (request.Take > 1024)
-                return this.ValidationBadRequest(nameof(request.Take), "limit mast be less then 1024");
+        var requestToService = new MessageRequest(request, idWell);
 
-            var requestToService = new MessageRequest(request, idWell);
+        var result = await messageService.GetMessagesAsync(
+            requestToService,
+            token)
+            .ConfigureAwait(false);
 
-            var result = await messageService.GetMessagesAsync(
-                requestToService,
-                token)
-                .ConfigureAwait(false);
+        if (result is null || result.Count == 0)
+            return NoContent();
 
-            if (result is null || result.Count == 0)
-                return NoContent();
+        return Ok(result);
+    }
 
-            return Ok(result);
-        }
+    /// <summary>
+    /// Выдает список сообщений по скважине
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="token">Токен для отмены задачи</param>
+    /// <returns>список сообщений по скважине</returns>
+    [HttpGet("datesRange")]
+    [Permission]
+    [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetMessagesDateRangeAsync(int idWell, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
 
-        /// <summary>
-        /// Выдает список сообщений по скважине
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="token">Токен для отмены задачи</param>
-        /// <returns>список сообщений по скважине</returns>
-        [HttpGet("datesRange")]
-        [Permission]
-        [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetMessagesDateRangeAsync(int idWell, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
+        if (idCompany is null)
+            return Forbid();
 
-            if (idCompany is null)
-                return Forbid();
+        bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false);
 
-            bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false);
+        if (!isCompanyOwnsWell)
+            return Forbid();
 
-            if (!isCompanyOwnsWell)
-                return Forbid();
+        var wellMessagesDatesRange = wellService.GetDatesRange(idWell);
 
-            var wellMessagesDatesRange = wellService.GetDatesRange(idWell);
+        return Ok(wellMessagesDatesRange);
+    }
 
-            return Ok(wellMessagesDatesRange);
-        }
-
-        protected async Task<bool> UserHasAccesToWellAsync(int idWell, CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
-            if (idCompany is not null &&
-                await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, token)
-                    .ConfigureAwait(false))
-                return true;
-            return false;
-        }
+    protected async Task<bool> UserHasAccesToWellAsync(int idWell, CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
+        if (idCompany is not null &&
+            await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, token)
+                .ConfigureAwait(false))
+            return true;
+        return false;
     }
 }
diff --git a/AsbCloudWebApi/Controllers/SAUB/SetpointsController.cs b/AsbCloudWebApi/Controllers/SAUB/SetpointsController.cs
index e6d82c21..09c23027 100644
--- a/AsbCloudWebApi/Controllers/SAUB/SetpointsController.cs
+++ b/AsbCloudWebApi/Controllers/SAUB/SetpointsController.cs
@@ -7,156 +7,155 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers.SAUB
+namespace AsbCloudWebApi.Controllers.SAUB;
+
+/// <summary>
+/// Рекомендация уставок бурильщику
+/// </summary>
+[ApiController]
+[Authorize]
+public class SetpointsController : ControllerBase
 {
-    /// <summary>
-    /// Рекомендация уставок бурильщику
-    /// </summary>
-    [ApiController]
-    [Authorize]
-    public class SetpointsController : ControllerBase
+    private readonly ISetpointsService setpointsService;
+    private readonly IWellService wellService;
+
+    public SetpointsController(ISetpointsService setpointsService, IWellService wellService)
     {
-        private readonly ISetpointsService setpointsService;
-        private readonly IWellService wellService;
+        this.setpointsService = setpointsService;
+        this.wellService = wellService;
+    }
 
-        public SetpointsController(ISetpointsService setpointsService, IWellService wellService)
-        {
-            this.setpointsService = setpointsService;
-            this.wellService = wellService;
-        }
+    /// <summary>
+    /// Получает список запросов на изменение уставок.
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <returns></returns>
+    [HttpGet("api/well/{idWell}/setpointsNames")]
+    [ProducesResponseType(typeof(IEnumerable<SetpointInfoDto>), (int)System.Net.HttpStatusCode.OK)]
+    [AllowAnonymous]
+    public IActionResult GetSetpointsNamesByIdWellAsync([FromRoute] int idWell)
+    {
+        var result = setpointsService.GetSetpointsNames();
+        return Ok(result);
+    }
 
-        /// <summary>
-        /// Получает список запросов на изменение уставок.
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <returns></returns>
-        [HttpGet("api/well/{idWell}/setpointsNames")]
-        [ProducesResponseType(typeof(IEnumerable<SetpointInfoDto>), (int)System.Net.HttpStatusCode.OK)]
-        [AllowAnonymous]
-        public IActionResult GetSetpointsNamesByIdWellAsync([FromRoute] int idWell)
-        {
-            var result = setpointsService.GetSetpointsNames();
-            return Ok(result);
-        }
+    /// <summary>
+    /// Добавляет запрос на изменение заданий панели оператора.
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="setpoints"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>        
+    [HttpPost("api/well/{idWell}/setpoints")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
+    public async Task<IActionResult> InsertAsync(int idWell, SetpointsRequestDto setpoints, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+        int? idUser = User.GetUserId();
 
-        /// <summary>
-        /// Добавляет запрос на изменение заданий панели оператора.
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="setpoints"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>        
-        [HttpPost("api/well/{idWell}/setpoints")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
-        public async Task<IActionResult> InsertAsync(int idWell, SetpointsRequestDto setpoints, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-            int? idUser = User.GetUserId();
+        if (idCompany is null || idUser is null)
+            return Forbid();
 
-            if (idCompany is null || idUser is null)
-                return Forbid();
+        if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-            if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false))
-                return Forbid();
+        setpoints.IdAuthor = idUser ?? -1;
+        setpoints.IdWell = idWell;
+        setpoints.IdState = 1;
 
-            setpoints.IdAuthor = idUser ?? -1;
-            setpoints.IdWell = idWell;
-            setpoints.IdState = 1;
+        if (!setpoints.Setpoints.Any())
+            return this.ValidationBadRequest(nameof(setpoints.Setpoints), "Wrong setpoints count");
 
-            if (!setpoints.Setpoints.Any())
-                return this.ValidationBadRequest(nameof(setpoints.Setpoints), "Wrong setpoints count");
+        var result = await setpointsService.InsertAsync(setpoints, token)
+            .ConfigureAwait(false);
 
-            var result = await setpointsService.InsertAsync(setpoints, token)
-                .ConfigureAwait(false);
+        return Ok(result);
+    }
 
-            return Ok(result);
-        }
+    /// <summary>
+    /// Получает список запросов на изменение уставок.
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("api/well/{idWell}/setpoints")]
+    [Permission]
+    [ProducesResponseType(typeof(IEnumerable<SetpointsRequestDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetByIdWellAsync([FromRoute] int idWell, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+        int? idUser = User.GetUserId();
 
-        /// <summary>
-        /// Получает список запросов на изменение уставок.
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("api/well/{idWell}/setpoints")]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<SetpointsRequestDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetByIdWellAsync([FromRoute] int idWell, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-            int? idUser = User.GetUserId();
+        if (idCompany is null || idUser is null)
+            return Forbid();
 
-            if (idCompany is null || idUser is null)
-                return Forbid();
+        var result = await setpointsService.GetAsync(idWell, token)
+            .ConfigureAwait(false);
 
-            var result = await setpointsService.GetAsync(idWell, token)
-                .ConfigureAwait(false);
+        return Ok(result);
+    }
 
-            return Ok(result);
-        }
+    /// <summary>
+    /// Отчет о принятии, или отклонении уставок оператором.
+    /// После уставка будет не изменяемой.
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="id"></param>
+    /// <param name="setpointsRequestDto">можно передать только новый state ex.: {state:3} - принято</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPut("api/telemetry/{uid}/setpoints/{id}")]
+    [ProducesResponseType(typeof(SetpointsRequestDto), (int)System.Net.HttpStatusCode.OK)]
+    [AllowAnonymous]
+    public async Task<IActionResult> UpdateByTelemetryUidAsync([FromRoute] string uid, int id, SetpointsRequestDto setpointsRequestDto, CancellationToken token)
+    {
+        var result = await setpointsService.UpdateStateAsync(setpointsRequestDto, token)
+            .ConfigureAwait(false);
 
-        /// <summary>
-        /// Отчет о принятии, или отклонении уставок оператором.
-        /// После уставка будет не изменяемой.
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="id"></param>
-        /// <param name="setpointsRequestDto">можно передать только новый state ex.: {state:3} - принято</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPut("api/telemetry/{uid}/setpoints/{id}")]
-        [ProducesResponseType(typeof(SetpointsRequestDto), (int)System.Net.HttpStatusCode.OK)]
-        [AllowAnonymous]
-        public async Task<IActionResult> UpdateByTelemetryUidAsync([FromRoute] string uid, int id, SetpointsRequestDto setpointsRequestDto, CancellationToken token)
-        {
-            var result = await setpointsService.UpdateStateAsync(setpointsRequestDto, token)
-                .ConfigureAwait(false);
+        return Ok(result);
+    }
 
-            return Ok(result);
-        }
+    /// <summary>
+    /// Получает запросы на изменение уставок панели.
+    /// !!SIDE EFFECT: изменяет состояние запросов уставок на отправлено, это не позволит удалить эти уставки после отправки на панель.
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("api/telemetry/{uid}/setpoints")]
+    [ProducesResponseType(typeof(IEnumerable<SetpointsRequestDto>), (int)System.Net.HttpStatusCode.OK)]
+    [AllowAnonymous]
+    public async Task<IActionResult> GetByTelemetryUidAsync([FromRoute] string uid, CancellationToken token)
+    {
+        var result = await setpointsService.GetForPanelAsync(uid, token)
+            .ConfigureAwait(false);
 
-        /// <summary>
-        /// Получает запросы на изменение уставок панели.
-        /// !!SIDE EFFECT: изменяет состояние запросов уставок на отправлено, это не позволит удалить эти уставки после отправки на панель.
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("api/telemetry/{uid}/setpoints")]
-        [ProducesResponseType(typeof(IEnumerable<SetpointsRequestDto>), (int)System.Net.HttpStatusCode.OK)]
-        [AllowAnonymous]
-        public async Task<IActionResult> GetByTelemetryUidAsync([FromRoute] string uid, CancellationToken token)
-        {
-            var result = await setpointsService.GetForPanelAsync(uid, token)
-                .ConfigureAwait(false);
+        return Ok(result);
+    }
 
-            return Ok(result);
-        }
+    /// <summary>
+    /// Пробует удалить запрос на изменение уставок. Это будет выполнено, если запрос еще не был отправлен на панель.
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="id"></param>
+    /// <param name="token"></param>
+    /// <returns>1 - удалено, 0 и меньше - не удалено</returns>
+    [HttpDelete("api/well/{idWell}/setpoints/{id}")]
+    [Permission]
+    public async Task<IActionResult> TryDeleteByIdWellAsync(int idWell, int id, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+        int? idUser = User.GetUserId();
 
-        /// <summary>
-        /// Пробует удалить запрос на изменение уставок. Это будет выполнено, если запрос еще не был отправлен на панель.
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="id"></param>
-        /// <param name="token"></param>
-        /// <returns>1 - удалено, 0 и меньше - не удалено</returns>
-        [HttpDelete("api/well/{idWell}/setpoints/{id}")]
-        [Permission]
-        public async Task<IActionResult> TryDeleteByIdWellAsync(int idWell, int id, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-            int? idUser = User.GetUserId();
+        if (idCompany is null || idUser is null)
+            return Forbid();
 
-            if (idCompany is null || idUser is null)
-                return Forbid();
+        var result = await setpointsService.TryDelete(id, token)
+            .ConfigureAwait(false);
 
-            var result = await setpointsService.TryDelete(id, token)
-                .ConfigureAwait(false);
-
-            return Ok(result);
-        }
+        return Ok(result);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/SAUB/TelemetryController.cs b/AsbCloudWebApi/Controllers/SAUB/TelemetryController.cs
index d5f1a71a..0adbba81 100644
--- a/AsbCloudWebApi/Controllers/SAUB/TelemetryController.cs
+++ b/AsbCloudWebApi/Controllers/SAUB/TelemetryController.cs
@@ -10,113 +10,112 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers.SAUB
+namespace AsbCloudWebApi.Controllers.SAUB;
+
+/// <summary>
+/// Инфо о передающих телеметрию устройствах
+/// </summary>
+[Route("api/telemetry")]
+[ApiController]
+public class TelemetryController : ControllerBase
 {
-    /// <summary>
-    /// Инфо о передающих телеметрию устройствах
-    /// </summary>
-    [Route("api/telemetry")]
-    [ApiController]
-    public class TelemetryController : ControllerBase
+    private readonly ITelemetryService telemetryService;
+    private readonly IMessageService messageService;
+    private readonly IEventService eventService;
+    private readonly ITelemetryUserService telemetryUserService;
+    private readonly IHubContext<TelemetryHub> telemetryHubContext;
+
+    public TelemetryController(
+        ITelemetryService telemetryService,
+        IMessageService messageService,
+        IEventService eventService,
+        ITelemetryUserService telemetryUserService,
+        IHubContext<TelemetryHub> telemetryHubContext)
     {
-        private readonly ITelemetryService telemetryService;
-        private readonly IMessageService messageService;
-        private readonly IEventService eventService;
-        private readonly ITelemetryUserService telemetryUserService;
-        private readonly IHubContext<TelemetryHub> telemetryHubContext;
+        this.telemetryService = telemetryService;
+        this.messageService = messageService;
+        this.eventService = eventService;
+        this.telemetryUserService = telemetryUserService;
+        this.telemetryHubContext = telemetryHubContext;
+    }
 
-        public TelemetryController(
-            ITelemetryService telemetryService,
-            IMessageService messageService,
-            IEventService eventService,
-            ITelemetryUserService telemetryUserService,
-            IHubContext<TelemetryHub> telemetryHubContext)
-        {
-            this.telemetryService = telemetryService;
-            this.messageService = messageService;
-            this.eventService = eventService;
-            this.telemetryUserService = telemetryUserService;
-            this.telemetryHubContext = telemetryHubContext;
-        }
+    /// <summary>
+    /// Информация о версиях ПО по телеметриям, данные от которых приходили не позднее From
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("Active")]
+    [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetTelemetriesInfoByLastData(CancellationToken token)
+    {
+        var from = DateTimeOffset.UtcNow.AddDays(-1);
+        var stream = await telemetryService.GetTelemetriesInfoByLastData(from, token);
+        return File(stream, "text/csv", $"Software versions by active telemetries from {from :yy-MM-dd hh-mm}.csv");
+    }
 
-        /// <summary>
-        /// Информация о версиях ПО по телеметриям, данные от которых приходили не позднее From
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("Active")]
-        [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetTelemetriesInfoByLastData(CancellationToken token)
-        {
-            var from = DateTimeOffset.UtcNow.AddDays(-1);
-            var stream = await telemetryService.GetTelemetriesInfoByLastData(from, token);
-            return File(stream, "text/csv", $"Software versions by active telemetries from {from :yy-MM-dd hh-mm}.csv");
-        }
+    /// <summary>
+    /// Принимает общую информацию по скважине
+    /// </summary>
+    /// <param name="uid">Уникальный идентификатор отправителя</param>
+    /// <param name="info">Информация об отправителе</param>
+    /// <param name="token">Токен отмены задачи</param>
+    /// <returns></returns>
+    [HttpPost("{uid}/info")]
+    public async Task<IActionResult> PostInfoAsync(string uid, [FromBody] TelemetryInfoDto info,
+        CancellationToken token)
+    {
+        await telemetryService.UpdateInfoAsync(uid, info, token).ConfigureAwait(false);
+        return Ok();
+    }
 
-        /// <summary>
-        /// Принимает общую информацию по скважине
-        /// </summary>
-        /// <param name="uid">Уникальный идентификатор отправителя</param>
-        /// <param name="info">Информация об отправителе</param>
-        /// <param name="token">Токен отмены задачи</param>
-        /// <returns></returns>
-        [HttpPost("{uid}/info")]
-        public async Task<IActionResult> PostInfoAsync(string uid, [FromBody] TelemetryInfoDto info,
-            CancellationToken token)
-        {
-            await telemetryService.UpdateInfoAsync(uid, info, token).ConfigureAwait(false);
-            return Ok();
-        }
+    /// <summary>
+    /// Принимает список новых сообщений от телеметрии
+    /// </summary>
+    /// <param name="uid">Уникальный идентификатор отправителя</param>
+    /// <param name="dtos">сообщения</param>
+    /// <param name="token">Токен для отмены задачи</param>
+    /// <returns></returns>
+    [HttpPost("{uid}/message")]
+    public async Task<IActionResult> PostMessagesAsync(string uid, [FromBody] IEnumerable<TelemetryMessageDto> dtos,
+        CancellationToken token)
+    {
+        var idWell = telemetryService.GetIdWellByTelemetryUid(uid);
+        await messageService.InsertAsync(uid, dtos, token).ConfigureAwait(false);
 
-        /// <summary>
-        /// Принимает список новых сообщений от телеметрии
-        /// </summary>
-        /// <param name="uid">Уникальный идентификатор отправителя</param>
-        /// <param name="dtos">сообщения</param>
-        /// <param name="token">Токен для отмены задачи</param>
-        /// <returns></returns>
-        [HttpPost("{uid}/message")]
-        public async Task<IActionResult> PostMessagesAsync(string uid, [FromBody] IEnumerable<TelemetryMessageDto> dtos,
-            CancellationToken token)
-        {
-            var idWell = telemetryService.GetIdWellByTelemetryUid(uid);
-            await messageService.InsertAsync(uid, dtos, token).ConfigureAwait(false);
+        if (dtos.Any())
+            await Task.Run(() => telemetryHubContext.Clients.Group($"well_{idWell}")
+            .SendAsync("ReceiveMessages", dtos), token).ConfigureAwait(false);
 
-            if (dtos.Any())
-                await Task.Run(() => telemetryHubContext.Clients.Group($"well_{idWell}")
-                .SendAsync("ReceiveMessages", dtos), token).ConfigureAwait(false);
+        return Ok();
+    }
 
-            return Ok();
-        }
+    /// <summary>
+    /// Принимает справочник событий
+    /// </summary>
+    /// <param name="uid">Уникальный идентификатор отправителя</param>
+    /// <param name="events">справочник событий</param>
+    /// <param name="token">Токен для отмены задачи</param>
+    /// <returns></returns>
+    [HttpPost("{uid}/event")]
+    public async Task<IActionResult> PostEventsAsync(string uid, [FromBody] List<EventDto> events,
+        CancellationToken token)
+    {
+        await eventService.UpsertAsync(uid, events, token)
+            .ConfigureAwait(false);
+        return Ok();
+    }
 
-        /// <summary>
-        /// Принимает справочник событий
-        /// </summary>
-        /// <param name="uid">Уникальный идентификатор отправителя</param>
-        /// <param name="events">справочник событий</param>
-        /// <param name="token">Токен для отмены задачи</param>
-        /// <returns></returns>
-        [HttpPost("{uid}/event")]
-        public async Task<IActionResult> PostEventsAsync(string uid, [FromBody] List<EventDto> events,
-            CancellationToken token)
-        {
-            await eventService.UpsertAsync(uid, events, token)
-                .ConfigureAwait(false);
-            return Ok();
-        }
-
-        /// <summary>
-        /// Принимает справочник пользователей телеметрии
-        /// </summary>
-        /// <param name="uid">Уникальный идентификатор отправителя</param>
-        /// <param name="users">справочник пользователей телеметрии</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPost("{uid}/user")]
-        public async Task<IActionResult> PostUsersAsync(string uid, [FromBody] List<TelemetryUserDto> users,
-            CancellationToken token)
-        {
-            await telemetryUserService.UpsertAsync(uid, users, token);
-            return Ok();
-        }
+    /// <summary>
+    /// Принимает справочник пользователей телеметрии
+    /// </summary>
+    /// <param name="uid">Уникальный идентификатор отправителя</param>
+    /// <param name="users">справочник пользователей телеметрии</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPost("{uid}/user")]
+    public async Task<IActionResult> PostUsersAsync(string uid, [FromBody] List<TelemetryUserDto> users,
+        CancellationToken token)
+    {
+        await telemetryUserService.UpsertAsync(uid, users, token);
+        return Ok();
     }
 }
diff --git a/AsbCloudWebApi/Controllers/SAUB/TelemetryDataBaseController.cs b/AsbCloudWebApi/Controllers/SAUB/TelemetryDataBaseController.cs
index 0b271f0b..c5c9136c 100644
--- a/AsbCloudWebApi/Controllers/SAUB/TelemetryDataBaseController.cs
+++ b/AsbCloudWebApi/Controllers/SAUB/TelemetryDataBaseController.cs
@@ -13,191 +13,190 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers.SAUB
+namespace AsbCloudWebApi.Controllers.SAUB;
+
+[ApiController]
+[Authorize]
+[Route("api/[controller]")]
+public abstract class TelemetryDataBaseController<TDto> : ControllerBase
+    where TDto : ITelemetryData
 {
-    [ApiController]
-    [Authorize]
-    [Route("api/[controller]")]
-    public abstract class TelemetryDataBaseController<TDto> : ControllerBase
-        where TDto : ITelemetryData
+    protected readonly IWellService wellService;
+    private readonly ITelemetryService telemetryService;
+    private readonly ITelemetryDataService<TDto> telemetryDataService;
+    protected readonly IHubContext<TelemetryHub, ITelemetryHubClient> telemetryHubContext;
+
+    public TelemetryDataBaseController(
+        ITelemetryService telemetryService,
+        ITelemetryDataService<TDto> telemetryDataService,
+        IWellService wellService,
+        IHubContext<TelemetryHub, ITelemetryHubClient> telemetryHubContext)
     {
-        protected readonly IWellService wellService;
-        private readonly ITelemetryService telemetryService;
-        private readonly ITelemetryDataService<TDto> telemetryDataService;
-        protected readonly IHubContext<TelemetryHub, ITelemetryHubClient> telemetryHubContext;
+        this.telemetryService = telemetryService;
+        this.telemetryDataService = telemetryDataService;
+        this.wellService = wellService;
+        this.telemetryHubContext = telemetryHubContext;
 
-        public TelemetryDataBaseController(
-            ITelemetryService telemetryService,
-            ITelemetryDataService<TDto> telemetryDataService,
-            IWellService wellService,
-            IHubContext<TelemetryHub, ITelemetryHubClient> telemetryHubContext)
+    }
+
+    protected abstract Task SignalRNotifyAsync(int idWell, IEnumerable<TDto> dtos, CancellationToken token);
+
+    /// <summary>
+    /// Принимает данные от разных систем по скважине
+    /// </summary>
+    /// <param name="uid">Уникальный идентификатор отправителя</param>
+    /// <param name="dtos">Данные</param>
+    /// <param name="token">Токен для отмены задачи</param>
+    /// <returns></returns>
+    [HttpPost("{uid}")]
+    [AllowAnonymous]
+    public virtual async Task<IActionResult> PostDataAsync(string uid, [FromBody] IEnumerable<TDto> dtos,
+        CancellationToken token)
+    {
+        await telemetryDataService.UpdateDataAsync(uid, dtos, token).ConfigureAwait(false);
+
+        var idWell = telemetryService.GetIdWellByTelemetryUid(uid);
+        if (idWell is not null && dtos.Any())
+            _ = Task.Run(() => SignalRNotifyAsync(idWell.Value, dtos, CancellationToken.None));
+
+        return Ok();
+    }
+
+    /// <summary>
+    /// Возвращает данные САУБ по скважине.
+    /// По умолчанию за последние 10 минут.
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="begin">дата начала выборки. По умолчанию: текущее время - intervalSec</param>
+    /// <param name="intervalSec">интервал времени даты начала выборки, секунды</param>
+    /// <param name="approxPointsCount">желаемое количество точек. Если в выборке точек будет больше, то выборка будет прорежена.</param>
+    /// <param name="token">Токен завершения задачи</param>
+    /// <returns></returns>
+    [HttpGet("{idWell}")]
+    [Permission]
+    public virtual async Task<ActionResult<IEnumerable<TDto>>> GetDataAsync(int idWell,
+        DateTime begin = default,
+        int intervalSec = 600,
+        int approxPointsCount = 1024,
+        //TODO: сделать cancellationToken обязательным 
+        CancellationToken token = default)
+    {
+        int? idCompany = User.GetCompanyId();
+
+        if (idCompany is null)
+            return Forbid();
+
+        bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false);
+
+        if (!isCompanyOwnsWell)
+            return Forbid();
+
+        var content = await telemetryDataService.GetByWellAsync(idWell, begin,
+            intervalSec, approxPointsCount, token).ConfigureAwait(false);
+
+        return Ok(content);
+    }
+
+    /// <summary>
+    /// Новая версия. Возвращает данные САУБ по скважине.
+    /// По умолчанию за последние 10 минут.
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="request"></param>
+    /// <param name="token">Токен завершения задачи</param>
+    /// <returns></returns>
+    [HttpGet("{idWell}/data")]
+    [Permission]
+    public virtual async Task<ActionResult<IEnumerable<TDto>>> GetData2Async(int idWell,
+        [FromQuery]TelemetryDataRequest request,
+        CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+
+        if (idCompany is null)
+            return Forbid();
+
+        bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false);
+
+        if (!isCompanyOwnsWell)
+            return Forbid();
+
+        var content = await telemetryDataService.GetByWellAsync(idWell, request, token);
+
+        return Ok(content);
+    }
+
+    /// <summary>
+    /// Возвращает диапазон дат за которые есть телеметрия за период времени
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="geDate"></param>
+    /// <param name="leDate"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("{idWell}/dateRange")]
+    [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)]
+    [ProducesResponseType((int)System.Net.HttpStatusCode.NotFound)]
+    [ProducesResponseType((int)System.Net.HttpStatusCode.NoContent)]
+    public virtual async Task<ActionResult<DatesRangeDto?>> GetRangeAsync(
+        [FromRoute] int idWell,
+        [Required] DateTimeOffset geDate,
+        DateTimeOffset? leDate,
+        CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+
+        if (idCompany is null)
+            return Forbid();
+
+        bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false);
+
+        if (!isCompanyOwnsWell)
+            return Forbid();
+
+        var content = await telemetryDataService.GetRangeAsync(idWell, geDate, leDate, token);
+
+        if (content is null)
+            return NoContent();
+
+        return Ok(content);
+    }
+
+    /// <summary>
+    /// Возвращает диапазон дат сохраненных данных.
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="token">Токен завершения задачи</param>
+    /// <returns></returns>
+    [HttpGet("{idWell}/datesRange")]
+    [Permission]
+    [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)]
+    [ProducesResponseType((int)System.Net.HttpStatusCode.NotFound)]
+    [ProducesResponseType((int)System.Net.HttpStatusCode.NoContent)]
+    public virtual async Task<ActionResult<DatesRangeDto?>> GetDataDatesRangeAsync(int idWell,
+        CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+
+        if (idCompany is null)
+            return Forbid();
+
+        bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false);
+
+        if (!isCompanyOwnsWell)
+            return Forbid();
+        try
         {
-            this.telemetryService = telemetryService;
-            this.telemetryDataService = telemetryDataService;
-            this.wellService = wellService;
-            this.telemetryHubContext = telemetryHubContext;
-
+            var dataDatesRange = wellService.GetDatesRange(idWell);
+            return Ok(dataDatesRange);
         }
-
-        protected abstract Task SignalRNotifyAsync(int idWell, IEnumerable<TDto> dtos, CancellationToken token);
-
-        /// <summary>
-        /// Принимает данные от разных систем по скважине
-        /// </summary>
-        /// <param name="uid">Уникальный идентификатор отправителя</param>
-        /// <param name="dtos">Данные</param>
-        /// <param name="token">Токен для отмены задачи</param>
-        /// <returns></returns>
-        [HttpPost("{uid}")]
-        [AllowAnonymous]
-        public virtual async Task<IActionResult> PostDataAsync(string uid, [FromBody] IEnumerable<TDto> dtos,
-            CancellationToken token)
+        catch(KeyNotFoundException)
         {
-            await telemetryDataService.UpdateDataAsync(uid, dtos, token).ConfigureAwait(false);
-
-            var idWell = telemetryService.GetIdWellByTelemetryUid(uid);
-            if (idWell is not null && dtos.Any())
-                _ = Task.Run(() => SignalRNotifyAsync(idWell.Value, dtos, CancellationToken.None));
-
-            return Ok();
-        }
-
-        /// <summary>
-        /// Возвращает данные САУБ по скважине.
-        /// По умолчанию за последние 10 минут.
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="begin">дата начала выборки. По умолчанию: текущее время - intervalSec</param>
-        /// <param name="intervalSec">интервал времени даты начала выборки, секунды</param>
-        /// <param name="approxPointsCount">желаемое количество точек. Если в выборке точек будет больше, то выборка будет прорежена.</param>
-        /// <param name="token">Токен завершения задачи</param>
-        /// <returns></returns>
-        [HttpGet("{idWell}")]
-        [Permission]
-        public virtual async Task<ActionResult<IEnumerable<TDto>>> GetDataAsync(int idWell,
-            DateTime begin = default,
-            int intervalSec = 600,
-            int approxPointsCount = 1024,
-            //TODO: сделать cancellationToken обязательным 
-            CancellationToken token = default)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false);
-
-            if (!isCompanyOwnsWell)
-                return Forbid();
-
-            var content = await telemetryDataService.GetByWellAsync(idWell, begin,
-                intervalSec, approxPointsCount, token).ConfigureAwait(false);
-
-            return Ok(content);
-        }
-
-        /// <summary>
-        /// Новая версия. Возвращает данные САУБ по скважине.
-        /// По умолчанию за последние 10 минут.
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="request"></param>
-        /// <param name="token">Токен завершения задачи</param>
-        /// <returns></returns>
-        [HttpGet("{idWell}/data")]
-        [Permission]
-        public virtual async Task<ActionResult<IEnumerable<TDto>>> GetData2Async(int idWell,
-            [FromQuery]TelemetryDataRequest request,
-            CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false);
-
-            if (!isCompanyOwnsWell)
-                return Forbid();
-
-            var content = await telemetryDataService.GetByWellAsync(idWell, request, token);
-
-            return Ok(content);
-        }
-
-        /// <summary>
-        /// Возвращает диапазон дат за которые есть телеметрия за период времени
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="geDate"></param>
-        /// <param name="leDate"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("{idWell}/dateRange")]
-        [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)]
-        [ProducesResponseType((int)System.Net.HttpStatusCode.NotFound)]
-        [ProducesResponseType((int)System.Net.HttpStatusCode.NoContent)]
-        public virtual async Task<ActionResult<DatesRangeDto?>> GetRangeAsync(
-            [FromRoute] int idWell,
-            [Required] DateTimeOffset geDate,
-            DateTimeOffset? leDate,
-            CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false);
-
-            if (!isCompanyOwnsWell)
-                return Forbid();
-
-            var content = await telemetryDataService.GetRangeAsync(idWell, geDate, leDate, token);
-
-            if (content is null)
-                return NoContent();
-
-            return Ok(content);
-        }
-
-        /// <summary>
-        /// Возвращает диапазон дат сохраненных данных.
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="token">Токен завершения задачи</param>
-        /// <returns></returns>
-        [HttpGet("{idWell}/datesRange")]
-        [Permission]
-        [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)]
-        [ProducesResponseType((int)System.Net.HttpStatusCode.NotFound)]
-        [ProducesResponseType((int)System.Net.HttpStatusCode.NoContent)]
-        public virtual async Task<ActionResult<DatesRangeDto?>> GetDataDatesRangeAsync(int idWell,
-            CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false);
-
-            if (!isCompanyOwnsWell)
-                return Forbid();
-            try
-            {
-                var dataDatesRange = wellService.GetDatesRange(idWell);
-                return Ok(dataDatesRange);
-            }
-            catch(KeyNotFoundException)
-            {
-                return NoContent();
-            }
+            return NoContent();
         }
     }
 }
diff --git a/AsbCloudWebApi/Controllers/SAUB/TelemetryDataSaubController.cs b/AsbCloudWebApi/Controllers/SAUB/TelemetryDataSaubController.cs
index d760efab..a873c49b 100644
--- a/AsbCloudWebApi/Controllers/SAUB/TelemetryDataSaubController.cs
+++ b/AsbCloudWebApi/Controllers/SAUB/TelemetryDataSaubController.cs
@@ -10,63 +10,62 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers.SAUB
+namespace AsbCloudWebApi.Controllers.SAUB;
+
+/// <summary>
+/// Данные АКБ
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public class TelemetryDataSaubController : TelemetryDataBaseController<TelemetryDataSaubDto>
 {
-    /// <summary>
-    /// Данные АКБ
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    public class TelemetryDataSaubController : TelemetryDataBaseController<TelemetryDataSaubDto>
+    private readonly ITelemetryDataSaubService telemetryDataSaubService;
+
+    public TelemetryDataSaubController(
+        ITelemetryService telemetryService,
+        ITelemetryDataSaubService telemetryDataService,
+        IWellService wellService,
+        IHubContext<TelemetryHub, ITelemetryHubClient> telemetryHubContext)
+        : base(
+              telemetryService,
+              telemetryDataService,
+              wellService,
+              telemetryHubContext)
     {
-        private readonly ITelemetryDataSaubService telemetryDataSaubService;
+        telemetryDataSaubService = telemetryDataService;
+    }
 
-        public TelemetryDataSaubController(
-            ITelemetryService telemetryService,
-            ITelemetryDataSaubService telemetryDataService,
-            IWellService wellService,
-            IHubContext<TelemetryHub, ITelemetryHubClient> telemetryHubContext)
-            : base(
-                  telemetryService,
-                  telemetryDataService,
-                  wellService,
-                  telemetryHubContext)
-        {
-            telemetryDataSaubService = telemetryDataService;
-        }
+    /// <summary>
+    /// Выгрузка архива. Не более 3-х суток. Формат даты строгий.
+    /// </summary>
+    /// <param name="idWell">id скважины (из адресной строки)</param>
+    /// <param name="beginDate">начало интервала в формате: yyyy-MM-DD HH:mm</param>
+    /// <param name="endDate">конец интервала в формате: yyyy-MM-DD HH:mm</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("{idWell}/export/csv")]
+    [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    public async Task<IActionResult> GetZippedCsv(int idWell, DateTime beginDate, DateTime endDate, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
 
-        /// <summary>
-        /// Выгрузка архива. Не более 3-х суток. Формат даты строгий.
-        /// </summary>
-        /// <param name="idWell">id скважины (из адресной строки)</param>
-        /// <param name="beginDate">начало интервала в формате: yyyy-MM-DD HH:mm</param>
-        /// <param name="endDate">конец интервала в формате: yyyy-MM-DD HH:mm</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("{idWell}/export/csv")]
-        [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")]
-        [ProducesResponseType(StatusCodes.Status204NoContent)]
-        public async Task<IActionResult> GetZippedCsv(int idWell, DateTime beginDate, DateTime endDate, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
+        if (idCompany is null)
+            return Forbid();
 
-            if (idCompany is null)
-                return Forbid();
+        bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false);
 
-            bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false);
+        if (!isCompanyOwnsWell)
+            return Forbid();
 
-            if (!isCompanyOwnsWell)
-                return Forbid();
+        var stream = await telemetryDataSaubService.GetZippedCsv(idWell, beginDate, endDate, token).ConfigureAwait(false);
+        var fileName = $"DataSaub idWell{idWell} {beginDate:yyyy-MM-DDTHH-mm} - {endDate:yyyy-MM-DDTHH-mm}.zip";
+        return File(stream, "application/octet-stream", fileName);
+    }
 
-            var stream = await telemetryDataSaubService.GetZippedCsv(idWell, beginDate, endDate, token).ConfigureAwait(false);
-            var fileName = $"DataSaub idWell{idWell} {beginDate:yyyy-MM-DDTHH-mm} - {endDate:yyyy-MM-DDTHH-mm}.zip";
-            return File(stream, "application/octet-stream", fileName);
-        }
-
-        protected override Task SignalRNotifyAsync(int idWell, IEnumerable<TelemetryDataSaubDto> dtos, CancellationToken token)
-        {
-            return telemetryHubContext.Clients.Group($"well_{idWell}").ReceiveDataSaub(dtos, token);
-        }
+    protected override Task SignalRNotifyAsync(int idWell, IEnumerable<TelemetryDataSaubDto> dtos, CancellationToken token)
+    {
+        return telemetryHubContext.Clients.Group($"well_{idWell}").ReceiveDataSaub(dtos, token);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/SAUB/TelemetryDataSpinController.cs b/AsbCloudWebApi/Controllers/SAUB/TelemetryDataSpinController.cs
index 0ff369da..dd7cb2de 100644
--- a/AsbCloudWebApi/Controllers/SAUB/TelemetryDataSpinController.cs
+++ b/AsbCloudWebApi/Controllers/SAUB/TelemetryDataSpinController.cs
@@ -8,30 +8,29 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers.SAUB
-{
-    /// <summary>
-    /// Данные осциллятора и демпфера
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    public class TelemetryDataSpinController : TelemetryDataBaseController<TelemetryDataSpinDto>
-    {
-        public TelemetryDataSpinController(
-            ITelemetryService telemetryService,
-            ITelemetryDataService<TelemetryDataSpinDto> telemetryDataService,
-            IWellService wellService,
-            IHubContext<TelemetryHub, ITelemetryHubClient> telemetryHubContext)
-            : base(
-                  telemetryService,
-                  telemetryDataService,
-                  wellService,
-                  telemetryHubContext)
-        {}
+namespace AsbCloudWebApi.Controllers.SAUB;
 
-        protected override Task SignalRNotifyAsync(int idWell, IEnumerable<TelemetryDataSpinDto> dtos, CancellationToken token)
-        {
-            return telemetryHubContext.Clients.Group($"well_{idWell}").ReceiveDataSpin(dtos, token);
-        }
+/// <summary>
+/// Данные осциллятора и демпфера
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public class TelemetryDataSpinController : TelemetryDataBaseController<TelemetryDataSpinDto>
+{
+    public TelemetryDataSpinController(
+        ITelemetryService telemetryService,
+        ITelemetryDataService<TelemetryDataSpinDto> telemetryDataService,
+        IWellService wellService,
+        IHubContext<TelemetryHub, ITelemetryHubClient> telemetryHubContext)
+        : base(
+              telemetryService,
+              telemetryDataService,
+              wellService,
+              telemetryHubContext)
+    {}
+
+    protected override Task SignalRNotifyAsync(int idWell, IEnumerable<TelemetryDataSpinDto> dtos, CancellationToken token)
+    {
+        return telemetryHubContext.Clients.Group($"well_{idWell}").ReceiveDataSpin(dtos, token);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/SAUB/TelemetryWirelineRunOutController.cs b/AsbCloudWebApi/Controllers/SAUB/TelemetryWirelineRunOutController.cs
index 719190a7..2930f054 100644
--- a/AsbCloudWebApi/Controllers/SAUB/TelemetryWirelineRunOutController.cs
+++ b/AsbCloudWebApi/Controllers/SAUB/TelemetryWirelineRunOutController.cs
@@ -10,104 +10,101 @@ using System.Threading;
 using AsbCloudApp.Repositories;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudWebApi.Controllers.SAUB
+namespace AsbCloudWebApi.Controllers.SAUB;
+
+
+/// <summary>
+/// Наработка талевого каната
+/// </summary>
+[ApiController]
+[Authorize]
+[Route("api/[controller]")]
+public class TelemetryWirelineRunOutController : ControllerBase
 {
+    private readonly ITelemetryService telemetryService;
+    private readonly IWellService wellService;
+    private readonly IHubContext<TelemetryHub> telemetryHubContext;
+    private readonly ITelemetryWirelineRunOutRepository repository;
+    private static string SirnalRMethodGetDataName => "ReceiveWirelineRunOut";
 
-    /// <summary>
-    /// Наработка талевого каната
-    /// </summary>
-    [ApiController]
-    [Authorize]
-    [Route("api/[controller]")]
-    public class TelemetryWirelineRunOutController : ControllerBase
+    public TelemetryWirelineRunOutController(
+        ITelemetryService telemetryService,
+        IWellService wellService,
+        IHubContext<TelemetryHub> telemetryHubContext,
+        ITelemetryWirelineRunOutRepository repository)
     {
-        private readonly ITelemetryService telemetryService;
-        private readonly IWellService wellService;
-        private readonly IHubContext<TelemetryHub> telemetryHubContext;
-        private readonly ITelemetryWirelineRunOutRepository repository;
-        private static string SirnalRMethodGetDataName => "ReceiveWirelineRunOut";
-
-        public TelemetryWirelineRunOutController(
-            ITelemetryService telemetryService,
-            IWellService wellService,
-            IHubContext<TelemetryHub> telemetryHubContext,
-            ITelemetryWirelineRunOutRepository repository)
-        {
-            this.telemetryService = telemetryService;
-            this.wellService = wellService;
-            this.telemetryHubContext = telemetryHubContext;
-            this.repository = repository;
-        }
-
-        /// <summary>
-        /// Принимает данные от панели
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="dto"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPost("{uid}")]
-        [AllowAnonymous]
-        public async Task<IActionResult> PostDataAsync(string uid, [FromBody, Required] TelemetryWirelineRunOutBaseDto dto, CancellationToken token)
-        {
-            var data = await repository.AddOrUpdateAsync(uid, dto, token);
-
-            var idWell = telemetryService.GetIdWellByTelemetryUid(uid);
-            if (idWell is not null)
-                _ = Task.Run(async () =>
-                {
-                    var clients = telemetryHubContext.Clients.Group($"well_{idWell}");
-                    await clients.SendAsync(SirnalRMethodGetDataName, dto);
-                }, CancellationToken.None);
-
-            return Ok();
-        }
-
-        /// <summary>
-        /// Выдает данные по скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("{idWell}")]
-        [Permission]
-        public async Task<ActionResult<TelemetryWirelineRunOutDto>> GetDataAsync(int idWell, CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false);
-
-            if (!isCompanyOwnsWell)
-                return Forbid();
-
-            var dto = await repository.GetOrDefaultAsync(idWell, token);
-
-            if (dto is null)
-                return NoContent();
-            return Ok(dto);
-        }
-
-        /// <summary>
-        /// Выдает данные по всем доступным скважинам
-        /// </summary>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Permission]
-        public async Task<ActionResult<IEnumerable<TelemetryWirelineRunOutDto>>> GetAllAsync(CancellationToken token)
-        {
-            int? idCompany = User.GetCompanyId();
-            if (idCompany is null)
-                return Forbid();
-
-            var dtos = await repository.GetAllAsync((int)idCompany, token);
-            return Ok(dtos);
-        }
+        this.telemetryService = telemetryService;
+        this.wellService = wellService;
+        this.telemetryHubContext = telemetryHubContext;
+        this.repository = repository;
     }
 
+    /// <summary>
+    /// Принимает данные от панели
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="dto"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPost("{uid}")]
+    [AllowAnonymous]
+    public async Task<IActionResult> PostDataAsync(string uid, [FromBody, Required] TelemetryWirelineRunOutBaseDto dto, CancellationToken token)
+    {
+        var data = await repository.AddOrUpdateAsync(uid, dto, token);
 
+        var idWell = telemetryService.GetIdWellByTelemetryUid(uid);
+        if (idWell is not null)
+            _ = Task.Run(async () =>
+            {
+                var clients = telemetryHubContext.Clients.Group($"well_{idWell}");
+                await clients.SendAsync(SirnalRMethodGetDataName, dto);
+            }, CancellationToken.None);
+
+        return Ok();
+    }
+
+    /// <summary>
+    /// Выдает данные по скважине
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("{idWell}")]
+    [Permission]
+    public async Task<ActionResult<TelemetryWirelineRunOutDto>> GetDataAsync(int idWell, CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+
+        if (idCompany is null)
+            return Forbid();
+
+        bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false);
+
+        if (!isCompanyOwnsWell)
+            return Forbid();
+
+        var dto = await repository.GetOrDefaultAsync(idWell, token);
+
+        if (dto is null)
+            return NoContent();
+        return Ok(dto);
+    }
+
+    /// <summary>
+    /// Выдает данные по всем доступным скважинам
+    /// </summary>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet]
+    [Permission]
+    public async Task<ActionResult<IEnumerable<TelemetryWirelineRunOutDto>>> GetAllAsync(CancellationToken token)
+    {
+        int? idCompany = User.GetCompanyId();
+        if (idCompany is null)
+            return Forbid();
+
+        var dtos = await repository.GetAllAsync((int)idCompany, token);
+        return Ok(dtos);
+    }
 }
diff --git a/AsbCloudWebApi/Controllers/ScheduleController.cs b/AsbCloudWebApi/Controllers/ScheduleController.cs
index 6effe4e6..459fc608 100644
--- a/AsbCloudWebApi/Controllers/ScheduleController.cs
+++ b/AsbCloudWebApi/Controllers/ScheduleController.cs
@@ -6,41 +6,40 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+
+/// <summary>
+/// Расписание бурильщиков
+/// </summary>
+[Route("api/schedule")]
+[ApiController]
+[Authorize]
+public class ScheduleController : CrudWellRelatedController<ScheduleDto, IScheduleRepository>
 {
+    private readonly IScheduleRepository scheduleService;
+
+    public ScheduleController(IScheduleRepository scheduleService, IWellService wellService)
+        : base(wellService, scheduleService)
+    {
+        this.scheduleService = service;
+    }
 
     /// <summary>
-    /// Расписание бурильщиков
+    /// Получить бурильщика работавшего на скважине в определенное время.
     /// </summary>
-    [Route("api/schedule")]
-    [ApiController]
-    [Authorize]
-    public class ScheduleController : CrudWellRelatedController<ScheduleDto, IScheduleRepository>
+    /// <param name="idWell">Идентификатор скважины</param>
+    /// <param name="workTime">Рабочее время</param>
+    /// <param name="token"></param>
+    /// <returns>бурильщик</returns>
+    [HttpGet("driller")]
+    public async Task<ActionResult<DrillerDto?>> GetDrillerAsync(int idWell, DateTimeOffset workTime, CancellationToken token)
     {
-        private readonly IScheduleRepository scheduleService;
-
-        public ScheduleController(IScheduleRepository scheduleService, IWellService wellService)
-            : base(wellService, scheduleService)
-        {
-            this.scheduleService = service;
-        }
-
-        /// <summary>
-        /// Получить бурильщика работавшего на скважине в определенное время.
-        /// </summary>
-        /// <param name="idWell">Идентификатор скважины</param>
-        /// <param name="workTime">Рабочее время</param>
-        /// <param name="token"></param>
-        /// <returns>бурильщик</returns>
-        [HttpGet("driller")]
-        public async Task<ActionResult<DrillerDto?>> GetDrillerAsync(int idWell, DateTimeOffset workTime, CancellationToken token)
-        {
-            if (!await UserHasAccesToWellAsync(idWell, token))
-                return Forbid();
-
-            var result = await scheduleService.GetOrDefaultDrillerAsync(idWell, workTime, token);
-            return Ok(result);
-        }
+        if (!await UserHasAccesToWellAsync(idWell, token))
+            return Forbid();
 
+        var result = await scheduleService.GetOrDefaultDrillerAsync(idWell, workTime, token);
+        return Ok(result);
     }
+
 }
diff --git a/AsbCloudWebApi/Controllers/SlipsStatController.cs b/AsbCloudWebApi/Controllers/SlipsStatController.cs
index 6c61c0e3..e167f951 100644
--- a/AsbCloudWebApi/Controllers/SlipsStatController.cs
+++ b/AsbCloudWebApi/Controllers/SlipsStatController.cs
@@ -10,43 +10,42 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Аналитика по удержанию в клиньях
+/// </summary>
+[Route("api/slipsStat")]
+[ApiController]
+[Authorize]
+public class SlipsStatController : ControllerBase
 {
-    /// <summary>
-    /// Аналитика по удержанию в клиньях
-    /// </summary>
-    [Route("api/slipsStat")]
-    [ApiController]
-    [Authorize]
-    public class SlipsStatController : ControllerBase
+    private readonly ISlipsStatService slipsAnalyticsService;
+
+    public SlipsStatController(ISlipsStatService slipsAnalyticsService)
     {
-        private readonly ISlipsStatService slipsAnalyticsService;
+        this.slipsAnalyticsService = slipsAnalyticsService;
+    }
 
-        public SlipsStatController(ISlipsStatService slipsAnalyticsService)
-        {
-            this.slipsAnalyticsService = slipsAnalyticsService;
-        }
+    /// <summary>
+    /// Получить аналитику по удержанию в клиньях (по бурильщикам)
+    /// </summary>
+    /// <param name="request">Параметры запроса</param>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns>Список бурильщиков</returns>
+    [HttpGet]
+    [ProducesResponseType(typeof(IEnumerable<SlipsStatDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetAllAsync(
+        [FromQuery] OperationStatRequest request, 
+        CancellationToken token)
+    {
+        var idUser = User.GetUserId();
 
-        /// <summary>
-        /// Получить аналитику по удержанию в клиньях (по бурильщикам)
-        /// </summary>
-        /// <param name="request">Параметры запроса</param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns>Список бурильщиков</returns>
-        [HttpGet]
-        [ProducesResponseType(typeof(IEnumerable<SlipsStatDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetAllAsync(
-            [FromQuery] OperationStatRequest request, 
-            CancellationToken token)
-        {
-            var idUser = User.GetUserId();
+        if (!idUser.HasValue)
+            throw new ForbidException("Не удается вас опознать");
 
-            if (!idUser.HasValue)
-                throw new ForbidException("Не удается вас опознать");
-
-            var data = await slipsAnalyticsService.GetAllAsync(request, token).ConfigureAwait(false);
-            return Ok(data);
-        }
+        var data = await slipsAnalyticsService.GetAllAsync(request, token).ConfigureAwait(false);
+        return Ok(data);
     }
 }
 
diff --git a/AsbCloudWebApi/Controllers/Subsystems/AdminSubsystemController.cs b/AsbCloudWebApi/Controllers/Subsystems/AdminSubsystemController.cs
index 8872df9f..53a2cb11 100644
--- a/AsbCloudWebApi/Controllers/Subsystems/AdminSubsystemController.cs
+++ b/AsbCloudWebApi/Controllers/Subsystems/AdminSubsystemController.cs
@@ -4,20 +4,19 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
-namespace AsbCloudWebApi.Controllers.Subsystems
-{
-    /// <summary>
-    /// Редактор подсистем для админки
-    /// </summary>
-    [Route("api/admin/subsystem")]
-    [ApiController]
-    [Authorize]
-    public class AdminSubsystemController : CrudController<SubsystemDto, ICrudRepository<SubsystemDto>>
-    {
-        public AdminSubsystemController(ICrudRepository<SubsystemDto> service)
-            : base(service)
-        {
-        }
-    }   
-}
+namespace AsbCloudWebApi.Controllers.Subsystems;
+
+/// <summary>
+/// Редактор подсистем для админки
+/// </summary>
+[Route("api/admin/subsystem")]
+[ApiController]
+[Authorize]
+public class AdminSubsystemController : CrudController<SubsystemDto, ICrudRepository<SubsystemDto>>
+{
+    public AdminSubsystemController(ICrudRepository<SubsystemDto> service)
+        : base(service)
+    {
+    }
+}   
 
diff --git a/AsbCloudWebApi/Controllers/Subsystems/SubsystemController.cs b/AsbCloudWebApi/Controllers/Subsystems/SubsystemController.cs
index 8a5b2801..b4402ca6 100644
--- a/AsbCloudWebApi/Controllers/Subsystems/SubsystemController.cs
+++ b/AsbCloudWebApi/Controllers/Subsystems/SubsystemController.cs
@@ -10,84 +10,83 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers.Subsystems
+namespace AsbCloudWebApi.Controllers.Subsystems;
+
+/// <summary>
+///  Наработка подсистем
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+[Authorize]
+public class SubsystemController : ControllerBase
 {
-    /// <summary>
-    ///  Наработка подсистем
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    [Authorize]
-    public class SubsystemController : ControllerBase
+    private readonly ISubsystemService subsystemService;
+    private readonly ITelemetryDataSaubService telemetryDataSaubService;
+    private readonly IWellService wellService;
+
+    public SubsystemController(
+        ISubsystemService subsystemService,
+        IWellService wellService,
+        ITelemetryDataSaubService telemetryDataSaubService)
     {
-        private readonly ISubsystemService subsystemService;
-        private readonly ITelemetryDataSaubService telemetryDataSaubService;
-        private readonly IWellService wellService;
+        this.subsystemService = subsystemService;
+        this.wellService = wellService;
+        this.telemetryDataSaubService = telemetryDataSaubService;
+    }
 
-        public SubsystemController(
-            ISubsystemService subsystemService,
-            IWellService wellService,
-            ITelemetryDataSaubService telemetryDataSaubService)
-        {
-            this.subsystemService = subsystemService;
-            this.wellService = wellService;
-            this.telemetryDataSaubService = telemetryDataSaubService;
-        }
+    /// <summary>
+    /// получить статистику  
+    /// </summary>
+    [HttpGet("stat")]
+    [ProducesResponseType(typeof(IEnumerable<SubsystemStatDto>), (int)System.Net.HttpStatusCode.OK)]
+    [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
+    public async Task<IActionResult> GetStatAsync([FromQuery] SubsystemRequest request, CancellationToken token)
+    {
+        if (!await UserHasAccessToWellAsync(request.IdWell, token))
+            return Forbid();
+        var subsystemResult = await subsystemService.GetStatAsync(request, token);
+        return Ok(subsystemResult);
+    }
 
-        /// <summary>
-        /// получить статистику  
-        /// </summary>
-        [HttpGet("stat")]
-        [ProducesResponseType(typeof(IEnumerable<SubsystemStatDto>), (int)System.Net.HttpStatusCode.OK)]
-        [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
-        public async Task<IActionResult> GetStatAsync([FromQuery] SubsystemRequest request, CancellationToken token)
-        {
-            if (!await UserHasAccessToWellAsync(request.IdWell, token))
-                return Forbid();
-            var subsystemResult = await subsystemService.GetStatAsync(request, token);
-            return Ok(subsystemResult);
-        }
+    /// <summary>
+    /// получить период, за который будет рассчитываться статистика
+    /// </summary>
+    [HttpGet("operationsPeriod/{idWell}")]
+    [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetStatDateRangeAsync([FromRoute] int idWell, CancellationToken token)
+    {
+        if (!await UserHasAccessToWellAsync(idWell, token))
+            return Forbid();
 
-        /// <summary>
-        /// получить период, за который будет рассчитываться статистика
-        /// </summary>
-        [HttpGet("operationsPeriod/{idWell}")]
-        [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetStatDateRangeAsync([FromRoute] int idWell, CancellationToken token)
-        {
+        var dateRange = telemetryDataSaubService.GetRange(idWell);
+
+        return Ok(dateRange);
+    }
+
+    [HttpGet("drillerDetectedOperationStat")]
+    [ProducesResponseType(typeof(IEnumerable<DrillerDetectedOperationStatDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetByWellsAsync([FromQuery] GetStatRequest request,
+        CancellationToken token)
+    {
+        if (!request.IdsWells.Any())
+            return NoContent();
+
+        foreach(var idWell in request.IdsWells)
             if (!await UserHasAccessToWellAsync(idWell, token))
                 return Forbid();
 
-            var dateRange = telemetryDataSaubService.GetRange(idWell);
+        var result = await subsystemService.GetByWellsAsync(request, token);
 
-            return Ok(dateRange);
-        }
+        return Ok(result);
+    }
 
-        [HttpGet("drillerDetectedOperationStat")]
-        [ProducesResponseType(typeof(IEnumerable<DrillerDetectedOperationStatDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetByWellsAsync([FromQuery] GetStatRequest request,
-            CancellationToken token)
-        {
-            if (!request.IdsWells.Any())
-                return NoContent();
-
-            foreach(var idWell in request.IdsWells)
-                if (!await UserHasAccessToWellAsync(idWell, token))
-                    return Forbid();
-
-            var result = await subsystemService.GetByWellsAsync(request, token);
-
-            return Ok(result);
-        }
-
-        private async Task<bool> UserHasAccessToWellAsync(int idWell, CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
-            if (idCompany is not null &&
-                await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, token)
-                    .ConfigureAwait(false))
-                return true;
-            return false;
-        }
+    private async Task<bool> UserHasAccessToWellAsync(int idWell, CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
+        if (idCompany is not null &&
+            await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, token)
+                .ConfigureAwait(false))
+            return true;
+        return false;
     }
 }
\ No newline at end of file
diff --git a/AsbCloudWebApi/Controllers/Trajectory/TrajectoryController.cs b/AsbCloudWebApi/Controllers/Trajectory/TrajectoryController.cs
index 643aed2c..9fc73eae 100644
--- a/AsbCloudWebApi/Controllers/Trajectory/TrajectoryController.cs
+++ b/AsbCloudWebApi/Controllers/Trajectory/TrajectoryController.cs
@@ -10,74 +10,72 @@ using System.Threading.Tasks;
 using AsbCloudApp.Requests.ExportOptions;
 using AsbCloudInfrastructure.Services.Trajectory.Export;
 
-namespace AsbCloudWebApi.Controllers.Trajectory
+namespace AsbCloudWebApi.Controllers.Trajectory;
+
+
+/// <summary>
+/// Плановые и фактические траектории (загрузка и хранение)
+/// </summary>
+[ApiController]
+[Authorize]
+public abstract class TrajectoryController<TDto> : ControllerBase
+    where TDto : TrajectoryGeoDto
 {
+    protected abstract string TemplateFileName { get; }
 
-    /// <summary>
-    /// Плановые и фактические траектории (загрузка и хранение)
-    /// </summary>
-    [ApiController]
-    [Authorize]
-    public abstract class TrajectoryController<TDto> : ControllerBase
-        where TDto : TrajectoryGeoDto
+    private readonly IWellService wellService;
+    private readonly TrajectoryExportService<TDto> trajectoryExportService;
+    private readonly ITrajectoryRepository<TDto> trajectoryRepository;
+
+    protected TrajectoryController(IWellService wellService,
+        TrajectoryExportService<TDto> trajectoryExportService,
+        ITrajectoryRepository<TDto> trajectoryRepository)
     {
-        protected abstract string TemplateFileName { get; }
-
-        private readonly IWellService wellService;
-        private readonly TrajectoryExportService<TDto> trajectoryExportService;
-        private readonly ITrajectoryRepository<TDto> trajectoryRepository;
-
-        protected TrajectoryController(IWellService wellService,
-            TrajectoryExportService<TDto> trajectoryExportService,
-            ITrajectoryRepository<TDto> trajectoryRepository)
-        {
-            this.trajectoryExportService = trajectoryExportService;
-            this.wellService = wellService;
-            this.trajectoryRepository = trajectoryRepository;
-        }
-
-        /// <summary>
-        /// Формируем excel файл с текущими строками траектории
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns>Запрашиваемый файл</returns>
-        [HttpGet("export")]
-        [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")]
-        [ProducesResponseType(StatusCodes.Status204NoContent)]
-        public async Task<IActionResult> ExportAsync([FromRoute] int idWell, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell,
-                token).ConfigureAwait(false))
-                return Forbid();
-
-            var exportOptions = new WellRelatedExportRequest(idWell);
-            var (fileName, file) = await trajectoryExportService.ExportAsync(exportOptions, token);
-            return File(file, "application/octet-stream", fileName);
-        }
-
-        /// <summary>
-        /// Получаем список всех строк координат траектории (для клиента)
-        /// </summary>
-        /// <param name="idWell">ключ скважины</param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns>Список добавленных координат траектории</returns>
-        [HttpGet]
-        public async Task<ActionResult<IEnumerable<TDto>>> GetAsync(int idWell, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell,
-                token).ConfigureAwait(false))
-                return Forbid();
-            var result = await trajectoryRepository.GetAsync(idWell, token);
-            return Ok(result);
-        }
-
-        protected 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);
-        }
+        this.trajectoryExportService = trajectoryExportService;
+        this.wellService = wellService;
+        this.trajectoryRepository = trajectoryRepository;
     }
 
+    /// <summary>
+    /// Формируем excel файл с текущими строками траектории
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns>Запрашиваемый файл</returns>
+    [HttpGet("export")]
+    [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    public async Task<IActionResult> ExportAsync([FromRoute] int idWell, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell,
+            token).ConfigureAwait(false))
+            return Forbid();
+
+        var exportOptions = new WellRelatedExportRequest(idWell);
+        var (fileName, file) = await trajectoryExportService.ExportAsync(exportOptions, token);
+        return File(file, "application/octet-stream", fileName);
+    }
+
+    /// <summary>
+    /// Получаем список всех строк координат траектории (для клиента)
+    /// </summary>
+    /// <param name="idWell">ключ скважины</param>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns>Список добавленных координат траектории</returns>
+    [HttpGet]
+    public async Task<ActionResult<IEnumerable<TDto>>> GetAsync(int idWell, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell,
+            token).ConfigureAwait(false))
+            return Forbid();
+        var result = await trajectoryRepository.GetAsync(idWell, token);
+        return Ok(result);
+    }
+
+    protected 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);
+    }
 }
diff --git a/AsbCloudWebApi/Controllers/Trajectory/TrajectoryEditableController.cs b/AsbCloudWebApi/Controllers/Trajectory/TrajectoryEditableController.cs
index c83eafc8..2f7a71df 100644
--- a/AsbCloudWebApi/Controllers/Trajectory/TrajectoryEditableController.cs
+++ b/AsbCloudWebApi/Controllers/Trajectory/TrajectoryEditableController.cs
@@ -13,186 +13,185 @@ using AsbCloudApp.Requests.ParserOptions;
 using AsbCloudApp.Services.Parsers;
 using AsbCloudInfrastructure.Services.Trajectory.Export;
 
-namespace AsbCloudWebApi.Controllers.Trajectory
+namespace AsbCloudWebApi.Controllers.Trajectory;
+
+
+/// <summary>
+/// Плановые и фактические траектории (загрузка и хранение)
+/// </summary>
+[ApiController]
+[Authorize]
+public abstract class TrajectoryEditableController<TDto> : TrajectoryController<TDto>
+  where TDto : TrajectoryGeoDto
 {
+  private readonly IParserService<TDto, WellRelatedParserRequest> parserService;
+  private readonly ITrajectoryEditableRepository<TDto> trajectoryRepository;
+
+  protected TrajectoryEditableController(IWellService wellService,
+     IParserService<TDto, WellRelatedParserRequest>  parserService,
+     TrajectoryExportService<TDto> trajectoryExportService,
+        ITrajectoryEditableRepository<TDto> trajectoryRepository)
+        : base(wellService, trajectoryExportService, trajectoryRepository)
+  {
+     this.parserService = parserService;
+     this.trajectoryRepository = trajectoryRepository;
+  }
+  
+  /// <summary>
+    /// Возвращает excel шаблон для заполнения строк траектории
+    /// </summary>
+    /// <returns>Запрашиваемый файл</returns>
+    [HttpGet("template")]
+    [AllowAnonymous]
+    [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    public IActionResult GetTemplate()
+    {
+        var stream = parserService.GetTemplateFile();
+        return File(stream, "application/octet-stream", TemplateFileName);
+    }
+
+  /// <summary>
+  /// Импортирует координаты из excel (xlsx) файла
+  /// </summary>
+  /// <param name="idWell">id скважины</param>
+  /// <param name="files">Коллекция из одного файла xlsx</param>
+  /// <param name="token"> Токен отмены задачи </param>
+  /// <returns>количество успешно записанных строк в БД</returns>
+  [HttpPost("parse")]
+  [ProducesResponseType((int)System.Net.HttpStatusCode.OK)]
+  [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
+  public async Task<ActionResult<ParserResultDto<TDto>>> Parse(int idWell,
+     [FromForm] IFormFileCollection files,
+     CancellationToken token)
+  {
+     var idUser = User.GetUserId();
+
+     if (!idUser.HasValue)
+        return Forbid();
+
+     if (!await CanUserAccessToWellAsync(idWell, token))
+        return Forbid();
+
+     var stream = files.GetExcelFile();
+
+     try
+     {
+        var options = new WellRelatedParserRequest(idWell);
+        var dto = parserService.Parse(stream, options);
+        
+        return Ok(dto);
+     }
+     catch (FileFormatException ex)
+     {
+        return this.ValidationBadRequest(nameof(files), ex.Message);
+     }
+  }
+  
+  /// <summary>
+  /// Добавление
+  /// </summary>
+  /// <param name="idWell"></param>
+  /// <param name="dtos"></param>
+  /// <param name="token"></param>
+  /// <returns></returns>
+  [HttpPost]
+  [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+  public async Task<IActionResult> InsertRangeAsync(int idWell, [FromBody] IEnumerable<TDto> dtos, CancellationToken token)
+  {
+     if (!await CanUserAccessToWellAsync(idWell, token))
+        return Forbid();
+     
+     var idUser = User.GetUserId();
+     
+     if (!idUser.HasValue)
+        return Forbid();
+     
+     foreach (var dto in dtos)
+     {
+        dto.IdUser = idUser.Value;
+        dto.IdWell = idWell;
+     }
+
+     var result = await trajectoryRepository.AddRangeAsync(dtos, token);
+     return Ok(result);
+  }
+
+  /// <summary>
+  /// Удалить все по скважине и добавить новые
+  /// </summary>
+  /// <param name="idWell"></param>
+  /// <param name="dtos"></param>
+  /// <param name="token"></param>
+  /// <returns></returns>
+  [HttpPost("replace")]
+  [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+  public async Task<IActionResult> ClearAndInsertRangeAsync(int idWell, [FromBody] IEnumerable<TDto> dtos, CancellationToken token)
+  {
+     //TODO: это вся радость требует рефакторинга.
+     //Удаление с добавлением новых записей должно происходить в рамках одной транзакции, да и вообще должно быть реализовано на уровне репозиторий.
+     //Рефакторинг будет когда доберёмся до журнала изменений для траекторий.
+     if (!await CanUserAccessToWellAsync(idWell, token))
+        return Forbid();
+     
+     var idUser = User.GetUserId();
+     
+     if (!idUser.HasValue)
+        return Forbid();
+     
+     foreach (var dto in dtos)
+     {
+        dto.IdUser = idUser.Value;
+        dto.IdWell = idWell;
+     }
+
+     await trajectoryRepository.DeleteByIdWellAsync(idWell, token);
+     var result = await trajectoryRepository.AddRangeAsync(dtos, token);
+     return Ok(result);
+  }
 
     /// <summary>
-    /// Плановые и фактические траектории (загрузка и хранение)
+    /// Изменить выбранную строку с координатами
     /// </summary>
-    [ApiController]
-    [Authorize]
-    public abstract class TrajectoryEditableController<TDto> : TrajectoryController<TDto>
-      where TDto : TrajectoryGeoDto
-   {
-      private readonly IParserService<TDto, WellRelatedParserRequest> parserService;
-      private readonly ITrajectoryEditableRepository<TDto> trajectoryRepository;
+    /// <param name="idWell"></param>
+    /// <param name="idRow"></param>
+    /// <param name="row"></param>
+    /// <param name="token"></param>
+    /// <returns>количество успешно обновленных строк в БД</returns>
+    [HttpPut("{idRow}")]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> UpdateAsync(int idWell, int idRow,
+        [FromBody] TDto row, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+        int? idUser = User.GetUserId();
+        if (!idUser.HasValue)
+            return Forbid();
+        row.Id = idRow;
+        row.IdUser = idUser.Value;
+        row.IdWell = idWell;
+        var result = await trajectoryRepository.UpdateAsync(row, token);
+        return Ok(result);
+    }
 
-      protected TrajectoryEditableController(IWellService wellService,
-         IParserService<TDto, WellRelatedParserRequest>  parserService,
-         TrajectoryExportService<TDto> trajectoryExportService,
-            ITrajectoryEditableRepository<TDto> trajectoryRepository)
-            : base(wellService, trajectoryExportService, trajectoryRepository)
-      {
-         this.parserService = parserService;
-         this.trajectoryRepository = trajectoryRepository;
-      }
-      
-      /// <summary>
-        /// Возвращает excel шаблон для заполнения строк траектории
-        /// </summary>
-        /// <returns>Запрашиваемый файл</returns>
-        [HttpGet("template")]
-        [AllowAnonymous]
-        [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")]
-        [ProducesResponseType(StatusCodes.Status204NoContent)]
-        public IActionResult GetTemplate()
-        {
-            var stream = parserService.GetTemplateFile();
-            return File(stream, "application/octet-stream", TemplateFileName);
-        }
-
-      /// <summary>
-      /// Импортирует координаты из excel (xlsx) файла
-      /// </summary>
-      /// <param name="idWell">id скважины</param>
-      /// <param name="files">Коллекция из одного файла xlsx</param>
-      /// <param name="token"> Токен отмены задачи </param>
-      /// <returns>количество успешно записанных строк в БД</returns>
-      [HttpPost("parse")]
-      [ProducesResponseType((int)System.Net.HttpStatusCode.OK)]
-      [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
-      public async Task<ActionResult<ParserResultDto<TDto>>> Parse(int idWell,
-         [FromForm] IFormFileCollection files,
-         CancellationToken token)
-      {
-         var idUser = User.GetUserId();
-
-         if (!idUser.HasValue)
+    /// <summary>
+    /// Удалить выбранную строку с координатами
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idRow"></param>
+    /// <param name="token"></param>
+    /// <returns>количество успешно удаленных строк из БД</returns>
+    [HttpDelete("{idRow}")]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> DeleteAsync(int idWell, int idRow, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell,
+            token).ConfigureAwait(false))
             return Forbid();
 
-         if (!await CanUserAccessToWellAsync(idWell, token))
-            return Forbid();
+        var result = await trajectoryRepository.DeleteRangeAsync(new int[] { idRow }, token);
 
-         var stream = files.GetExcelFile();
-
-         try
-         {
-            var options = new WellRelatedParserRequest(idWell);
-            var dto = parserService.Parse(stream, options);
-            
-            return Ok(dto);
-         }
-         catch (FileFormatException ex)
-         {
-            return this.ValidationBadRequest(nameof(files), ex.Message);
-         }
-      }
-      
-      /// <summary>
-      /// Добавление
-      /// </summary>
-      /// <param name="idWell"></param>
-      /// <param name="dtos"></param>
-      /// <param name="token"></param>
-      /// <returns></returns>
-      [HttpPost]
-      [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-      public async Task<IActionResult> InsertRangeAsync(int idWell, [FromBody] IEnumerable<TDto> dtos, CancellationToken token)
-      {
-         if (!await CanUserAccessToWellAsync(idWell, token))
-            return Forbid();
-         
-         var idUser = User.GetUserId();
-         
-         if (!idUser.HasValue)
-            return Forbid();
-         
-         foreach (var dto in dtos)
-         {
-            dto.IdUser = idUser.Value;
-            dto.IdWell = idWell;
-         }
-
-         var result = await trajectoryRepository.AddRangeAsync(dtos, token);
-         return Ok(result);
-      }
-
-      /// <summary>
-      /// Удалить все по скважине и добавить новые
-      /// </summary>
-      /// <param name="idWell"></param>
-      /// <param name="dtos"></param>
-      /// <param name="token"></param>
-      /// <returns></returns>
-      [HttpPost("replace")]
-      [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-      public async Task<IActionResult> ClearAndInsertRangeAsync(int idWell, [FromBody] IEnumerable<TDto> dtos, CancellationToken token)
-      {
-         //TODO: это вся радость требует рефакторинга.
-         //Удаление с добавлением новых записей должно происходить в рамках одной транзакции, да и вообще должно быть реализовано на уровне репозиторий.
-         //Рефакторинг будет когда доберёмся до журнала изменений для траекторий.
-         if (!await CanUserAccessToWellAsync(idWell, token))
-            return Forbid();
-         
-         var idUser = User.GetUserId();
-         
-         if (!idUser.HasValue)
-            return Forbid();
-         
-         foreach (var dto in dtos)
-         {
-            dto.IdUser = idUser.Value;
-            dto.IdWell = idWell;
-         }
-
-         await trajectoryRepository.DeleteByIdWellAsync(idWell, token);
-         var result = await trajectoryRepository.AddRangeAsync(dtos, token);
-         return Ok(result);
-      }
-
-        /// <summary>
-        /// Изменить выбранную строку с координатами
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idRow"></param>
-        /// <param name="row"></param>
-        /// <param name="token"></param>
-        /// <returns>количество успешно обновленных строк в БД</returns>
-        [HttpPut("{idRow}")]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> UpdateAsync(int idWell, int idRow,
-            [FromBody] TDto row, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-            int? idUser = User.GetUserId();
-            if (!idUser.HasValue)
-                return Forbid();
-            row.Id = idRow;
-            row.IdUser = idUser.Value;
-            row.IdWell = idWell;
-            var result = await trajectoryRepository.UpdateAsync(row, token);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Удалить выбранную строку с координатами
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idRow"></param>
-        /// <param name="token"></param>
-        /// <returns>количество успешно удаленных строк из БД</returns>
-        [HttpDelete("{idRow}")]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> DeleteAsync(int idWell, int idRow, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell,
-                token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await trajectoryRepository.DeleteRangeAsync(new int[] { idRow }, token);
-
-            return Ok(result);
-        }
+        return Ok(result);
     }
 }
\ No newline at end of file
diff --git a/AsbCloudWebApi/Controllers/Trajectory/TrajectoryPlanController.cs b/AsbCloudWebApi/Controllers/Trajectory/TrajectoryPlanController.cs
index 10d34ed8..a9c9a3b0 100644
--- a/AsbCloudWebApi/Controllers/Trajectory/TrajectoryPlanController.cs
+++ b/AsbCloudWebApi/Controllers/Trajectory/TrajectoryPlanController.cs
@@ -9,47 +9,46 @@ using System.Threading;
 using System.Threading.Tasks;
 using AsbCloudInfrastructure.Services.Trajectory.Parser;
 
-namespace AsbCloudWebApi.Controllers.Trajectory
+namespace AsbCloudWebApi.Controllers.Trajectory;
+
+/// <summary>
+/// Плановая траектория (загрузка и хранение)
+/// </summary>
+[Route("api/well/{idWell}/[controller]")]
+[ApiController]
+public class TrajectoryPlanController : TrajectoryEditableController<TrajectoryGeoPlanDto>
 {
-   /// <summary>
-   /// Плановая траектория (загрузка и хранение)
-   /// </summary>
-   [Route("api/well/{idWell}/[controller]")]
-   [ApiController]
-   public class TrajectoryPlanController : TrajectoryEditableController<TrajectoryGeoPlanDto>
-   {
-      private readonly TrajectoryService trajectoryVisualizationService;
+  private readonly TrajectoryService trajectoryVisualizationService;
 
-      protected override string TemplateFileName => "ЕЦП_шаблон_файла_плановая_траектория.xlsx";
+  protected override string TemplateFileName => "ЕЦП_шаблон_файла_плановая_траектория.xlsx";
 
-      public TrajectoryPlanController(IWellService wellService,
-         TrajectoryPlanParser parserService,
-         TrajectoryPlanExportService trajectoryExportService,
-         ITrajectoryEditableRepository<TrajectoryGeoPlanDto> trajectoryRepository,
-         TrajectoryService trajectoryVisualizationService)
-         : base(wellService, parserService, trajectoryExportService, trajectoryRepository)
-      {
-         this.trajectoryVisualizationService = trajectoryVisualizationService;
-      }
+  public TrajectoryPlanController(IWellService wellService,
+     TrajectoryPlanParser parserService,
+     TrajectoryPlanExportService trajectoryExportService,
+     ITrajectoryEditableRepository<TrajectoryGeoPlanDto> trajectoryRepository,
+     TrajectoryService trajectoryVisualizationService)
+     : base(wellService, parserService, trajectoryExportService, trajectoryRepository)
+  {
+     this.trajectoryVisualizationService = trajectoryVisualizationService;
+  }
 
-      /// <summary>
-      /// Получение координат для визуализации траектории (плановой и фактической)
-      /// </summary>
-      /// <param name="idWell"></param>
-      /// <param name="token"></param>
-      /// <returns></returns>
-      [HttpGet("trajectoryCartesianPlanFact")]
-      [ProducesResponseType(
-         typeof(TrajectoryPlanFactDto<IEnumerable<TrajectoryCartesianPlanDto>, IEnumerable<TrajectoryCartesianFactDto>>),
-         (int)System.Net.HttpStatusCode.OK)]
-      public async Task<IActionResult> GetTrajectoryCartesianPlanFactAsync(int idWell, CancellationToken token)
-      {
-         if (!await CanUserAccessToWellAsync(idWell,
-               token).ConfigureAwait(false))
-            return Forbid();
+  /// <summary>
+  /// Получение координат для визуализации траектории (плановой и фактической)
+  /// </summary>
+  /// <param name="idWell"></param>
+  /// <param name="token"></param>
+  /// <returns></returns>
+  [HttpGet("trajectoryCartesianPlanFact")]
+  [ProducesResponseType(
+     typeof(TrajectoryPlanFactDto<IEnumerable<TrajectoryCartesianPlanDto>, IEnumerable<TrajectoryCartesianFactDto>>),
+     (int)System.Net.HttpStatusCode.OK)]
+  public async Task<IActionResult> GetTrajectoryCartesianPlanFactAsync(int idWell, CancellationToken token)
+  {
+     if (!await CanUserAccessToWellAsync(idWell,
+           token).ConfigureAwait(false))
+        return Forbid();
 
-         var result = await trajectoryVisualizationService.GetTrajectoryCartesianAsync(idWell, token);
-         return Ok(result);
-      }
-   }
+     var result = await trajectoryVisualizationService.GetTrajectoryCartesianAsync(idWell, token);
+     return Ok(result);
+  }
 }
\ No newline at end of file
diff --git a/AsbCloudWebApi/Controllers/UserSettingsController.cs b/AsbCloudWebApi/Controllers/UserSettingsController.cs
index 04a4d5cb..bee87e4d 100644
--- a/AsbCloudWebApi/Controllers/UserSettingsController.cs
+++ b/AsbCloudWebApi/Controllers/UserSettingsController.cs
@@ -6,103 +6,102 @@ using System.ComponentModel.DataAnnotations;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Контроллер настроек для пользователя
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+[Authorize]
+public class UserSettingsController : ControllerBase
 {
-    /// <summary>
-    /// Контроллер настроек для пользователя
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    [Authorize]
-    public class UserSettingsController : ControllerBase
+    private readonly IUserSettingsRepository service;
+
+    public UserSettingsController(IUserSettingsRepository service)
     {
-        private readonly IUserSettingsRepository service;
+        this.service = service;
+    }
 
-        public UserSettingsController(IUserSettingsRepository service)
-        {
-            this.service = service;
-        }
+    /// <summary>
+    /// Получить настройки
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("{key}")]
+    [ProducesResponseType(typeof(object), (int)System.Net.HttpStatusCode.OK)]
+    [Produces("application/json")]
+    public virtual async Task<IActionResult> GetAsync(
+        [StringLength(255, MinimumLength = 1, ErrorMessage = "The key value cannot less then 1 character and greater then 255. ")]
+        string key, 
+        CancellationToken token)
+    {
+        var userId = User.GetUserId();
+        if (userId is null)
+            return Forbid();
 
-        /// <summary>
-        /// Получить настройки
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("{key}")]
-        [ProducesResponseType(typeof(object), (int)System.Net.HttpStatusCode.OK)]
-        [Produces("application/json")]
-        public virtual async Task<IActionResult> GetAsync(
-            [StringLength(255, MinimumLength = 1, ErrorMessage = "The key value cannot less then 1 character and greater then 255. ")]
-            string key, 
-            CancellationToken token)
-        {
-            var userId = User.GetUserId();
-            if (userId is null)
-                return Forbid();
+        var result = await service.GetOrDefaultAsync((int)userId, key, token).ConfigureAwait(false);
+        var actionResult = new JsonResult(result);
+        actionResult.ContentType = "application/json";
+        return actionResult;
+    }
 
-            var result = await service.GetOrDefaultAsync((int)userId, key, token).ConfigureAwait(false);
-            var actionResult = new JsonResult(result);
-            actionResult.ContentType = "application/json";
-            return actionResult;
-        }
+    /// <summary>
+    /// записать новые или обновить старые
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="value"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPut("{key}")]
+    [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
+    public virtual async Task<ActionResult<int>> UpsertAsync(string key, [FromBody] System.Text.Json.JsonDocument value, CancellationToken token)
+    {
+        var userId = User.GetUserId();
+        if (userId is null)
+            return Forbid();
 
-        /// <summary>
-        /// записать новые или обновить старые
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPut("{key}")]
-        [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
-        public virtual async Task<ActionResult<int>> UpsertAsync(string key, [FromBody] System.Text.Json.JsonDocument value, CancellationToken token)
-        {
-            var userId = User.GetUserId();
-            if (userId is null)
-                return Forbid();
+        var result = await service.UpsertAsync((int)userId, key, value, token).ConfigureAwait(false);
+        if (result < 0)
+            return this.ValidationBadRequest(nameof(key), "not found");
 
-            var result = await service.UpsertAsync((int)userId, key, value, token).ConfigureAwait(false);
-            if (result < 0)
-                return this.ValidationBadRequest(nameof(key), "not found");
+        return Ok(result);
+    }
 
-            return Ok(result);
-        }
+    /// <summary>
+    /// Удалить настройки пользователя по ключу
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpDelete("{key}")]
+    [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
+    public virtual async Task<ActionResult<int>> DeleteAsync(string key, CancellationToken token)
+    {
+        var userId = User.GetUserId();
+        if (userId is null)
+            return Forbid();
 
-        /// <summary>
-        /// Удалить настройки пользователя по ключу
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpDelete("{key}")]
-        [ProducesResponseType(typeof(ValidationProblemDetails), (int)System.Net.HttpStatusCode.BadRequest)]
-        public virtual async Task<ActionResult<int>> DeleteAsync(string key, CancellationToken token)
-        {
-            var userId = User.GetUserId();
-            if (userId is null)
-                return Forbid();
+        var result = await service.DeleteAsync((int)userId, key, token).ConfigureAwait(false);
+        if (result < 0)
+            return this.ValidationBadRequest(nameof(key), "not found");
 
-            var result = await service.DeleteAsync((int)userId, key, token).ConfigureAwait(false);
-            if (result < 0)
-                return this.ValidationBadRequest(nameof(key), "not found");
+        return Ok(result);
+    }
 
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Удалить ВСЕ настройки пользователя. Для админки.
-        /// </summary>
-        /// <param name="idUser"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpDelete("/api/admin/user/{idUser}/settings")]
-        [Permission]
-        public virtual async Task<ActionResult<int>> DeleteAllAsync(int idUser, CancellationToken token)
-        {
-            var result = await service.DeleteAsync(idUser, token).ConfigureAwait(false);
-            
-            return Ok(result);
-        }
+    /// <summary>
+    /// Удалить ВСЕ настройки пользователя. Для админки.
+    /// </summary>
+    /// <param name="idUser"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpDelete("/api/admin/user/{idUser}/settings")]
+    [Permission]
+    public virtual async Task<ActionResult<int>> DeleteAllAsync(int idUser, CancellationToken token)
+    {
+        var result = await service.DeleteAsync(idUser, token).ConfigureAwait(false);
+        
+        return Ok(result);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/WITS/WitsControllerAbstract.cs b/AsbCloudWebApi/Controllers/WITS/WitsControllerAbstract.cs
index 1c050b66..ae80152e 100644
--- a/AsbCloudWebApi/Controllers/WITS/WitsControllerAbstract.cs
+++ b/AsbCloudWebApi/Controllers/WITS/WitsControllerAbstract.cs
@@ -12,115 +12,114 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers.WITS
+namespace AsbCloudWebApi.Controllers.WITS;
+
+[Route("api/[controller]")]
+[ApiController]
+public abstract class WitsControllerAbstract<TDto> : ControllerBase
+    where TDto : ITelemetryData
 {
-    [Route("api/[controller]")]
-    [ApiController]
-    public abstract class WitsControllerAbstract<TDto> : ControllerBase
-        where TDto : ITelemetryData
+    private readonly ITelemetryService telemetryService;
+    private readonly IHubContext<TelemetryHub> telemetryHubContext;
+    protected abstract string SirnalRMethodGetDataName { get; }
+
+    public WitsControllerAbstract(
+        ITelemetryService telemetryService,
+        IHubContext<TelemetryHub> telemetryHubContext)
     {
-        private readonly ITelemetryService telemetryService;
-        private readonly IHubContext<TelemetryHub> telemetryHubContext;
-        protected abstract string SirnalRMethodGetDataName { get; }
+        this.telemetryService = telemetryService;
+        this.telemetryHubContext = telemetryHubContext;
+    }
 
-        public WitsControllerAbstract(
-            ITelemetryService telemetryService,
-            IHubContext<TelemetryHub> telemetryHubContext)
-        {
-            this.telemetryService = telemetryService;
-            this.telemetryHubContext = telemetryHubContext;
-        }
+    /// <summary>
+    /// Метод для получения WITS записи от панели оператора.
+    /// Созраняет в БД.
+    /// Ретранслирует заинтересованным через SignalR.
+    /// </summary>
+    /// <param name="uid">уникальный идентификатор телеметрии</param>
+    /// <param name="dtos">WITS запись</param>
+    /// <param name="witsRecordRepository"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPost("{uid}")]
+    [AllowAnonymous]
+    public async virtual Task<IActionResult> PostDataAsync(
+        string uid,
+        [FromBody] IEnumerable<TDto> dtos,
+        [FromServices] IWitsRecordRepository<TDto> witsRecordRepository,
+        CancellationToken token)
+    {
+        var telemetry = telemetryService.GetOrCreateTelemetryByUid(uid);
+        await witsRecordRepository.SaveDataAsync(telemetry.Id, dtos, token).ConfigureAwait(false);
+        var idWell = telemetryService.GetIdWellByTelemetryUid(uid);
+        if (idWell != null && dtos.Any())
+            _ = Task.Run(() => telemetryHubContext.Clients.Group($"well_{idWell}_wits")
+                  .SendAsync(SirnalRMethodGetDataName, dtos), CancellationToken.None);
 
-        /// <summary>
-        /// Метод для получения WITS записи от панели оператора.
-        /// Созраняет в БД.
-        /// Ретранслирует заинтересованным через SignalR.
-        /// </summary>
-        /// <param name="uid">уникальный идентификатор телеметрии</param>
-        /// <param name="dtos">WITS запись</param>
-        /// <param name="witsRecordRepository"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPost("{uid}")]
-        [AllowAnonymous]
-        public async virtual Task<IActionResult> PostDataAsync(
-            string uid,
-            [FromBody] IEnumerable<TDto> dtos,
-            [FromServices] IWitsRecordRepository<TDto> witsRecordRepository,
-            CancellationToken token)
-        {
-            var telemetry = telemetryService.GetOrCreateTelemetryByUid(uid);
-            await witsRecordRepository.SaveDataAsync(telemetry.Id, dtos, token).ConfigureAwait(false);
-            var idWell = telemetryService.GetIdWellByTelemetryUid(uid);
-            if (idWell != null && dtos.Any())
-                _ = Task.Run(() => telemetryHubContext.Clients.Group($"well_{idWell}_wits")
-                      .SendAsync(SirnalRMethodGetDataName, dtos), CancellationToken.None);
+        return Ok();
+    }
 
-            return Ok();
-        }
+    /// <summary>
+    /// Получение последней пришедшей WITS записи.
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="witsRecordRepository"></param>
+    /// <returns></returns>
+    [HttpGet("{idWell}/last")]
+    public virtual ActionResult<IEnumerable<TDto>> GetLastData(
+        int idWell,
+        [FromServices] IWitsRecordRepository<TDto> witsRecordRepository)
+    {
+        var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
+        if (telemetry is null)
+            return NoContent();
+        var dto = witsRecordRepository.GetLastOrDefault(telemetry.Id);
+        return Ok(new[] { dto });
+    }
 
-        /// <summary>
-        /// Получение последней пришедшей WITS записи.
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="witsRecordRepository"></param>
-        /// <returns></returns>
-        [HttpGet("{idWell}/last")]
-        public virtual ActionResult<IEnumerable<TDto>> GetLastData(
-            int idWell,
-            [FromServices] IWitsRecordRepository<TDto> witsRecordRepository)
-        {
-            var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
-            if (telemetry is null)
-                return NoContent();
-            var dto = witsRecordRepository.GetLastOrDefault(telemetry.Id);
-            return Ok(new[] { dto });
-        }
+    /// <summary>
+    /// Получение списка архивных WITS записей за период.
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="begin">начало диапазона</param>
+    /// <param name="end">конец диапазона</param>
+    /// <param name="witsRecordRepository"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("{idWell}")]
+    public async virtual Task<ActionResult<IEnumerable<TDto>>> GetDataAsync(
+        int idWell,
+        [Required] DateTime begin,
+        [Required] DateTime end,
+        [FromServices] IWitsRecordRepository<TDto> witsRecordRepository,
+        CancellationToken token)
+    {
+        var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
+        if (telemetry is null)
+            return NoContent();
+        var dtos = await witsRecordRepository.GetAsync(telemetry.Id, begin, end, token);
+        return Ok(dtos);
+    }
 
-        /// <summary>
-        /// Получение списка архивных WITS записей за период.
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="begin">начало диапазона</param>
-        /// <param name="end">конец диапазона</param>
-        /// <param name="witsRecordRepository"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("{idWell}")]
-        public async virtual Task<ActionResult<IEnumerable<TDto>>> GetDataAsync(
-            int idWell,
-            [Required] DateTime begin,
-            [Required] DateTime end,
-            [FromServices] IWitsRecordRepository<TDto> witsRecordRepository,
-            CancellationToken token)
-        {
-            var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
-            if (telemetry is null)
-                return NoContent();
-            var dtos = await witsRecordRepository.GetAsync(telemetry.Id, begin, end, token);
-            return Ok(dtos);
-        }
-
-        /// <summary>
-        /// Получение статистики по WITS записи.
-        /// Диапазон дат и общее количество записей.
-        /// </summary>
-        /// <param name="idWell">id скважины</param>
-        /// <param name="witsRecordRepository"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("{idWell}/datesRange")]
-        [ProducesResponseType(StatusCodes.Status200OK, Type = typeof((DateTime begin, DateTime end, int count)?))]
-        public async virtual Task<IActionResult> GetDatesRangeAsync(
-            int idWell,
-            [FromServices] IWitsRecordRepository<TDto> witsRecordRepository,
-            CancellationToken token)
-        {
-            var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
-            if (telemetry is null)
-                return NoContent();
-            var dtos = await witsRecordRepository.GetStatAsync(telemetry.Id, token);
-            return Ok(dtos);
-        }
+    /// <summary>
+    /// Получение статистики по WITS записи.
+    /// Диапазон дат и общее количество записей.
+    /// </summary>
+    /// <param name="idWell">id скважины</param>
+    /// <param name="witsRecordRepository"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("{idWell}/datesRange")]
+    [ProducesResponseType(StatusCodes.Status200OK, Type = typeof((DateTime begin, DateTime end, int count)?))]
+    public async virtual Task<IActionResult> GetDatesRangeAsync(
+        int idWell,
+        [FromServices] IWitsRecordRepository<TDto> witsRecordRepository,
+        CancellationToken token)
+    {
+        var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
+        if (telemetry is null)
+            return NoContent();
+        var dtos = await witsRecordRepository.GetStatAsync(telemetry.Id, token);
+        return Ok(dtos);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/WITS/WitsInfoController.cs b/AsbCloudWebApi/Controllers/WITS/WitsInfoController.cs
index 023a4314..9bb49023 100644
--- a/AsbCloudWebApi/Controllers/WITS/WitsInfoController.cs
+++ b/AsbCloudWebApi/Controllers/WITS/WitsInfoController.cs
@@ -2,70 +2,69 @@ using AsbCloudInfrastructure.Services;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 
-namespace AsbCloudWebApi.Controllers.WITS
+namespace AsbCloudWebApi.Controllers.WITS;
+
+/// <summary>
+/// Инфо о WITS параметрах
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public class WitsInfoController : ControllerBase
 {
-    /// <summary>
-    /// Инфо о WITS параметрах
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    public class WitsInfoController : ControllerBase
+    private readonly WitsInfoService witsInfoService;
+
+    public WitsInfoController(WitsInfoService witsInfoService)
     {
-        private readonly WitsInfoService witsInfoService;
+        this.witsInfoService = witsInfoService;
+    }
 
-        public WitsInfoController(WitsInfoService witsInfoService)
-        {
-            this.witsInfoService = witsInfoService;
-        }
+    /// <summary>
+    /// Список всех WITS items для всех известных records
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("item")]
+    [ProducesResponseType(typeof(IEnumerable<object>), (int)System.Net.HttpStatusCode.OK)]
+    public IActionResult GetItems()
+    {
+        var result = witsInfoService.GetItems();
+        return Ok(result);
+    }
 
-        /// <summary>
-        /// Список всех WITS items для всех известных records
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("item")]
-        [ProducesResponseType(typeof(IEnumerable<object>), (int)System.Net.HttpStatusCode.OK)]
-        public IActionResult GetItems()
-        {
-            var result = witsInfoService.GetItems();
-            return Ok(result);
-        }
+    /// <summary>
+    /// Список всех WITS items для конкретной record
+    /// </summary>
+    /// <param name="idRecord"></param>
+    /// <returns></returns>
+    [HttpGet("item/{idRecord}")]
+    [ProducesResponseType(typeof(IEnumerable<object>), (int)System.Net.HttpStatusCode.OK)]
+    public IActionResult GetItems(int idRecord)
+    {
+        var result = witsInfoService.GetItems(idRecord);
+        return Ok(result);
+    }
 
-        /// <summary>
-        /// Список всех WITS items для конкретной record
-        /// </summary>
-        /// <param name="idRecord"></param>
-        /// <returns></returns>
-        [HttpGet("item/{idRecord}")]
-        [ProducesResponseType(typeof(IEnumerable<object>), (int)System.Net.HttpStatusCode.OK)]
-        public IActionResult GetItems(int idRecord)
-        {
-            var result = witsInfoService.GetItems(idRecord);
-            return Ok(result);
-        }
+    /// <summary>
+    /// Список описаний всех wits records
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("record")]
+    [ProducesResponseType(typeof(IEnumerable<object>), (int)System.Net.HttpStatusCode.OK)]
+    public IActionResult GetRecordInfo()
+    {
+        var result = witsInfoService.GetRecords();
+        return Ok(result);
+    }
 
-        /// <summary>
-        /// Список описаний всех wits records
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("record")]
-        [ProducesResponseType(typeof(IEnumerable<object>), (int)System.Net.HttpStatusCode.OK)]
-        public IActionResult GetRecordInfo()
-        {
-            var result = witsInfoService.GetRecords();
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Описание конкретной record
-        /// </summary>
-        /// <param name="idRecord"></param>
-        /// <returns></returns>
-        [HttpGet("record/{idRecord}")]
-        [ProducesResponseType(typeof(IEnumerable<object>), (int)System.Net.HttpStatusCode.OK)]
-        public IActionResult GetRecordInfo(int idRecord)
-        {
-            var result = witsInfoService.GetRecords(idRecord);
-            return Ok(result);
-        }
+    /// <summary>
+    /// Описание конкретной record
+    /// </summary>
+    /// <param name="idRecord"></param>
+    /// <returns></returns>
+    [HttpGet("record/{idRecord}")]
+    [ProducesResponseType(typeof(IEnumerable<object>), (int)System.Net.HttpStatusCode.OK)]
+    public IActionResult GetRecordInfo(int idRecord)
+    {
+        var result = witsInfoService.GetRecords(idRecord);
+        return Ok(result);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/WITS/WitsRecord1Controller.cs b/AsbCloudWebApi/Controllers/WITS/WitsRecord1Controller.cs
index f1c0043b..2fd8fa06 100644
--- a/AsbCloudWebApi/Controllers/WITS/WitsRecord1Controller.cs
+++ b/AsbCloudWebApi/Controllers/WITS/WitsRecord1Controller.cs
@@ -4,21 +4,20 @@ using AsbCloudWebApi.SignalR;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 
-namespace AsbCloudWebApi.Controllers.WITS
+namespace AsbCloudWebApi.Controllers.WITS;
+
+/// <summary>
+/// WITS записи id = 1
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public class WitsRecord1Controller : WitsControllerAbstract<Record1Dto>
 {
-    /// <summary>
-    /// WITS записи id = 1
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    public class WitsRecord1Controller : WitsControllerAbstract<Record1Dto>
-    {
-        protected override string SirnalRMethodGetDataName => "ReceiveWitsRecord1";
+    protected override string SirnalRMethodGetDataName => "ReceiveWitsRecord1";
 
-        public WitsRecord1Controller(
-            ITelemetryService telemetryService,
-            IHubContext<TelemetryHub> telemetryHubContext)
-        : base(telemetryService, telemetryHubContext) { }
+    public WitsRecord1Controller(
+        ITelemetryService telemetryService,
+        IHubContext<TelemetryHub> telemetryHubContext)
+    : base(telemetryService, telemetryHubContext) { }
 
-    }
 }
diff --git a/AsbCloudWebApi/Controllers/WITS/WitsRecord50Controller.cs b/AsbCloudWebApi/Controllers/WITS/WitsRecord50Controller.cs
index 3a2a04fb..f439871a 100644
--- a/AsbCloudWebApi/Controllers/WITS/WitsRecord50Controller.cs
+++ b/AsbCloudWebApi/Controllers/WITS/WitsRecord50Controller.cs
@@ -4,19 +4,18 @@ using AsbCloudWebApi.SignalR;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 
-namespace AsbCloudWebApi.Controllers.WITS
+namespace AsbCloudWebApi.Controllers.WITS;
+
+/// <summary>
+/// WITS записи id = 50 (SIB receiver)
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public class WitsRecord50Controller : WitsControllerAbstract<Record50Dto>
 {
-    /// <summary>
-    /// WITS записи id = 50 (SIB receiver)
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    public class WitsRecord50Controller : WitsControllerAbstract<Record50Dto>
-    {
-        protected override string SirnalRMethodGetDataName => "ReceiveWitsRecord50";
-        public WitsRecord50Controller(
-            ITelemetryService telemetryService,
-            IHubContext<TelemetryHub> telemetryHubContext)
-        : base(telemetryService, telemetryHubContext) { }
-    }
+    protected override string SirnalRMethodGetDataName => "ReceiveWitsRecord50";
+    public WitsRecord50Controller(
+        ITelemetryService telemetryService,
+        IHubContext<TelemetryHub> telemetryHubContext)
+    : base(telemetryService, telemetryHubContext) { }
 }
diff --git a/AsbCloudWebApi/Controllers/WITS/WitsRecord60Controller.cs b/AsbCloudWebApi/Controllers/WITS/WitsRecord60Controller.cs
index ddbdcaad..3265afc1 100644
--- a/AsbCloudWebApi/Controllers/WITS/WitsRecord60Controller.cs
+++ b/AsbCloudWebApi/Controllers/WITS/WitsRecord60Controller.cs
@@ -4,19 +4,18 @@ using AsbCloudWebApi.SignalR;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 
-namespace AsbCloudWebApi.Controllers.WITS
+namespace AsbCloudWebApi.Controllers.WITS;
+
+/// <summary>
+/// WITS записи id = 60 (SIB receiver)
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public class WitsRecord60Controller : WitsControllerAbstract<Record60Dto>
 {
-    /// <summary>
-    /// WITS записи id = 60 (SIB receiver)
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    public class WitsRecord60Controller : WitsControllerAbstract<Record60Dto>
-    {
-        protected override string SirnalRMethodGetDataName => "ReceiveWitsRecord60";
-        public WitsRecord60Controller(
-            ITelemetryService telemetryService,
-            IHubContext<TelemetryHub> telemetryHubContext)
-        : base(telemetryService, telemetryHubContext) { }
-    }
+    protected override string SirnalRMethodGetDataName => "ReceiveWitsRecord60";
+    public WitsRecord60Controller(
+        ITelemetryService telemetryService,
+        IHubContext<TelemetryHub> telemetryHubContext)
+    : base(telemetryService, telemetryHubContext) { }
 }
diff --git a/AsbCloudWebApi/Controllers/WITS/WitsRecord61Controller.cs b/AsbCloudWebApi/Controllers/WITS/WitsRecord61Controller.cs
index 51a5e280..34f526a0 100644
--- a/AsbCloudWebApi/Controllers/WITS/WitsRecord61Controller.cs
+++ b/AsbCloudWebApi/Controllers/WITS/WitsRecord61Controller.cs
@@ -4,19 +4,18 @@ using AsbCloudWebApi.SignalR;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 
-namespace AsbCloudWebApi.Controllers.WITS
+namespace AsbCloudWebApi.Controllers.WITS;
+
+/// <summary>
+/// WITS записи id = 61 (SIB receiver)
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public class WitsRecord61Controller : WitsControllerAbstract<Record61Dto>
 {
-    /// <summary>
-    /// WITS записи id = 61 (SIB receiver)
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    public class WitsRecord61Controller : WitsControllerAbstract<Record61Dto>
-    {
-        protected override string SirnalRMethodGetDataName => "ReceiveWitsRecord61";
-        public WitsRecord61Controller(
-            ITelemetryService telemetryService,
-            IHubContext<TelemetryHub> telemetryHubContext)
-        : base(telemetryService, telemetryHubContext) { }
-    }
+    protected override string SirnalRMethodGetDataName => "ReceiveWitsRecord61";
+    public WitsRecord61Controller(
+        ITelemetryService telemetryService,
+        IHubContext<TelemetryHub> telemetryHubContext)
+    : base(telemetryService, telemetryHubContext) { }
 }
diff --git a/AsbCloudWebApi/Controllers/WITS/WitsRecord7Controller.cs b/AsbCloudWebApi/Controllers/WITS/WitsRecord7Controller.cs
index c68ca6ab..040c815b 100644
--- a/AsbCloudWebApi/Controllers/WITS/WitsRecord7Controller.cs
+++ b/AsbCloudWebApi/Controllers/WITS/WitsRecord7Controller.cs
@@ -4,19 +4,18 @@ using AsbCloudWebApi.SignalR;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 
-namespace AsbCloudWebApi.Controllers.WITS
+namespace AsbCloudWebApi.Controllers.WITS;
+
+/// <summary>
+/// WITS записи id = 7
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public class WitsRecord7Controller : WitsControllerAbstract<Record7Dto>
 {
-    /// <summary>
-    /// WITS записи id = 7
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    public class WitsRecord7Controller : WitsControllerAbstract<Record7Dto>
-    {
-        protected override string SirnalRMethodGetDataName => "ReceiveWitsRecord7";
-        public WitsRecord7Controller(
-            ITelemetryService telemetryService,
-            IHubContext<TelemetryHub> telemetryHubContext)
-        : base(telemetryService, telemetryHubContext) { }
-    }
+    protected override string SirnalRMethodGetDataName => "ReceiveWitsRecord7";
+    public WitsRecord7Controller(
+        ITelemetryService telemetryService,
+        IHubContext<TelemetryHub> telemetryHubContext)
+    : base(telemetryService, telemetryHubContext) { }
 }
diff --git a/AsbCloudWebApi/Controllers/WITS/WitsRecord8Controller.cs b/AsbCloudWebApi/Controllers/WITS/WitsRecord8Controller.cs
index 499573ba..14006686 100644
--- a/AsbCloudWebApi/Controllers/WITS/WitsRecord8Controller.cs
+++ b/AsbCloudWebApi/Controllers/WITS/WitsRecord8Controller.cs
@@ -4,19 +4,18 @@ using AsbCloudWebApi.SignalR;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 
-namespace AsbCloudWebApi.Controllers.WITS
+namespace AsbCloudWebApi.Controllers.WITS;
+
+/// <summary>
+/// WITS записи id = 8
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public class WitsRecord8Controller : WitsControllerAbstract<Record8Dto>
 {
-    /// <summary>
-    /// WITS записи id = 8
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    public class WitsRecord8Controller : WitsControllerAbstract<Record8Dto>
-    {
-        protected override string SirnalRMethodGetDataName => "ReceiveWitsRecord8";
-        public WitsRecord8Controller(
-            ITelemetryService telemetryService,
-            IHubContext<TelemetryHub> telemetryHubContext)
-        : base(telemetryService, telemetryHubContext) { }
-    }
+    protected override string SirnalRMethodGetDataName => "ReceiveWitsRecord8";
+    public WitsRecord8Controller(
+        ITelemetryService telemetryService,
+        IHubContext<TelemetryHub> telemetryHubContext)
+    : base(telemetryService, telemetryHubContext) { }
 }
diff --git a/AsbCloudWebApi/Controllers/WellCompositeController.cs b/AsbCloudWebApi/Controllers/WellCompositeController.cs
index 59a4b867..00a34dfe 100644
--- a/AsbCloudWebApi/Controllers/WellCompositeController.cs
+++ b/AsbCloudWebApi/Controllers/WellCompositeController.cs
@@ -8,87 +8,85 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+
+/// <summary>
+/// Композитная скважина
+/// </summary>
+[Route("api/well/{idWell}/composite")]
+[ApiController]
+[Authorize]
+public class WellCompositeController : ControllerBase
 {
+    private readonly IWellCompositeRepository wellCompositeRepository;
+    private readonly IWellService wellService;
 
-    /// <summary>
-    /// Композитная скважина
-    /// </summary>
-    [Route("api/well/{idWell}/composite")]
-    [ApiController]
-    [Authorize]
-    public class WellCompositeController : ControllerBase
+    public WellCompositeController(IWellCompositeRepository wellCompositeRepository,
+        IWellService wellService)
     {
-        private readonly IWellCompositeRepository wellCompositeRepository;
-        private readonly IWellService wellService;
-
-        public WellCompositeController(IWellCompositeRepository wellCompositeRepository,
-            IWellService wellService)
-        {
-            this.wellCompositeRepository = wellCompositeRepository;
-            this.wellService = wellService;
-        }
-
-        /// <summary>
-        /// Получает композитную скважину для скважины
-        /// </summary>
-        /// <param name="idWell">id скважины для которой собрана композитная скважина</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<WellCompositeDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetAsync(int idWell, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await wellCompositeRepository.GetAsync(idWell, token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Создает или заменяет композитную скважину для скважины с idWell
-        /// </summary>
-        /// <param name="idWell">id скважины для которой собрана композитная скважина</param>
-        /// <param name="wellComposites">Секции композитной скважины</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Permission]
-        public async Task<IActionResult> SaveAsync(int idWell, IEnumerable<WellCompositeDto> wellComposites, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await wellCompositeRepository.SaveAsync(idWell, wellComposites, token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получение РТК по композитной скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("compositeProcessMap")]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<ProcessMapPlanBaseDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetCompositeProcessMap(int idWell, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await wellCompositeRepository.GetCompositeProcessMap(idWell, token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        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);
-        }
+        this.wellCompositeRepository = wellCompositeRepository;
+        this.wellService = wellService;
     }
 
+    /// <summary>
+    /// Получает композитную скважину для скважины
+    /// </summary>
+    /// <param name="idWell">id скважины для которой собрана композитная скважина</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet]
+    [Permission]
+    [ProducesResponseType(typeof(IEnumerable<WellCompositeDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetAsync(int idWell, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var result = await wellCompositeRepository.GetAsync(idWell, token).ConfigureAwait(false);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Создает или заменяет композитную скважину для скважины с idWell
+    /// </summary>
+    /// <param name="idWell">id скважины для которой собрана композитная скважина</param>
+    /// <param name="wellComposites">Секции композитной скважины</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Permission]
+    public async Task<IActionResult> SaveAsync(int idWell, IEnumerable<WellCompositeDto> wellComposites, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var result = await wellCompositeRepository.SaveAsync(idWell, wellComposites, token).ConfigureAwait(false);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получение РТК по композитной скважине
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("compositeProcessMap")]
+    [Permission]
+    [ProducesResponseType(typeof(IEnumerable<ProcessMapPlanBaseDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetCompositeProcessMap(int idWell, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var result = await wellCompositeRepository.GetCompositeProcessMap(idWell, token).ConfigureAwait(false);
+        return Ok(result);
+    }
+
+    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);
+    }
 }
diff --git a/AsbCloudWebApi/Controllers/WellCompositeOperationController.cs b/AsbCloudWebApi/Controllers/WellCompositeOperationController.cs
index 07272e5d..33a20df9 100644
--- a/AsbCloudWebApi/Controllers/WellCompositeOperationController.cs
+++ b/AsbCloudWebApi/Controllers/WellCompositeOperationController.cs
@@ -7,46 +7,44 @@ using System.Threading;
 using System.Threading.Tasks;
 using AsbCloudApp.Data.WellOperation;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+
+[ApiController]
+[Authorize]
+[Route("api/[controller]")]
+public class WellCompositeOperationController : ControllerBase
 {
+    private readonly IWellCompositeOperationService wellCompositeOperationService;
+    private readonly IWellService wellService;
 
-    [ApiController]
-    [Authorize]
-    [Route("api/[controller]")]
-    public class WellCompositeOperationController : ControllerBase
+    public WellCompositeOperationController(IWellCompositeOperationService wellCompositeOperationService, IWellService wellService)
     {
-        private readonly IWellCompositeOperationService wellCompositeOperationService;
-        private readonly IWellService wellService;
-
-        public WellCompositeOperationController(IWellCompositeOperationService wellCompositeOperationService, IWellService wellService)
-        {
-            this.wellCompositeOperationService = wellCompositeOperationService;
-            this.wellService = wellService;
-        }
-
-        [HttpGet]
-        [ProducesResponseType(typeof(WellCompositeOperationDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetAsync([FromQuery] IEnumerable<int> idsWells, CancellationToken token)
-        {
-            foreach (var idWell in idsWells)
-                if (!await UserHasAccessToWellAsync(idWell, token))
-                    return Forbid();
-
-            var result = await wellCompositeOperationService.GetAsync(idsWells, token)
-                .ConfigureAwait(false);
-
-            return Ok(result);
-        }
-
-        protected async Task<bool> UserHasAccessToWellAsync(int idWell, CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
-            if (idCompany is not null &&
-                await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, token)
-                    .ConfigureAwait(false))
-                return true;
-            return false;
-        }
+        this.wellCompositeOperationService = wellCompositeOperationService;
+        this.wellService = wellService;
     }
 
+    [HttpGet]
+    [ProducesResponseType(typeof(WellCompositeOperationDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetAsync([FromQuery] IEnumerable<int> idsWells, CancellationToken token)
+    {
+        foreach (var idWell in idsWells)
+            if (!await UserHasAccessToWellAsync(idWell, token))
+                return Forbid();
+
+        var result = await wellCompositeOperationService.GetAsync(idsWells, token)
+            .ConfigureAwait(false);
+
+        return Ok(result);
+    }
+
+    protected async Task<bool> UserHasAccessToWellAsync(int idWell, CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
+        if (idCompany is not null &&
+            await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, token)
+                .ConfigureAwait(false))
+            return true;
+        return false;
+    }
 }
diff --git a/AsbCloudWebApi/Controllers/WellContactController.cs b/AsbCloudWebApi/Controllers/WellContactController.cs
index 1bd43564..d7769db2 100644
--- a/AsbCloudWebApi/Controllers/WellContactController.cs
+++ b/AsbCloudWebApi/Controllers/WellContactController.cs
@@ -9,200 +9,199 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// контроллер с контактной информацией по скважине
+/// </summary>
+[Route("api/well/{idWell}/[controller]")]
+[ApiController]
+[Authorize]
+public class WellContactController : ControllerBase
 {
-    /// <summary>
-    /// контроллер с контактной информацией по скважине
-    /// </summary>
-    [Route("api/well/{idWell}/[controller]")]
-    [ApiController]
-    [Authorize]
-    public class WellContactController : ControllerBase
+    private readonly IWellContactService wellContactsRepository;
+    private readonly IWellService wellService;
+
+    public WellContactController(IWellContactService wellContactsRepository, IWellService wellService)
     {
-        private readonly IWellContactService wellContactsRepository;
-        private readonly IWellService wellService;
+        this.wellContactsRepository = wellContactsRepository;
+        this.wellService = wellService;
+    }
 
-        public WellContactController(IWellContactService wellContactsRepository, IWellService wellService)
+    /// <summary>
+    /// получение списка типов контактов
+    /// </summary>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("type")]
+    [ProducesResponseType(typeof(IEnumerable<CompanyTypeDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetTypesAsync(CancellationToken token)
+    {
+        var result = await wellContactsRepository.GetTypesAsync(token);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получение контактов по типу контакта и ключу скважины
+    /// </summary>
+    /// <param name="idWell">ключ скважины</param>
+    /// <param name="contactTypeId">тип контакта</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("type/{contactTypeId}")]
+    [ProducesResponseType(typeof(IEnumerable<ContactDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetByTypeAsync(int idWell, int contactTypeId, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var request = new WellContactRequest()
         {
-            this.wellContactsRepository = wellContactsRepository;
-            this.wellService = wellService;
-        }
+            IdsWells = new int[] { idWell },
+            ContactTypeId = contactTypeId
+        };
 
-        /// <summary>
-        /// получение списка типов контактов
-        /// </summary>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("type")]
-        [ProducesResponseType(typeof(IEnumerable<CompanyTypeDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetTypesAsync(CancellationToken token)
-        {
-            var result = await wellContactsRepository.GetTypesAsync(token);
-            return Ok(result);
-        }
+        var result = await wellContactsRepository.GetAllAsync(request, token);
+        return Ok(result);
+    }
 
-        /// <summary>
-        /// Получение контактов по типу контакта и ключу скважины
-        /// </summary>
-        /// <param name="idWell">ключ скважины</param>
-        /// <param name="contactTypeId">тип контакта</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("type/{contactTypeId}")]
-        [ProducesResponseType(typeof(IEnumerable<ContactDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetByTypeAsync(int idWell, int contactTypeId, CancellationToken token)
+    /// <summary>
+    /// Получение контактов по массиву ключей скважины
+    /// </summary>
+    /// <param name="idsWells">ключи скважин</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("/api/well/[controller]")]
+    [ProducesResponseType(typeof(IEnumerable<ContactDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetAllAsync([FromQuery] IEnumerable<int> idsWells, CancellationToken token)
+    {
+        foreach(var idWell in idsWells)
         {
             if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
                 return Forbid();
-
-            var request = new WellContactRequest()
-            {
-                IdsWells = new int[] { idWell },
-                ContactTypeId = contactTypeId
-            };
-
-            var result = await wellContactsRepository.GetAllAsync(request, token);
-            return Ok(result);
         }
 
-        /// <summary>
-        /// Получение контактов по массиву ключей скважины
-        /// </summary>
-        /// <param name="idsWells">ключи скважин</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("/api/well/[controller]")]
-        [ProducesResponseType(typeof(IEnumerable<ContactDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetAllAsync([FromQuery] IEnumerable<int> idsWells, CancellationToken token)
+        var request = new WellContactRequest()
         {
-            foreach(var idWell in idsWells)
-            {
-                if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                    return Forbid();
-            }
+            IdsWells = idsWells
+        };
 
-            var request = new WellContactRequest()
-            {
-                IdsWells = idsWells
-            };
+        var result = await wellContactsRepository.GetAllAsync(request, token);
+        return Ok(result);
+    }
 
-            var result = await wellContactsRepository.GetAllAsync(request, token);
-            return Ok(result);
-        }
+    /// <summary>
+    /// Получение контакта по ключу
+    /// </summary>
+    /// <param name="idWell">ключ скважины</param>
+    /// <param name="id">ключ контакта</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("{id}")]
+    [ProducesResponseType(typeof(ContactDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetAsync(int idWell, int id, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-        /// <summary>
-        /// Получение контакта по ключу
-        /// </summary>
-        /// <param name="idWell">ключ скважины</param>
-        /// <param name="id">ключ контакта</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("{id}")]
-        [ProducesResponseType(typeof(ContactDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetAsync(int idWell, int id, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
+        var result = await wellContactsRepository.GetAsync(idWell, id, token);
+        return Ok(result);
+    }
 
-            var result = await wellContactsRepository.GetAsync(idWell, id, token);
-            return Ok(result);
-        }
+    /// <summary>
+    /// добавление нового контакта
+    /// </summary>
+    /// <param name="contactDto">контакт</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> InsertAsync(
+        [FromBody] ContactDto contactDto,
+        CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(contactDto.IdWell, token).ConfigureAwait(false))
+            return Forbid();
 
-        /// <summary>
-        /// добавление нового контакта
-        /// </summary>
-        /// <param name="contactDto">контакт</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> InsertAsync(
-            [FromBody] ContactDto contactDto,
-            CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(contactDto.IdWell, token).ConfigureAwait(false))
-                return Forbid();
+        var result = await wellContactsRepository.InsertAsync(contactDto, token);
 
-            var result = await wellContactsRepository.InsertAsync(contactDto, token);
+        return Ok(result);
+    }
 
-            return Ok(result);
-        }
+    /// <summary>
+    /// изменение контакта
+    /// </summary>
+    /// <param name="contactDto">контакт</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPut]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> UpdateAsync(
+        [FromBody] ContactDto contactDto,
+        CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(contactDto.IdWell, token).ConfigureAwait(false))
+            return Forbid();
 
-        /// <summary>
-        /// изменение контакта
-        /// </summary>
-        /// <param name="contactDto">контакт</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPut]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> UpdateAsync(
-            [FromBody] ContactDto contactDto,
-            CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(contactDto.IdWell, token).ConfigureAwait(false))
-                return Forbid();
+        var result = await wellContactsRepository.UpdateAsync(contactDto, token);
 
-            var result = await wellContactsRepository.UpdateAsync(contactDto, token);
-
-            return Ok(result);
-        }
+        return Ok(result);
+    }
 
 
-        /// <summary>
-        /// Удаление контакта
-        /// </summary>
-        /// <param name="idWell">ключ скважины</param>
-        /// <param name="id">id контакта</param>
-        /// <param name="token">Токен отмены задачи</param>
-        /// <returns>Количество удаленных из БД строк</returns>
-        [HttpDelete("{id}")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> DeleteAsync(int idWell, int id, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
+    /// <summary>
+    /// Удаление контакта
+    /// </summary>
+    /// <param name="idWell">ключ скважины</param>
+    /// <param name="id">id контакта</param>
+    /// <param name="token">Токен отмены задачи</param>
+    /// <returns>Количество удаленных из БД строк</returns>
+    [HttpDelete("{id}")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> DeleteAsync(int idWell, int id, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-            var result = await wellContactsRepository.DeleteAsync(idWell, id, token);
+        var result = await wellContactsRepository.DeleteAsync(idWell, id, token);
 
-            return Ok(result);
-        }
+        return Ok(result);
+    }
 
-        /// <summary>
-        /// Скопировать контакты в другую скважину 
-        /// </summary>
-        /// <param name="idWell">ключ скважины, откуда копировать контакты</param>
-        /// <param name="idWellTarget">ключ скважины, куда копировать контакты</param>
-        /// <param name="contactIds"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPost("copy/{idWellTarget}")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> CopyAsync(
-            int idWell,
-            int idWellTarget,
-            [FromBody] IEnumerable<int> contactIds,
-            CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
+    /// <summary>
+    /// Скопировать контакты в другую скважину 
+    /// </summary>
+    /// <param name="idWell">ключ скважины, откуда копировать контакты</param>
+    /// <param name="idWellTarget">ключ скважины, куда копировать контакты</param>
+    /// <param name="contactIds"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPost("copy/{idWellTarget}")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> CopyAsync(
+        int idWell,
+        int idWellTarget,
+        [FromBody] IEnumerable<int> contactIds,
+        CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-            if (!await CanUserAccessToWellAsync(idWellTarget, token).ConfigureAwait(false))
-                return Forbid();
+        if (!await CanUserAccessToWellAsync(idWellTarget, token).ConfigureAwait(false))
+            return Forbid();
 
-            var result = await wellContactsRepository.CopyAsync(idWell, idWellTarget, contactIds, token);
+        var result = await wellContactsRepository.CopyAsync(idWell, idWellTarget, contactIds, token);
 
-            return Ok(result);
-        }
+        return Ok(result);
+    }
 
-        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);
-        }
+    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);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/WellController.cs b/AsbCloudWebApi/Controllers/WellController.cs
index 4f00eb98..98e44773 100644
--- a/AsbCloudWebApi/Controllers/WellController.cs
+++ b/AsbCloudWebApi/Controllers/WellController.cs
@@ -9,145 +9,144 @@ using System.ComponentModel.DataAnnotations;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+/// <summary>
+/// Инфо о скважине
+/// </summary>
+[Route("api/well")]
+[ApiController]
+[Authorize]
+public class WellController : ControllerBase
 {
-    /// <summary>
-    /// Инфо о скважине
-    /// </summary>
-    [Route("api/well")]
-    [ApiController]
-    [Authorize]
-    public class WellController : ControllerBase
+    private readonly IWellService wellService;
+
+    public WellController(IWellService wellService)
     {
-        private readonly IWellService wellService;
+        this.wellService = wellService;
+    }
 
-        public WellController(IWellService wellService)
-        {
-            this.wellService = wellService;
-        }
+    /// <summary>
+    /// Возвращает список доступных скважин
+    /// </summary>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns>Список скважин</returns>
+    [HttpGet]
+    [Permission]
+    [ProducesResponseType(typeof(IEnumerable<WellDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetWellsAsync(CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
 
-        /// <summary>
-        /// Возвращает список доступных скважин
-        /// </summary>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns>Список скважин</returns>
-        [HttpGet]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<WellDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetWellsAsync(CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
+        if (idCompany is null)
+            return NoContent();
 
-            if (idCompany is null)
-                return NoContent();
+        var wells = await wellService.GetAsync(new() { IdCompany = idCompany },
+            token).ConfigureAwait(false);
 
-            var wells = await wellService.GetAsync(new() { IdCompany = idCompany },
-                token).ConfigureAwait(false);
+        return Ok(wells);
+    }
 
-            return Ok(wells);
-        }
+    /// <summary>
+    /// Возвращает список доступных скважин
+    /// </summary>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns>Список скважин</returns>
+    [HttpGet("wellTree")]
+    [ProducesResponseType(typeof(IEnumerable<DepositBranchDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetWellTreeAsync(CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
 
-        /// <summary>
-        /// Возвращает список доступных скважин
-        /// </summary>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns>Список скважин</returns>
-        [HttpGet("wellTree")]
-        [ProducesResponseType(typeof(IEnumerable<DepositBranchDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetWellTreeAsync(CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
+        if (idCompany is null)
+            return NoContent();
 
-            if (idCompany is null)
-                return NoContent();
+        var wells = await wellService.GetWellTreeAsync((int)idCompany,
+            token).ConfigureAwait(false);
 
-            var wells = await wellService.GetWellTreeAsync((int)idCompany,
-                token).ConfigureAwait(false);
+        return Ok(wells);
+    }
 
-            return Ok(wells);
-        }
+    /// <summary>
+    /// Возвращает информацию о требуемой скважине 
+    /// </summary>
+    /// <param name="idWell"> Id требуемой скважины </param>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns>Информация о требуемой скважине </returns>
+    [HttpGet("{idWell}")]
+    [Permission]
+    [ProducesResponseType(typeof(WellMapInfoWithTelemetryStat), (int)System.Net.HttpStatusCode.OK)]
+    [ProducesResponseType((int)System.Net.HttpStatusCode.NoContent)]
+    public async Task<IActionResult> GetAsync(int idWell, CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
 
-        /// <summary>
-        /// Возвращает информацию о требуемой скважине 
-        /// </summary>
-        /// <param name="idWell"> Id требуемой скважины </param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns>Информация о требуемой скважине </returns>
-        [HttpGet("{idWell}")]
-        [Permission]
-        [ProducesResponseType(typeof(WellMapInfoWithTelemetryStat), (int)System.Net.HttpStatusCode.OK)]
-        [ProducesResponseType((int)System.Net.HttpStatusCode.NoContent)]
-        public async Task<IActionResult> GetAsync(int idWell, CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
+        if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync(idCompany ?? default, idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-            if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync(idCompany ?? default, idWell, token).ConfigureAwait(false))
-                return Forbid();
+        var well = await wellService.GetOrDefaultStatAsync(idWell, token);
 
-            var well = await wellService.GetOrDefaultStatAsync(idWell, token);
+        return Ok(well);
+    }
 
-            return Ok(well);
-        }
+    /// <summary>
+    /// Редактирует указанные поля скважины
+    /// </summary>
+    /// <param name="dto"> Объект параметров скважины.
+    /// IdWellType: 1 - Наклонно-направленная, 2 - Горизонтальная.
+    /// State: 0 - Неизвестно, 1 - В работе, 2 - Завершена.</param>
+    /// <param name="token"> Токен отмены задачи </param>
+    /// <returns></returns>
+    [HttpPut]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> UpdateWellAsync(WellDto dto,
+        CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
 
-        /// <summary>
-        /// Редактирует указанные поля скважины
-        /// </summary>
-        /// <param name="dto"> Объект параметров скважины.
-        /// IdWellType: 1 - Наклонно-направленная, 2 - Горизонтальная.
-        /// State: 0 - Неизвестно, 1 - В работе, 2 - Завершена.</param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns></returns>
-        [HttpPut]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> UpdateWellAsync(WellDto dto,
-            CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
+        if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            dto.Id, token).ConfigureAwait(false))
+            return Forbid();
 
-            if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                dto.Id, token).ConfigureAwait(false))
-                return Forbid();
+        var result = await wellService.UpdateAsync(dto, token)
+            .ConfigureAwait(false);
 
-            var result = await wellService.UpdateAsync(dto, token)
-                .ConfigureAwait(false);
+        return Ok(result);
 
-            return Ok(result);
+    }
 
-        }
+    /// <summary>
+    /// Обновляет статус скважины
+    /// </summary>
+    /// <param name="idWell">ключ скважины</param>
+    /// <param name="idState">статус: 0 - Неизвестно, 1 - В работе, 2 - Завершена.</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPut("{idWell}/state")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> UpdateWellStateAsync(int idWell,
+        [Range(0, 2, ErrorMessage = "Статус некорректен")] int idState,
+        CancellationToken token)
+    {
+        var idCompany = User.GetCompanyId();
 
-        /// <summary>
-        /// Обновляет статус скважины
-        /// </summary>
-        /// <param name="idWell">ключ скважины</param>
-        /// <param name="idState">статус: 0 - Неизвестно, 1 - В работе, 2 - Завершена.</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPut("{idWell}/state")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> UpdateWellStateAsync(int idWell,
-            [Range(0, 2, ErrorMessage = "Статус некорректен")] int idState,
-            CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
+        if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
+            idWell, token).ConfigureAwait(false))
+            return Forbid();
 
-            if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
-                idWell, token).ConfigureAwait(false))
-                return Forbid();
+        var dto = await wellService.GetOrDefaultAsync(idWell, token);
+        
+        if (dto is null)
+            return this.ValidationBadRequest(nameof(idWell), $"Скважина с id: {idWell} недоступна");
 
-            var dto = await wellService.GetOrDefaultAsync(idWell, token);
-            
-            if (dto is null)
-                return this.ValidationBadRequest(nameof(idWell), $"Скважина с id: {idWell} недоступна");
+        dto.IdState = idState;
 
-            dto.IdState = idState;
+        var result = await wellService.UpdateAsync(dto, token)
+            .ConfigureAwait(false);
 
-            var result = await wellService.UpdateAsync(dto, token)
-                .ConfigureAwait(false);
+        return Ok(result);
 
-            return Ok(result);
-
-        }
     }
 }
diff --git a/AsbCloudWebApi/Controllers/WellFinalDocumentsController.cs b/AsbCloudWebApi/Controllers/WellFinalDocumentsController.cs
index 1d16f564..62a83c0d 100644
--- a/AsbCloudWebApi/Controllers/WellFinalDocumentsController.cs
+++ b/AsbCloudWebApi/Controllers/WellFinalDocumentsController.cs
@@ -10,170 +10,168 @@ using System.ComponentModel.DataAnnotations;
 using AsbCloudApp.Repositories;
 using AsbCloudApp.Data.User;
 
-namespace AsbCloudWebApi.Controllers
+namespace AsbCloudWebApi.Controllers;
+
+
+/// <summary>
+/// Дело скважины
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+[Authorize]
+public class WellFinalDocumentsController : ControllerBase
 {
+    private readonly IWellFinalDocumentsService wellFinalDocumentsService;
+    private readonly IWellService wellService;
+    private readonly IFileCategoryService fileCategoryService;
+    private readonly IWellFinalDocumentsRepository wellFinalDocumentsRepository;
 
-    /// <summary>
-    /// Дело скважины
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    [Authorize]
-    public class WellFinalDocumentsController : ControllerBase
+    public WellFinalDocumentsController(
+        IWellFinalDocumentsService wellFinalDocumentsService, 
+        IWellService wellService, 
+        IFileCategoryService fileCategoryService,
+        IWellFinalDocumentsRepository wellFinalDocumentsRepository)
     {
-        private readonly IWellFinalDocumentsService wellFinalDocumentsService;
-        private readonly IWellService wellService;
-        private readonly IFileCategoryService fileCategoryService;
-        private readonly IWellFinalDocumentsRepository wellFinalDocumentsRepository;
-
-        public WellFinalDocumentsController(
-            IWellFinalDocumentsService wellFinalDocumentsService, 
-            IWellService wellService, 
-            IFileCategoryService fileCategoryService,
-            IWellFinalDocumentsRepository wellFinalDocumentsRepository)
-        {
-            this.wellFinalDocumentsService = wellFinalDocumentsService;
-            this.wellService = wellService;
-            this.fileCategoryService = fileCategoryService;
-            this.wellFinalDocumentsRepository = wellFinalDocumentsRepository;
-        }
-
-        /// <summary>
-        /// Получение всех записей
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("{idWell}")]
-        [Permission]
-        [ProducesResponseType(typeof(WellCaseDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetAsync(int idWell, CancellationToken token)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var idUser = User!.GetUserId()!;
-            var data = await wellFinalDocumentsRepository.GetByWellIdAsync(idWell, idUser.Value, token);
-            return Ok(data);
-        }
-
-        /// <summary>
-        /// Получение списка ответственных
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("{idWell}/availableUsers")]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<UserDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetAvailableUsersAsync(int idWell, CancellationToken token )
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var data = await wellFinalDocumentsRepository.GetAvailableUsersAsync(idWell, token);
-            return Ok(data);
-        }
-
-        /// <summary>
-        /// Обновление всех записей по скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="dtos"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPut("{idWell}")]
-        [Permission("WellFinalDocuments.editPublisher")]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> UpdateRangeAsync(int idWell, [Required] IEnumerable<WellFinalDocumentInputDto> dtos, CancellationToken token )
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-            var data = await wellFinalDocumentsService.UpdateRangeAsync(idWell, dtos, token);
-            return Ok(data);
-        }
-
-        /// <summary>
-        /// Повторно оповестить ответственных за загрузку
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idCategory"></param>
-        /// <param name="token"></param>
-        /// <returns>количество оповещенных публикаторов</returns>
-        [HttpPut("{idWell}/reNotifyPublishers")]
-        [Permission("WellFinalDocuments.editPublisher")]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> ReNotifyPublishersAsync(int idWell, [Required] int idCategory, CancellationToken token )
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var idUser = User!.GetUserId()!;
-            var data = await wellFinalDocumentsService.ReNotifyPublishersAsync(idWell, idUser.Value, idCategory, token);
-            return Ok(data);
-        }
-
-        /// <summary>
-        /// Получение истории файлов
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idCategory"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("{idWell}/history")]
-        [Permission]
-        [ProducesResponseType(typeof(WellFinalDocumentsHistoryDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetFilesHistoryByIdCategoryAsync(int idWell, 
-            [Required] int idCategory, 
-            CancellationToken token )
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var data = await this.wellFinalDocumentsService.GetFilesHistoryByIdCategoryAsync(idWell, idCategory, token);
-            return Ok(data);
-        }
-
-        /// <summary>
-        /// Сохранение файла
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idCategory"></param>
-        /// <param name="file"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpPost("{idWell}")]
-        [Permission]
-        [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> SaveCategoryFileAsync(int idWell, [Required] int idCategory, [Required] IFormFile file, CancellationToken token )
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var idUser = User!.GetUserId()!;
-            var fileStream = file.OpenReadStream();
-            var data = await this.wellFinalDocumentsService.SaveCategoryFileAsync(idWell, idCategory, idUser.Value, fileStream, file.FileName, token);
-            return Ok(data);
-        }
-
-        /// <summary>
-        /// Получение справочника категорий файлов
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("wellCaseCategories")]
-        [Permission]
-        public async Task<IActionResult> GetWellCaseCategoriesAsync(CancellationToken token)
-        {
-            var data = await fileCategoryService.GetWellCaseCategoriesAsync(token);
-            return Ok(data);
-        }
-
-        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);
-        }
+        this.wellFinalDocumentsService = wellFinalDocumentsService;
+        this.wellService = wellService;
+        this.fileCategoryService = fileCategoryService;
+        this.wellFinalDocumentsRepository = wellFinalDocumentsRepository;
     }
 
+    /// <summary>
+    /// Получение всех записей
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("{idWell}")]
+    [Permission]
+    [ProducesResponseType(typeof(WellCaseDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetAsync(int idWell, CancellationToken token)
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var idUser = User!.GetUserId()!;
+        var data = await wellFinalDocumentsRepository.GetByWellIdAsync(idWell, idUser.Value, token);
+        return Ok(data);
+    }
+
+    /// <summary>
+    /// Получение списка ответственных
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("{idWell}/availableUsers")]
+    [Permission]
+    [ProducesResponseType(typeof(IEnumerable<UserDto>), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetAvailableUsersAsync(int idWell, CancellationToken token )
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var data = await wellFinalDocumentsRepository.GetAvailableUsersAsync(idWell, token);
+        return Ok(data);
+    }
+
+    /// <summary>
+    /// Обновление всех записей по скважине
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPut("{idWell}")]
+    [Permission("WellFinalDocuments.editPublisher")]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> UpdateRangeAsync(int idWell, [Required] IEnumerable<WellFinalDocumentInputDto> dtos, CancellationToken token )
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+        var data = await wellFinalDocumentsService.UpdateRangeAsync(idWell, dtos, token);
+        return Ok(data);
+    }
+
+    /// <summary>
+    /// Повторно оповестить ответственных за загрузку
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idCategory"></param>
+    /// <param name="token"></param>
+    /// <returns>количество оповещенных публикаторов</returns>
+    [HttpPut("{idWell}/reNotifyPublishers")]
+    [Permission("WellFinalDocuments.editPublisher")]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> ReNotifyPublishersAsync(int idWell, [Required] int idCategory, CancellationToken token )
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var idUser = User!.GetUserId()!;
+        var data = await wellFinalDocumentsService.ReNotifyPublishersAsync(idWell, idUser.Value, idCategory, token);
+        return Ok(data);
+    }
+
+    /// <summary>
+    /// Получение истории файлов
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idCategory"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpGet("{idWell}/history")]
+    [Permission]
+    [ProducesResponseType(typeof(WellFinalDocumentsHistoryDto), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> GetFilesHistoryByIdCategoryAsync(int idWell, 
+        [Required] int idCategory, 
+        CancellationToken token )
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var data = await this.wellFinalDocumentsService.GetFilesHistoryByIdCategoryAsync(idWell, idCategory, token);
+        return Ok(data);
+    }
+
+    /// <summary>
+    /// Сохранение файла
+    /// </summary>
+    /// <param name="idWell"></param>
+    /// <param name="idCategory"></param>
+    /// <param name="file"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    [HttpPost("{idWell}")]
+    [Permission]
+    [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
+    public async Task<IActionResult> SaveCategoryFileAsync(int idWell, [Required] int idCategory, [Required] IFormFile file, CancellationToken token )
+    {
+        if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+            return Forbid();
+
+        var idUser = User!.GetUserId()!;
+        var fileStream = file.OpenReadStream();
+        var data = await this.wellFinalDocumentsService.SaveCategoryFileAsync(idWell, idCategory, idUser.Value, fileStream, file.FileName, token);
+        return Ok(data);
+    }
+
+    /// <summary>
+    /// Получение справочника категорий файлов
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("wellCaseCategories")]
+    [Permission]
+    public async Task<IActionResult> GetWellCaseCategoriesAsync(CancellationToken token)
+    {
+        var data = await fileCategoryService.GetWellCaseCategoriesAsync(token);
+        return Ok(data);
+    }
+
+    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);
+    }
 }
diff --git a/AsbCloudWebApi/Conventions/ApiExplorerGroupPerVersionConvention.cs b/AsbCloudWebApi/Conventions/ApiExplorerGroupPerVersionConvention.cs
index db3de7d8..bd247c38 100644
--- a/AsbCloudWebApi/Conventions/ApiExplorerGroupPerVersionConvention.cs
+++ b/AsbCloudWebApi/Conventions/ApiExplorerGroupPerVersionConvention.cs
@@ -1,13 +1,12 @@
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using System.Linq;
 
-namespace AsbCloudWebApi.Conventions
+namespace AsbCloudWebApi.Conventions;
+
+public class ApiExplorerGroupPerVersionConvention : IControllerModelConvention
 {
-    public class ApiExplorerGroupPerVersionConvention : IControllerModelConvention
+    public void Apply(ControllerModel controller)
     {
-        public void Apply(ControllerModel controller)
-        {
-            controller.ApiExplorer.GroupName = "v1";
-        }
+        controller.ApiExplorer.GroupName = "v1";
     }
 }
\ No newline at end of file
diff --git a/AsbCloudWebApi/Converters/DateOnlyJsonConverter.cs b/AsbCloudWebApi/Converters/DateOnlyJsonConverter.cs
index c2b0282b..5f5a1da2 100644
--- a/AsbCloudWebApi/Converters/DateOnlyJsonConverter.cs
+++ b/AsbCloudWebApi/Converters/DateOnlyJsonConverter.cs
@@ -2,21 +2,19 @@ using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace AsbCloudWebApi.Converters
+namespace AsbCloudWebApi.Converters;
+
+
+public class DateOnlyJsonConverter : JsonConverter<DateOnly>
 {
-
-    public class DateOnlyJsonConverter : JsonConverter<DateOnly>
+    public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return DateOnly.FromDateTime(reader.GetDateTime());
-        }
-
-        public override void Write(Utf8JsonWriter writer, DateOnly value, JsonSerializerOptions options)
-        {
-            var isoDate = value.ToString("O");
-            writer.WriteStringValue(isoDate);
-        }
+        return DateOnly.FromDateTime(reader.GetDateTime());
     }
 
+    public override void Write(Utf8JsonWriter writer, DateOnly value, JsonSerializerOptions options)
+    {
+        var isoDate = value.ToString("O");
+        writer.WriteStringValue(isoDate);
+    }
 }
diff --git a/AsbCloudWebApi/Converters/DateOnlyTypeConverter.cs b/AsbCloudWebApi/Converters/DateOnlyTypeConverter.cs
index 03f4b552..9c3c9712 100644
--- a/AsbCloudWebApi/Converters/DateOnlyTypeConverter.cs
+++ b/AsbCloudWebApi/Converters/DateOnlyTypeConverter.cs
@@ -4,48 +4,46 @@ using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace AsbCloudWebApi.Converters
+namespace AsbCloudWebApi.Converters;
+
+
+public class DateOnlyTypeConverter : TypeConverter
 {
-
-    public class DateOnlyTypeConverter : TypeConverter
+    public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
     {
-        public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
+        if (sourceType == typeof(string))
         {
-            if (sourceType == typeof(string))
-            {
-                return true;
-            }
-            return base.CanConvertFrom(context, sourceType);
-        }
-
-        public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
-        {
-            if (value is string str)
-            {
-                if (DateTimeOffset.TryParse(str, out DateTimeOffset dateTime))
-                    return DateOnly.FromDateTime(dateTime.Date);
-                if (DateTime.TryParse(str, out DateTime date))
-                    return DateOnly.FromDateTime(date);
-            }
-            return base.ConvertFrom(context, culture, value);
-        }
-
-        public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destinationType)
-        {
-            if (destinationType == typeof(string))
-            {
-                return true;
-            }
-            return base.CanConvertTo(context, destinationType);
-        }
-        public override object? ConvertTo(ITypeDescriptorContext? context, CultureInfo? culture, object? value, Type destinationType)
-        {
-            if (destinationType == typeof(string) && value is DateOnly date)
-            {
-                return date.ToString("O");
-            }
-            return base.ConvertTo(context, culture, value, destinationType);
+            return true;
         }
+        return base.CanConvertFrom(context, sourceType);
     }
 
+    public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
+    {
+        if (value is string str)
+        {
+            if (DateTimeOffset.TryParse(str, out DateTimeOffset dateTime))
+                return DateOnly.FromDateTime(dateTime.Date);
+            if (DateTime.TryParse(str, out DateTime date))
+                return DateOnly.FromDateTime(date);
+        }
+        return base.ConvertFrom(context, culture, value);
+    }
+
+    public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destinationType)
+    {
+        if (destinationType == typeof(string))
+        {
+            return true;
+        }
+        return base.CanConvertTo(context, destinationType);
+    }
+    public override object? ConvertTo(ITypeDescriptorContext? context, CultureInfo? culture, object? value, Type destinationType)
+    {
+        if (destinationType == typeof(string) && value is DateOnly date)
+        {
+            return date.ToString("O");
+        }
+        return base.ConvertTo(context, culture, value, destinationType);
+    }
 }
diff --git a/AsbCloudWebApi/Converters/JsonValueJsonConverter.cs b/AsbCloudWebApi/Converters/JsonValueJsonConverter.cs
index 6ff6c52b..096c5946 100644
--- a/AsbCloudWebApi/Converters/JsonValueJsonConverter.cs
+++ b/AsbCloudWebApi/Converters/JsonValueJsonConverter.cs
@@ -4,71 +4,70 @@ using System.Text.Json.Serialization;
 using System.Text.Json;
 using AsbCloudApp.Data.GTR;
 
-namespace AsbCloudWebApi.Converters
+namespace AsbCloudWebApi.Converters;
+
+public class JsonValueJsonConverter : JsonConverter<JsonValue>
 {
-    public class JsonValueJsonConverter : JsonConverter<JsonValue>
+    public override JsonValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        public override JsonValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        if (reader.TokenType == JsonTokenType.String)
         {
-            if (reader.TokenType == JsonTokenType.String)
-            {
-                var stringVal = reader.GetString() ?? string.Empty;
-                return new JsonValue(stringVal);
-            }
-
-            if (reader.TokenType == JsonTokenType.Number)
-            {
-                if (reader.TryGetInt32(out int intVal))
-                    return new JsonValue(intVal);
-
-                if (reader.TryGetDouble(out double doubleVal))
-                    return new JsonValue((float)doubleVal);
-            }
-
-            throw new FormatException($"Wrong format at position {reader.Position}");
+            var stringVal = reader.GetString() ?? string.Empty;
+            return new JsonValue(stringVal);
         }
 
-        public override void Write(Utf8JsonWriter writer, JsonValue value, JsonSerializerOptions options)
+        if (reader.TokenType == JsonTokenType.Number)
         {
-            if (value.Value is string strValue)
-            {
-                writer.WriteStringValue(FormatString(strValue));
-                return;
-            }
+            if (reader.TryGetInt32(out int intVal))
+                return new JsonValue(intVal);
 
-            if (value.Value is int intValue)
-            {
-                writer.WriteNumberValue(intValue);
-                return;
-            }
-
-            if (value.Value is short shortValue)
-            {
-                writer.WriteNumberValue(shortValue);
-                return;
-            }
-
-            if (value.Value is float floatValue)
-            {
-                writer.WriteRawValue(floatValue.ToString("#0.0##", CultureInfo.InvariantCulture), true);
-                return;
-            }
-
-            if (value.Value is double doubleValue)
-            {
-                writer.WriteRawValue(doubleValue.ToString("#0.0##", CultureInfo.InvariantCulture), true);
-                return;
-            }
-
-            var typeName = value.Value.GetType().Name;
-            throw new NotImplementedException($"{typeName} is not supported type for WITS value");
+            if (reader.TryGetDouble(out double doubleVal))
+                return new JsonValue((float)doubleVal);
         }
 
-        private static string FormatString(string value)
-        => value
-            .Replace("\"", "")
-            .Trim()
-            .Replace("\r", "")
-            .Replace("\n", "");
+        throw new FormatException($"Wrong format at position {reader.Position}");
     }
+
+    public override void Write(Utf8JsonWriter writer, JsonValue value, JsonSerializerOptions options)
+    {
+        if (value.Value is string strValue)
+        {
+            writer.WriteStringValue(FormatString(strValue));
+            return;
+        }
+
+        if (value.Value is int intValue)
+        {
+            writer.WriteNumberValue(intValue);
+            return;
+        }
+
+        if (value.Value is short shortValue)
+        {
+            writer.WriteNumberValue(shortValue);
+            return;
+        }
+
+        if (value.Value is float floatValue)
+        {
+            writer.WriteRawValue(floatValue.ToString("#0.0##", CultureInfo.InvariantCulture), true);
+            return;
+        }
+
+        if (value.Value is double doubleValue)
+        {
+            writer.WriteRawValue(doubleValue.ToString("#0.0##", CultureInfo.InvariantCulture), true);
+            return;
+        }
+
+        var typeName = value.Value.GetType().Name;
+        throw new NotImplementedException($"{typeName} is not supported type for WITS value");
+    }
+
+    private static string FormatString(string value)
+    => value
+        .Replace("\"", "")
+        .Trim()
+        .Replace("\r", "")
+        .Replace("\n", "");
 }
diff --git a/AsbCloudWebApi/Converters/TimeOnlyTypeConverter.cs b/AsbCloudWebApi/Converters/TimeOnlyTypeConverter.cs
index e59b4e2c..a7177bfa 100644
--- a/AsbCloudWebApi/Converters/TimeOnlyTypeConverter.cs
+++ b/AsbCloudWebApi/Converters/TimeOnlyTypeConverter.cs
@@ -2,45 +2,43 @@ using System;
 using System.ComponentModel;
 using System.Globalization;
 
-namespace AsbCloudWebApi.Converters
+namespace AsbCloudWebApi.Converters;
+
+
+public class TimeOnlyTypeConverter : TypeConverter
 {
-
-    public class TimeOnlyTypeConverter : TypeConverter
+    public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
     {
-        public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
+        if (sourceType == typeof(string))
         {
-            if (sourceType == typeof(string))
-            {
-                return true;
-            }
-            return base.CanConvertFrom(context, sourceType);
-        }
-
-        public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
-        {
-            if (value is string str)
-            {
-                return TimeOnly.Parse(str);
-            }
-            return base.ConvertFrom(context, culture, value);
-        }
-
-        public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destinationType)
-        {
-            if (destinationType == typeof(string))
-            {
-                return true;
-            }
-            return base.CanConvertTo(context, destinationType);
-        }
-        public override object? ConvertTo(ITypeDescriptorContext? context, CultureInfo? culture, object? value, Type destinationType)
-        {
-            if (destinationType == typeof(string) && value is TimeOnly date)
-            {
-                return date.ToString("O");
-            }
-            return base.ConvertTo(context, culture, value, destinationType);
+            return true;
         }
+        return base.CanConvertFrom(context, sourceType);
     }
 
+    public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
+    {
+        if (value is string str)
+        {
+            return TimeOnly.Parse(str);
+        }
+        return base.ConvertFrom(context, culture, value);
+    }
+
+    public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destinationType)
+    {
+        if (destinationType == typeof(string))
+        {
+            return true;
+        }
+        return base.CanConvertTo(context, destinationType);
+    }
+    public override object? ConvertTo(ITypeDescriptorContext? context, CultureInfo? culture, object? value, Type destinationType)
+    {
+        if (destinationType == typeof(string) && value is TimeOnly date)
+        {
+            return date.ToString("O");
+        }
+        return base.ConvertTo(context, culture, value, destinationType);
+    }
 }
diff --git a/AsbCloudWebApi/DependencyInjection.cs b/AsbCloudWebApi/DependencyInjection.cs
index 8266ad6e..88f92545 100644
--- a/AsbCloudWebApi/DependencyInjection.cs
+++ b/AsbCloudWebApi/DependencyInjection.cs
@@ -20,143 +20,142 @@ using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi
+namespace AsbCloudWebApi;
+
+public static class DependencyInjection
 {
-    public static class DependencyInjection
+    public static void AddSwagger(this IServiceCollection services)
     {
-        public static void AddSwagger(this IServiceCollection services)
+        services.AddSwaggerGen(c =>
         {
-            services.AddSwaggerGen(c =>
+            c.MapType<TimeSpan>(() => new OpenApiSchema { Type = "string", Example = new OpenApiString("0.00:00:00") });
+            c.MapType<DateOnly>(() => new OpenApiSchema { Type = "string", Format = "date" });
+            c.MapType<JsonValue>(() => new OpenApiSchema
             {
-                c.MapType<TimeSpan>(() => new OpenApiSchema { Type = "string", Example = new OpenApiString("0.00:00:00") });
-                c.MapType<DateOnly>(() => new OpenApiSchema { Type = "string", Format = "date" });
-                c.MapType<JsonValue>(() => new OpenApiSchema
+                AnyOf = new OpenApiSchema[]
                 {
-                    AnyOf = new OpenApiSchema[]
-                    {
-                        new OpenApiSchema {Type = "string", Format = "string" },
-                        new OpenApiSchema {Type = "number", Format = "int32" },
-                        new OpenApiSchema {Type = "number", Format = "float" },
-                    }
-                });
-
-                c.CustomOperationIds(e =>
-                {
-                    return $"{e.ActionDescriptor.RouteValues["action"]}";
-                });
-
-                c.SwaggerDoc("v1", new OpenApiInfo { Title = "ASB cloud web api", Version = "v1" });
-                c.SwaggerDoc("signalr", new OpenApiInfo { Title = "SignalR client methods", Version = "signalr" });
-                c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
-                {
-                    Description = @"JWT Authorization header using the Bearer scheme. Enter 'Bearer' [space] and then your token in the text input below. Example: 'Bearer 12345abcdef'",
-                    Name = "Authorization",
-                    In = ParameterLocation.Header,
-                    Type = SecuritySchemeType.ApiKey,
-                    Scheme = "Bearer",
-                });
-
-                c.AddSecurityRequirement(new OpenApiSecurityRequirement()
-                {
-                    {
-                        new OpenApiSecurityScheme
-                        {
-                            Reference = new OpenApiReference
-                            {
-                                Type = ReferenceType.SecurityScheme,
-                                Id = "Bearer"
-                            },
-                            Scheme = "oauth2",
-                            Name = "Bearer",
-                            In = ParameterLocation.Header,
-                        },
-                        new List<string>()
-                    }
-                });
-
-                var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
-                var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-                var includeControllerXmlComment = true;
-                c.IncludeXmlComments(xmlPath, includeControllerXmlComment);
-                c.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, "AsbCloudApp.xml"), includeControllerXmlComment);
-
-                c.AddSignalRSwaggerGen(options =>
-                {
-                    options.DisplayInDocument("signalr");
-                    options.UseHubXmlCommentsSummaryAsTagDescription = true;
-                    options.UseHubXmlCommentsSummaryAsTag = true;
-                    options.UseXmlComments(xmlPath);
-                });
+                    new OpenApiSchema {Type = "string", Format = "string" },
+                    new OpenApiSchema {Type = "number", Format = "int32" },
+                    new OpenApiSchema {Type = "number", Format = "float" },
+                }
             });
-        }
 
-        public static void AddJWTAuthentication(this IServiceCollection services)
-        {
-            services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
-                .AddJwtBearer(options =>
+            c.CustomOperationIds(e =>
+            {
+                return $"{e.ActionDescriptor.RouteValues["action"]}";
+            });
+
+            c.SwaggerDoc("v1", new OpenApiInfo { Title = "ASB cloud web api", Version = "v1" });
+            c.SwaggerDoc("signalr", new OpenApiInfo { Title = "SignalR client methods", Version = "signalr" });
+            c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
+            {
+                Description = @"JWT Authorization header using the Bearer scheme. Enter 'Bearer' [space] and then your token in the text input below. Example: 'Bearer 12345abcdef'",
+                Name = "Authorization",
+                In = ParameterLocation.Header,
+                Type = SecuritySchemeType.ApiKey,
+                Scheme = "Bearer",
+            });
+
+            c.AddSecurityRequirement(new OpenApiSecurityRequirement()
+            {
                 {
-                    options.RequireHttpsMetadata = false;
-                    options.TokenValidationParameters = new TokenValidationParameters
+                    new OpenApiSecurityScheme
                     {
-                        ValidateIssuer = true,
-                        ValidIssuer = AuthService.issuer,
-                        ValidateAudience = true,
-                        ValidAudience = AuthService.audience,
-                        ValidateLifetime = true,
-                        IssuerSigningKey = AuthService.securityKey,
-                        ValidateIssuerSigningKey = true,
-                    };
-
-                    options.Events = new JwtBearerEvents
-                    {
-                        OnMessageReceived = context =>
+                        Reference = new OpenApiReference
                         {
-                            var accessToken = context.Request.Query["access_token"];
-
-                            var path = context.HttpContext.Request.Path;
-                            if (!string.IsNullOrEmpty(accessToken) && path.StartsWithSegments("/hubs"))
-                            {
-                                context.Token = accessToken;
-                            }
-
-                            return Task.CompletedTask;
+                            Type = ReferenceType.SecurityScheme,
+                            Id = "Bearer"
                         },
-                        OnTokenValidated = context =>
+                        Scheme = "oauth2",
+                        Name = "Bearer",
+                        In = ParameterLocation.Header,
+                    },
+                    new List<string>()
+                }
+            });
+
+            var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+            var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+            var includeControllerXmlComment = true;
+            c.IncludeXmlComments(xmlPath, includeControllerXmlComment);
+            c.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, "AsbCloudApp.xml"), includeControllerXmlComment);
+
+            c.AddSignalRSwaggerGen(options =>
+            {
+                options.DisplayInDocument("signalr");
+                options.UseHubXmlCommentsSummaryAsTagDescription = true;
+                options.UseHubXmlCommentsSummaryAsTag = true;
+                options.UseXmlComments(xmlPath);
+            });
+        });
+    }
+
+    public static void AddJWTAuthentication(this IServiceCollection services)
+    {
+        services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+            .AddJwtBearer(options =>
+            {
+                options.RequireHttpsMetadata = false;
+                options.TokenValidationParameters = new TokenValidationParameters
+                {
+                    ValidateIssuer = true,
+                    ValidIssuer = AuthService.issuer,
+                    ValidateAudience = true,
+                    ValidAudience = AuthService.audience,
+                    ValidateLifetime = true,
+                    IssuerSigningKey = AuthService.securityKey,
+                    ValidateIssuerSigningKey = true,
+                };
+
+                options.Events = new JwtBearerEvents
+                {
+                    OnMessageReceived = context =>
+                    {
+                        var accessToken = context.Request.Query["access_token"];
+
+                        var path = context.HttpContext.Request.Path;
+                        if (!string.IsNullOrEmpty(accessToken) && path.StartsWithSegments("/hubs"))
                         {
-                            var idUser = context.Principal?.GetUserId();
-                            if (idUser is null)
-                            {
-                                context.Fail("idUser is null");
-                                return Task.CompletedTask;
-                            }
-
-                            var userService = context.HttpContext.RequestServices.GetRequiredService<IUserRepository>();
-                            var user = userService.GetOrDefault(idUser.Value);
-
-                            if (user is null)
-                            {
-                                context.Fail("user is null");
-                            }
-                            else if (user.IdState != User.ActiveStateId)
-                            {
-                                context.Fail("user is not active");
-                            }
+                            context.Token = accessToken;
+                        }
 
+                        return Task.CompletedTask;
+                    },
+                    OnTokenValidated = context =>
+                    {
+                        var idUser = context.Principal?.GetUserId();
+                        if (idUser is null)
+                        {
+                            context.Fail("idUser is null");
                             return Task.CompletedTask;
                         }
-                    };
-                });
-        }
 
-        public static void AddNotificationTransportServices(this IServiceCollection services)
-        {
-            services.AddTransient<INotificationTransportService, SignalRNotificationTransportService>();
-            services.AddTransient<INotificationTransportService, EmailNotificationTransportService>();
+                        var userService = context.HttpContext.RequestServices.GetRequiredService<IUserRepository>();
+                        var user = userService.GetOrDefault(idUser.Value);
 
-            services.AddTransient<NotificationPublisher>();
-        }
+                        if (user is null)
+                        {
+                            context.Fail("user is null");
+                        }
+                        else if (user.IdState != User.ActiveStateId)
+                        {
+                            context.Fail("user is not active");
+                        }
 
-        public static void AddIntegrationEvents(this IServiceCollection services) => services
-            .AddTransient<IIntegrationEventHandler<UpdateWellInfoEvent>, WellInfoHub>();
+                        return Task.CompletedTask;
+                    }
+                };
+            });
     }
+
+    public static void AddNotificationTransportServices(this IServiceCollection services)
+    {
+        services.AddTransient<INotificationTransportService, SignalRNotificationTransportService>();
+        services.AddTransient<INotificationTransportService, EmailNotificationTransportService>();
+
+        services.AddTransient<NotificationPublisher>();
+    }
+
+    public static void AddIntegrationEvents(this IServiceCollection services) => services
+        .AddTransient<IIntegrationEventHandler<UpdateWellInfoEvent>, WellInfoHub>();
 }
diff --git a/AsbCloudWebApi/Middlewares/PermissionsMiddlware.cs b/AsbCloudWebApi/Middlewares/PermissionsMiddlware.cs
index 3c4eb9d7..fa3d908f 100644
--- a/AsbCloudWebApi/Middlewares/PermissionsMiddlware.cs
+++ b/AsbCloudWebApi/Middlewares/PermissionsMiddlware.cs
@@ -8,77 +8,75 @@ using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Middlewares
+namespace AsbCloudWebApi.Middlewares;
+
+
+public class PermissionsMiddlware
 {
+    private readonly RequestDelegate next;
+    private readonly UserConnectionsLimitMiddlware userConnectionsLimitMiddlware;
 
-    public class PermissionsMiddlware
+    public PermissionsMiddlware(RequestDelegate next, IConfiguration configuration)
     {
-        private readonly RequestDelegate next;
-        private readonly UserConnectionsLimitMiddlware userConnectionsLimitMiddlware;
-
-        public PermissionsMiddlware(RequestDelegate next, IConfiguration configuration)
-        {
-            this.next = next;
-            userConnectionsLimitMiddlware = new UserConnectionsLimitMiddlware(next, configuration);
-        }
-
-        public async Task InvokeAsync(HttpContext context)
-        {
-            var endpoint = context.GetEndpoint();
-            var permission = endpoint?.Metadata.GetMetadata<PermissionAttribute>();
-            if (permission is null)
-            {
-                await next(context);
-                return;
-            }
-
-            var idUser = context.User.GetUserId();
-            if (idUser is null)
-            {
-                await context.ForbidAsync();
-                return;
-            }
-
-            var controllerName = endpoint!.Metadata
-                .GetMetadata<Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor>()
-                ?.ControllerName;
-
-            bool isAuthorized;
-            if (idUser == 1)
-                isAuthorized = true;
-            else
-            {
-                var permissionName = permission.Name;
-                if (string.IsNullOrEmpty(permissionName))
-                {
-                    var httpMethod = endpoint.Metadata
-                        .GetMetadata<Microsoft.AspNetCore.Routing.HttpMethodMetadata>()
-                        ?.HttpMethods[0]
-                        .ToLower();
-
-                    permissionName = httpMethod switch
-                    {
-                        "get" or "delete" => $"{controllerName}.{httpMethod}",
-                        "post" or "put" or "patch" => $"{controllerName}.edit",
-                        _ => throw new NotImplementedException(),
-                    };
-                    PermissionAttribute.Registered.Add(permissionName);
-                }
-                else if (permissionName.Contains("[controller]"))
-                {
-                    permissionName = permissionName.Replace("[controller]", controllerName);
-                    PermissionAttribute.Registered.Add(permissionName);
-                }
-
-                var userService = context.RequestServices.GetRequiredService<IUserRepository>();
-                isAuthorized = userService.HasPermission(idUser.Value, permissionName);
-            }
-
-            if (isAuthorized)
-                await userConnectionsLimitMiddlware.InvokeAsync(context, idUser!.Value, controllerName!);
-            else
-                await context.ForbidAsync();
-        }
+        this.next = next;
+        userConnectionsLimitMiddlware = new UserConnectionsLimitMiddlware(next, configuration);
     }
 
+    public async Task InvokeAsync(HttpContext context)
+    {
+        var endpoint = context.GetEndpoint();
+        var permission = endpoint?.Metadata.GetMetadata<PermissionAttribute>();
+        if (permission is null)
+        {
+            await next(context);
+            return;
+        }
+
+        var idUser = context.User.GetUserId();
+        if (idUser is null)
+        {
+            await context.ForbidAsync();
+            return;
+        }
+
+        var controllerName = endpoint!.Metadata
+            .GetMetadata<Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor>()
+            ?.ControllerName;
+
+        bool isAuthorized;
+        if (idUser == 1)
+            isAuthorized = true;
+        else
+        {
+            var permissionName = permission.Name;
+            if (string.IsNullOrEmpty(permissionName))
+            {
+                var httpMethod = endpoint.Metadata
+                    .GetMetadata<Microsoft.AspNetCore.Routing.HttpMethodMetadata>()
+                    ?.HttpMethods[0]
+                    .ToLower();
+
+                permissionName = httpMethod switch
+                {
+                    "get" or "delete" => $"{controllerName}.{httpMethod}",
+                    "post" or "put" or "patch" => $"{controllerName}.edit",
+                    _ => throw new NotImplementedException(),
+                };
+                PermissionAttribute.Registered.Add(permissionName);
+            }
+            else if (permissionName.Contains("[controller]"))
+            {
+                permissionName = permissionName.Replace("[controller]", controllerName);
+                PermissionAttribute.Registered.Add(permissionName);
+            }
+
+            var userService = context.RequestServices.GetRequiredService<IUserRepository>();
+            isAuthorized = userService.HasPermission(idUser.Value, permissionName);
+        }
+
+        if (isAuthorized)
+            await userConnectionsLimitMiddlware.InvokeAsync(context, idUser!.Value, controllerName!);
+        else
+            await context.ForbidAsync();
+    }
 }
diff --git a/AsbCloudWebApi/Middlewares/RequerstTrackerMiddleware.cs b/AsbCloudWebApi/Middlewares/RequerstTrackerMiddleware.cs
index 62c3ff56..b4e757e0 100644
--- a/AsbCloudWebApi/Middlewares/RequerstTrackerMiddleware.cs
+++ b/AsbCloudWebApi/Middlewares/RequerstTrackerMiddleware.cs
@@ -3,54 +3,52 @@ using Microsoft.Extensions.DependencyInjection;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Middlewares
+namespace AsbCloudWebApi.Middlewares;
+
+
+public class RequerstTrackerMiddleware
 {
+    private readonly RequestDelegate next;
 
-    public class RequerstTrackerMiddleware
+    public RequerstTrackerMiddleware(RequestDelegate next)
     {
-        private readonly RequestDelegate next;
-
-        public RequerstTrackerMiddleware(RequestDelegate next)
-        {
-            this.next = next;
-        }
-
-        public async Task InvokeAsync(HttpContext context)
-        {
-            var service = context.RequestServices.GetRequiredService<AsbCloudApp.Services.IRequerstTrackerService>();
-            var clientIp = context.Request.Headers["X-Real-IP"].FirstOrDefault();
-            var requestLog = new AsbCloudApp.Data.RequestLogDto
-            {
-                UserLogin = context.User.Identity?.Name ?? string.Empty,
-                UserIp = clientIp ?? context.Connection?.RemoteIpAddress?.ToString(),
-                RequestMethod = context.Request.Method,
-                RequestPath = context.Request.Path.Value,
-                RequestContentLength = context.Request.ContentLength,
-                Referer = context.Request.Headers["Referer"].ToString(),
-            };
-            {
-                var userIdString = context.User?.FindFirst("id")?.Value;
-                if (!string.IsNullOrEmpty(userIdString) && int.TryParse(userIdString, out int userId))
-                    requestLog.UserId = userId;
-            }
-            var sw = System.Diagnostics.Stopwatch.StartNew();
-            try
-            {
-                await next.Invoke(context);
-                sw.Stop();
-                requestLog.ElapsedMilliseconds = sw.ElapsedMilliseconds;
-                requestLog.Status = context.Response.StatusCode;
-                service.RegisterRequest(requestLog);
-            }
-            catch (System.Exception ex)
-            {
-                sw.Stop();
-                requestLog.ElapsedMilliseconds = sw.ElapsedMilliseconds;
-                requestLog.Status = context.Response.StatusCode;
-                service.RegisterRequestError(requestLog, ex);
-                throw;
-            }
-        }
+        this.next = next;
     }
 
+    public async Task InvokeAsync(HttpContext context)
+    {
+        var service = context.RequestServices.GetRequiredService<AsbCloudApp.Services.IRequerstTrackerService>();
+        var clientIp = context.Request.Headers["X-Real-IP"].FirstOrDefault();
+        var requestLog = new AsbCloudApp.Data.RequestLogDto
+        {
+            UserLogin = context.User.Identity?.Name ?? string.Empty,
+            UserIp = clientIp ?? context.Connection?.RemoteIpAddress?.ToString(),
+            RequestMethod = context.Request.Method,
+            RequestPath = context.Request.Path.Value,
+            RequestContentLength = context.Request.ContentLength,
+            Referer = context.Request.Headers["Referer"].ToString(),
+        };
+        {
+            var userIdString = context.User?.FindFirst("id")?.Value;
+            if (!string.IsNullOrEmpty(userIdString) && int.TryParse(userIdString, out int userId))
+                requestLog.UserId = userId;
+        }
+        var sw = System.Diagnostics.Stopwatch.StartNew();
+        try
+        {
+            await next.Invoke(context);
+            sw.Stop();
+            requestLog.ElapsedMilliseconds = sw.ElapsedMilliseconds;
+            requestLog.Status = context.Response.StatusCode;
+            service.RegisterRequest(requestLog);
+        }
+        catch (System.Exception ex)
+        {
+            sw.Stop();
+            requestLog.ElapsedMilliseconds = sw.ElapsedMilliseconds;
+            requestLog.Status = context.Response.StatusCode;
+            service.RegisterRequestError(requestLog, ex);
+            throw;
+        }
+    }
 }
diff --git a/AsbCloudWebApi/Middlewares/SimplifyExceptionsMiddleware.cs b/AsbCloudWebApi/Middlewares/SimplifyExceptionsMiddleware.cs
index 20c995b3..ef742133 100644
--- a/AsbCloudWebApi/Middlewares/SimplifyExceptionsMiddleware.cs
+++ b/AsbCloudWebApi/Middlewares/SimplifyExceptionsMiddleware.cs
@@ -6,62 +6,61 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Middlewares
+namespace AsbCloudWebApi.Middlewares;
+
+public class SimplifyExceptionsMiddleware
 {
-    public class SimplifyExceptionsMiddleware
+    private readonly RequestDelegate next;
+
+    public SimplifyExceptionsMiddleware(RequestDelegate next)
     {
-        private readonly RequestDelegate next;
+        this.next = next;
+    }
 
-        public SimplifyExceptionsMiddleware(RequestDelegate next)
+    public async Task InvokeAsync(HttpContext context)
+    {
+        try
         {
-            this.next = next;
+            await next.Invoke(context);
         }
-
-        public async Task InvokeAsync(HttpContext context)
+        catch (ArgumentInvalidException ex)
         {
-            try
-            {
-                await next.Invoke(context);
-            }
-            catch (ArgumentInvalidException ex)
-            {
-                Console.WriteLine($"ArgumentException in {context.Request.Method}: {ex.Message}");
-                context.Response.Clear();
-                context.Response.StatusCode = 400;
-                context.Response.ContentType = "application/json";
-                var body = MakeJsonBody(ex);
-                await context.Response.WriteAsync(body);
-            }
-            catch (ForbidException ex)
-            {
-                Console.WriteLine($"ForbidException in {context.Request.Method}: {ex.Message}");
-                context.Response.Clear();
-                context.Response.StatusCode = 403;
-            }
-            catch (OperationCanceledException ex)
-            {
-                Console.WriteLine(ex.Message);
-            }
-            catch (Exception ex) // TODO: find explicit exception. Use Trace. Add body size to message.
-            {
-                if (context.Response.HasStarted)
-                    throw;
-
-                context.Response.Clear();
-                context.Response.StatusCode = 500;
-                
-                if (ex.Message.Contains("Reading the request body timed out due to data arriving too slowly. See MinRequestBodyDataRate."))
-                    Console.WriteLine("Reading the request body timed out due to data arriving too slowly.");
-                else
-                    throw;
-            }
+            Console.WriteLine($"ArgumentException in {context.Request.Method}: {ex.Message}");
+            context.Response.Clear();
+            context.Response.StatusCode = 400;
+            context.Response.ContentType = "application/json";
+            var body = MakeJsonBody(ex);
+            await context.Response.WriteAsync(body);
         }
-
-        private static string MakeJsonBody(ArgumentInvalidException ex)
+        catch (ForbidException ex)
         {
-            var problem = new ValidationProblemDetails(ex.ErrorState);
-            var buffer = System.Text.Json.JsonSerializer.Serialize(problem);
-            return buffer;
+            Console.WriteLine($"ForbidException in {context.Request.Method}: {ex.Message}");
+            context.Response.Clear();
+            context.Response.StatusCode = 403;
+        }
+        catch (OperationCanceledException ex)
+        {
+            Console.WriteLine(ex.Message);
+        }
+        catch (Exception ex) // TODO: find explicit exception. Use Trace. Add body size to message.
+        {
+            if (context.Response.HasStarted)
+                throw;
+
+            context.Response.Clear();
+            context.Response.StatusCode = 500;
+            
+            if (ex.Message.Contains("Reading the request body timed out due to data arriving too slowly. See MinRequestBodyDataRate."))
+                Console.WriteLine("Reading the request body timed out due to data arriving too slowly.");
+            else
+                throw;
         }
     }
+
+    private static string MakeJsonBody(ArgumentInvalidException ex)
+    {
+        var problem = new ValidationProblemDetails(ex.ErrorState);
+        var buffer = System.Text.Json.JsonSerializer.Serialize(problem);
+        return buffer;
+    }
 }
diff --git a/AsbCloudWebApi/Middlewares/UserConnectionsLimitMiddlware.cs b/AsbCloudWebApi/Middlewares/UserConnectionsLimitMiddlware.cs
index f905d4f2..35cd7d93 100644
--- a/AsbCloudWebApi/Middlewares/UserConnectionsLimitMiddlware.cs
+++ b/AsbCloudWebApi/Middlewares/UserConnectionsLimitMiddlware.cs
@@ -5,69 +5,67 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.Middlewares
+namespace AsbCloudWebApi.Middlewares;
+
+
+/// <summary>
+/// This is not real middleware it`s part of PermissionsMiddlware.
+/// DO NOT register it in setup.cs as middleware.
+/// </summary>
+class UserConnectionsLimitMiddlware
 {
+    private readonly int parallelRequestsToController;
+    private readonly RequestDelegate next;
+    private readonly byte[] responseBody;
+    private readonly ConcurrentDictionary<int, ConcurrentDictionary<string, int>> stat = new ();
+    private readonly IEnumerable<string>? controllerNames;
 
-    /// <summary>
-    /// This is not real middleware it`s part of PermissionsMiddlware.
-    /// DO NOT register it in setup.cs as middleware.
-    /// </summary>
-    class UserConnectionsLimitMiddlware
+    public UserConnectionsLimitMiddlware(RequestDelegate next, IConfiguration configuration)
     {
-        private readonly int parallelRequestsToController;
-        private readonly RequestDelegate next;
-        private readonly byte[] responseBody;
-        private readonly ConcurrentDictionary<int, ConcurrentDictionary<string, int>> stat = new ();
-        private readonly IEnumerable<string>? controllerNames;
+        const int parallelRequestsToControllerDefault = 8;
+        this.next = next;
+        
+        var parallelRequestsToController = configuration.GetSection("userLimits")?.GetValue<int>("parallelRequestsToController") ?? parallelRequestsToControllerDefault;
+        this.parallelRequestsToController = parallelRequestsToController > 0 
+            ? parallelRequestsToController 
+            : parallelRequestsToControllerDefault;
 
-        public UserConnectionsLimitMiddlware(RequestDelegate next, IConfiguration configuration)
-        {
-            const int parallelRequestsToControllerDefault = 8;
-            this.next = next;
-            
-            var parallelRequestsToController = configuration.GetSection("userLimits")?.GetValue<int>("parallelRequestsToController") ?? parallelRequestsToControllerDefault;
-            this.parallelRequestsToController = parallelRequestsToController > 0 
-                ? parallelRequestsToController 
-                : parallelRequestsToControllerDefault;
+        controllerNames = configuration.GetSection("userLimits")?.GetValue<IEnumerable<string>>("controllerNames");
 
-            controllerNames = configuration.GetSection("userLimits")?.GetValue<IEnumerable<string>>("controllerNames");
-
-            var bodyText = $"<html><head><title>Too Many Requests</title></head><body><h1>Too Many Requests</h1><p>I only allow {this.parallelRequestsToController} parallel requests per user. Try again soon.</p></body></html>";
-            responseBody = System.Text.Encoding.UTF8.GetBytes(bodyText);
-        }
-
-        public async Task InvokeAsync(HttpContext context, int idUser, string controllerName)
-        {
-            if(controllerNames?.Any(n => controllerName.StartsWith(n)) == false)
-            {
-                await next(context);
-                return;
-            }
-
-            var userStat = stat.GetOrAdd(idUser, idUser => new());            
-            var count = userStat.AddOrUpdate(controllerName, 0, (k, v) => v);
-            
-            if(count + 1 < parallelRequestsToController)
-            {
-                try
-                {
-                    userStat[controllerName]++;
-                    await next(context);
-                }
-                finally
-                {
-                    userStat[controllerName]--;
-                }
-            }
-            else
-            {
-                context.Response.Clear();
-                context.Response.StatusCode = (int)System.Net.HttpStatusCode.TooManyRequests;
-                context.Response.Headers.RetryAfter = "1000";
-                context.Response.Headers.ContentType = "text/html";
-                await context.Response.BodyWriter.WriteAsync(responseBody);
-            }
-        }
+        var bodyText = $"<html><head><title>Too Many Requests</title></head><body><h1>Too Many Requests</h1><p>I only allow {this.parallelRequestsToController} parallel requests per user. Try again soon.</p></body></html>";
+        responseBody = System.Text.Encoding.UTF8.GetBytes(bodyText);
     }
 
+    public async Task InvokeAsync(HttpContext context, int idUser, string controllerName)
+    {
+        if(controllerNames?.Any(n => controllerName.StartsWith(n)) == false)
+        {
+            await next(context);
+            return;
+        }
+
+        var userStat = stat.GetOrAdd(idUser, idUser => new());            
+        var count = userStat.AddOrUpdate(controllerName, 0, (k, v) => v);
+        
+        if(count + 1 < parallelRequestsToController)
+        {
+            try
+            {
+                userStat[controllerName]++;
+                await next(context);
+            }
+            finally
+            {
+                userStat[controllerName]--;
+            }
+        }
+        else
+        {
+            context.Response.Clear();
+            context.Response.StatusCode = (int)System.Net.HttpStatusCode.TooManyRequests;
+            context.Response.Headers.RetryAfter = "1000";
+            context.Response.Headers.ContentType = "text/html";
+            await context.Response.BodyWriter.WriteAsync(responseBody);
+        }
+    }
 }
diff --git a/AsbCloudWebApi/PermissionAttribute.cs b/AsbCloudWebApi/PermissionAttribute.cs
index 4d192eac..8720754e 100644
--- a/AsbCloudWebApi/PermissionAttribute.cs
+++ b/AsbCloudWebApi/PermissionAttribute.cs
@@ -1,29 +1,28 @@
 using System;
 using System.Collections.Concurrent;
 
-namespace AsbCloudWebApi
+namespace AsbCloudWebApi;
+
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+public class PermissionAttribute : Attribute
 {
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
-    public class PermissionAttribute : Attribute
+    public static ConcurrentBag<string> Registered { get; } = new();
+
+    public string Name { get; set; } = null!;
+
+    /// <summary>
+    /// Проверка наличия у пользователя разрешения с именем "{ControllerName}.{http_method}".
+    /// Пример автоматической генерации имени: "Message.get", где "Message" - имя контроллера MessageController.
+    /// </summary>
+    public PermissionAttribute() { }
+
+    /// <summary>
+    /// Проверка наличия у пользователя указанного разрешения.
+    /// </summary>
+    /// <param name="name">Имя разрешения (default = ControllerName.http_method)</param>
+    public PermissionAttribute(string name)
     {
-        public static ConcurrentBag<string> Registered { get; } = new();
-
-        public string Name { get; set; } = null!;
-
-        /// <summary>
-        /// Проверка наличия у пользователя разрешения с именем "{ControllerName}.{http_method}".
-        /// Пример автоматической генерации имени: "Message.get", где "Message" - имя контроллера MessageController.
-        /// </summary>
-        public PermissionAttribute() { }
-
-        /// <summary>
-        /// Проверка наличия у пользователя указанного разрешения.
-        /// </summary>
-        /// <param name="name">Имя разрешения (default = ControllerName.http_method)</param>
-        public PermissionAttribute(string name)
-        {
-            Name = name;
-            Registered.Add(name);
-        }
+        Name = name;
+        Registered.Add(name);
     }
 }
diff --git a/AsbCloudWebApi/Program.cs b/AsbCloudWebApi/Program.cs
index e1b6445b..4645a382 100644
--- a/AsbCloudWebApi/Program.cs
+++ b/AsbCloudWebApi/Program.cs
@@ -1,24 +1,23 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
-namespace AsbCloudWebApi
-{
-    public class Program
-    {
-        // Uncomment next line to find wired exceptions by tracing.
-        //static TraceListenerView trace4debug = new TraceListenerView();
-        public static void Main(string[] args)
-        {
-            var host = CreateHostBuilder(args).Build();
-            AsbCloudInfrastructure.Startup.BeforeRunHandler(host);
-            host.Run();
-        }
+namespace AsbCloudWebApi;
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
+public class Program
+{
+    // Uncomment next line to find wired exceptions by tracing.
+    //static TraceListenerView trace4debug = new TraceListenerView();
+    public static void Main(string[] args)
+    {
+        var host = CreateHostBuilder(args).Build();
+        AsbCloudInfrastructure.Startup.BeforeRunHandler(host);
+        host.Run();
     }
+
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            });
 }
diff --git a/AsbCloudWebApi/SignalR/Clients/INotificationHubClient.cs b/AsbCloudWebApi/SignalR/Clients/INotificationHubClient.cs
index c4cf6500..ae94ab64 100644
--- a/AsbCloudWebApi/SignalR/Clients/INotificationHubClient.cs
+++ b/AsbCloudWebApi/SignalR/Clients/INotificationHubClient.cs
@@ -3,21 +3,20 @@ using SignalRSwaggerGen.Attributes;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.SignalR.Clients
+namespace AsbCloudWebApi.SignalR.Clients;
+
+/// <summary>
+/// Hub по работе с уведомлениями
+/// </summary>
+[SignalRHub]
+public interface INotificationHubClient
 {
     /// <summary>
-    /// Hub по работе с уведомлениями
+    /// Отправка клиенту сообщения с уведомлением.
+    /// Для подписки на метод необходимо отправить connectionId
     /// </summary>
-    [SignalRHub]
-    public interface INotificationHubClient
-    {
-        /// <summary>
-        /// Отправка клиенту сообщения с уведомлением.
-        /// Для подписки на метод необходимо отправить connectionId
-        /// </summary>
-        /// <param name="message">сообщение с уведомлением</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task ReceiveNotifications(NotificationMessage message, CancellationToken token);
-    }
+    /// <param name="message">сообщение с уведомлением</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task ReceiveNotifications(NotificationMessage message, CancellationToken token);
 }
diff --git a/AsbCloudWebApi/SignalR/Clients/IReportHubClient.cs b/AsbCloudWebApi/SignalR/Clients/IReportHubClient.cs
index d5b5b58b..26a53c2e 100644
--- a/AsbCloudWebApi/SignalR/Clients/IReportHubClient.cs
+++ b/AsbCloudWebApi/SignalR/Clients/IReportHubClient.cs
@@ -2,21 +2,20 @@ using SignalRSwaggerGen.Attributes;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.SignalR.Clients
+namespace AsbCloudWebApi.SignalR.Clients;
+
+/// <summary>
+/// Hub по работе с отчетами
+/// </summary>
+[SignalRHub]
+public interface IReportHubClient
 {
     /// <summary>
-    /// Hub по работе с отчетами
+    /// Отправка клиенту сообщения о статусе формирования отчета.
+    /// Для подписки на метод необходимо отправить сообщение в формате $"Report_{id}"
     /// </summary>
-    [SignalRHub]
-    public interface IReportHubClient
-    {
-        /// <summary>
-        /// Отправка клиенту сообщения о статусе формирования отчета.
-        /// Для подписки на метод необходимо отправить сообщение в формате $"Report_{id}"
-        /// </summary>
-        /// <param name="progress">статус формирования отчета</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task GetReportProgress(object progress, CancellationToken token);
-    }
+    /// <param name="progress">статус формирования отчета</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task GetReportProgress(object progress, CancellationToken token);
 }
diff --git a/AsbCloudWebApi/SignalR/Clients/ITelemetryHubClient.cs b/AsbCloudWebApi/SignalR/Clients/ITelemetryHubClient.cs
index 0c2e7642..5c19b77f 100644
--- a/AsbCloudWebApi/SignalR/Clients/ITelemetryHubClient.cs
+++ b/AsbCloudWebApi/SignalR/Clients/ITelemetryHubClient.cs
@@ -5,49 +5,48 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.SignalR.Clients
+namespace AsbCloudWebApi.SignalR.Clients;
+
+/// <summary>
+/// Hub по работе с телеметрией
+/// </summary>
+[SignalRHub]
+public interface ITelemetryHubClient
 {
     /// <summary>
-    /// Hub по работе с телеметрией
+    /// Отправка клиенту уведомления о доставке с панели drill test данных.
+    /// Для подписки на метод необходимо отправить сообщение в формате $"well_{idWell}"
     /// </summary>
-    [SignalRHub]
-    public interface ITelemetryHubClient
-    {
-        /// <summary>
-        /// Отправка клиенту уведомления о доставке с панели drill test данных.
-        /// Для подписки на метод необходимо отправить сообщение в формате $"well_{idWell}"
-        /// </summary>
-        /// <param name="dtos"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task ReceiveDrilltestData(IEnumerable<DrillTestBaseDto> dtos, CancellationToken token);
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task ReceiveDrilltestData(IEnumerable<DrillTestBaseDto> dtos, CancellationToken token);
 
-        /// <summary>
-        /// Обновление записей РТК
-        /// Для подписки на метод необходимо отправить сообщение "ProcessMapWellDrilling" 
-        /// </summary>
-        /// <param name="dtos"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task UpdateProcessMap(IEnumerable dtos, CancellationToken token);
+    /// <summary>
+    /// Обновление записей РТК
+    /// Для подписки на метод необходимо отправить сообщение "ProcessMapWellDrilling" 
+    /// </summary>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task UpdateProcessMap(IEnumerable dtos, CancellationToken token);
 
-        /// <summary>
-        /// Отправка сауб-данных клиенту.
-        /// Для подписки на метод необходимо отправить сообщение в формате $"well_{idWell}" 
-        /// </summary>
-        /// <param name="dtos"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task ReceiveDataSaub(IEnumerable<TelemetryDataSaubDto> dtos, CancellationToken token);
+    /// <summary>
+    /// Отправка сауб-данных клиенту.
+    /// Для подписки на метод необходимо отправить сообщение в формате $"well_{idWell}" 
+    /// </summary>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task ReceiveDataSaub(IEnumerable<TelemetryDataSaubDto> dtos, CancellationToken token);
 
-        /// <summary>
-        /// Отправка спин-данных клиенту.
-        /// Для подписки на метод необходимо отправить сообщение в формате $"well_{idWell}" 
-        /// </summary>
-        /// <param name="dtos"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task ReceiveDataSpin(IEnumerable<TelemetryDataSpinDto> dtos, CancellationToken token);
+    /// <summary>
+    /// Отправка спин-данных клиенту.
+    /// Для подписки на метод необходимо отправить сообщение в формате $"well_{idWell}" 
+    /// </summary>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task ReceiveDataSpin(IEnumerable<TelemetryDataSpinDto> dtos, CancellationToken token);
 
-    }
 }
diff --git a/AsbCloudWebApi/SignalR/Clients/IWellInfoHubClient.cs b/AsbCloudWebApi/SignalR/Clients/IWellInfoHubClient.cs
index 5f5b42e9..45b37502 100644
--- a/AsbCloudWebApi/SignalR/Clients/IWellInfoHubClient.cs
+++ b/AsbCloudWebApi/SignalR/Clients/IWellInfoHubClient.cs
@@ -3,21 +3,20 @@ using SignalRSwaggerGen.Attributes;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.SignalR.Clients
+namespace AsbCloudWebApi.SignalR.Clients;
+
+/// <summary>
+/// Hub по работе с информацией о скважине
+/// </summary>
+[SignalRHub]
+public interface IWellInfoHubClient
 {
     /// <summary>
-    /// Hub по работе с информацией о скважине
+    /// Отправка клиенту сообщения об обновлении информации о скважине
+    /// Для подписки на метод необходимо отправить сообщение в формате $"well_info_{idWell}"
     /// </summary>
-    [SignalRHub]
-    public interface IWellInfoHubClient
-    {
-        /// <summary>
-        /// Отправка клиенту сообщения об обновлении информации о скважине
-        /// Для подписки на метод необходимо отправить сообщение в формате $"well_info_{idWell}"
-        /// </summary>
-        /// <param name="wellInfo">информация о скважине</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task UpdateWellInfo(object wellInfo, CancellationToken token);
-    }
+    /// <param name="wellInfo">информация о скважине</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task UpdateWellInfo(object wellInfo, CancellationToken token);
 }
diff --git a/AsbCloudWebApi/SignalR/ReportsHub.cs b/AsbCloudWebApi/SignalR/ReportsHub.cs
index f9972f36..d6ade824 100644
--- a/AsbCloudWebApi/SignalR/ReportsHub.cs
+++ b/AsbCloudWebApi/SignalR/ReportsHub.cs
@@ -7,54 +7,53 @@ using Microsoft.AspNetCore.Mvc;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudWebApi.SignalR
+namespace AsbCloudWebApi.SignalR;
+
+// SignalR manual:
+// https://docs.microsoft.com/ru-ru/aspnet/core/signalr/introduction?view=aspnetcore-5.0
+//[SignalRHub]
+/// <summary>
+/// ReportsHub
+/// </summary>
+[Authorize]
+public class ReportsHub : BaseHub<IReportHubClient>
 {
-    // SignalR manual:
-    // https://docs.microsoft.com/ru-ru/aspnet/core/signalr/introduction?view=aspnetcore-5.0
-    //[SignalRHub]
-    /// <summary>
-    /// ReportsHub
-    /// </summary>
-    [Authorize]
-    public class ReportsHub : BaseHub<IReportHubClient>
+    private readonly IWellService wellService;
+    private readonly IReportService reportService;
+
+    public ReportsHub(IWellService wellService, IReportService reportService)
     {
-        private readonly IWellService wellService;
-        private readonly IReportService reportService;
+        this.wellService = wellService;
+        this.reportService = reportService;
+    }
 
-        public ReportsHub(IWellService wellService, IReportService reportService)
-        {
-            this.wellService = wellService;
-            this.reportService = reportService;
-        }
+    /// <summary>
+    /// Добавление в группу, отправка данных о формировании отчета
+    /// </summary>
+    /// <param name="groupName">группа</param>
+    /// <param name="idWell">ключ скважины</param>
+    /// <param name="request">параметры запроса</param>
+    /// <returns></returns>
+    public async Task CreateReport(string groupName, int idWell, ReportParametersRequest request)
+    {
+        var idUser = Context.User?.GetUserId();
+        var idCompany = Context.User?.GetCompanyId();
 
-        /// <summary>
-        /// Добавление в группу, отправка данных о формировании отчета
-        /// </summary>
-        /// <param name="groupName">группа</param>
-        /// <param name="idWell">ключ скважины</param>
-        /// <param name="request">параметры запроса</param>
-        /// <returns></returns>
-        public async Task CreateReport(string groupName, int idWell, ReportParametersRequest request)
-        {
-            var idUser = Context.User?.GetUserId();
-            var idCompany = Context.User?.GetCompanyId();
+        if ((idCompany is null) || (idUser is null))
+            return;
 
-            if ((idCompany is null) || (idUser is null))
-                return;
+        if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, CancellationToken.None))
+            return;
 
-            if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, CancellationToken.None))
-                return;
+        await base.AddToGroup(groupName);
 
-            await base.AddToGroup(groupName);
+        void HandleReportProgressAsync(object progress, string id) =>
+            Task.Run(async () =>
+            {
+                await Clients.Group(groupName)
+                .GetReportProgress(progress, CancellationToken.None);
+            }, CancellationToken.None);
 
-            void HandleReportProgressAsync(object progress, string id) =>
-                Task.Run(async () =>
-                {
-                    await Clients.Group(groupName)
-                    .GetReportProgress(progress, CancellationToken.None);
-                }, CancellationToken.None);
-
-            var id = reportService.EnqueueCreateReportWork(idWell, (int)idUser, request, HandleReportProgressAsync);
-        }
+        var id = reportService.EnqueueCreateReportWork(idWell, (int)idUser, request, HandleReportProgressAsync);
     }
 }
diff --git a/AsbCloudWebApi/SignalR/TelemetryHub.cs b/AsbCloudWebApi/SignalR/TelemetryHub.cs
index df4cab22..9d96cffd 100644
--- a/AsbCloudWebApi/SignalR/TelemetryHub.cs
+++ b/AsbCloudWebApi/SignalR/TelemetryHub.cs
@@ -1,14 +1,13 @@
 using AsbCloudWebApi.SignalR.Clients;
 using Microsoft.AspNetCore.Authorization;
 
-namespace AsbCloudWebApi.SignalR
-{
-    // SignalR manual:
-    // https://docs.microsoft.com/ru-ru/aspnet/core/signalr/introduction?view=aspnetcore-5.0
+namespace AsbCloudWebApi.SignalR;
 
-    [Authorize]
-    public class TelemetryHub : BaseHub<ITelemetryHubClient>
-    {
-        
-    }
+// SignalR manual:
+// https://docs.microsoft.com/ru-ru/aspnet/core/signalr/introduction?view=aspnetcore-5.0
+
+[Authorize]
+public class TelemetryHub : BaseHub<ITelemetryHubClient>
+{
+    
 }
\ No newline at end of file
diff --git a/AsbCloudWebApi/Startup.cs b/AsbCloudWebApi/Startup.cs
index b4830fb9..7545fca0 100644
--- a/AsbCloudWebApi/Startup.cs
+++ b/AsbCloudWebApi/Startup.cs
@@ -12,147 +12,146 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.ResponseCompression;
 using AsbCloudWebApi.Conventions;
 
-namespace AsbCloudWebApi
+namespace AsbCloudWebApi;
+
+public class Startup
 {
-    public class Startup
+    public IConfiguration Configuration { get; }
+    public Startup(IConfiguration configuration)
     {
-        public IConfiguration Configuration { get; }
-        public Startup(IConfiguration configuration)
+        Configuration = configuration;
+    }
+
+    public void ConfigureServices(IServiceCollection services)
+    {
+        services.AddControllers()
+            .AddJsonOptions(new System.Action<JsonOptions>(options =>
+            {
+                options.JsonSerializerOptions.NumberHandling =
+                    System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals |
+                    System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString;
+
+                options.JsonSerializerOptions.Converters.Add(new DateOnlyJsonConverter());
+                options.JsonSerializerOptions.Converters.Add(new JsonValueJsonConverter());
+            }))
+            .AddProtoBufNet();
+
+        services.AddControllers(options => options.UseDateOnlyTimeOnlyStringConverters());
+
+        ProtobufModel.EnsureRegistered();
+
+        services.AddSwagger();
+
+        services.AddInfrastructure(Configuration);
+        
+        services.AddNotificationTransportServices();
+
+        services.AddIntegrationEvents();
+
+        services.AddJWTAuthentication();
+
+        services.AddSignalR()
+            .Services.AddSingleton<ConnectionManagerService>();
+
+        services.AddCors(options =>
         {
-            Configuration = configuration;
+            options.AddPolicy("ClientPermission", policy =>
+            {
+                policy.AllowAnyHeader()
+                    .AllowAnyMethod()
+                    .WithOrigins(
+                        "http://0.0.0.0",
+                        "http://*",
+                        "http://localhost",
+
+                        "http://0.0.0.0:3000",
+                        "http://*:3000",
+                        "http://localhost:3000",
+
+                        "http://0.0.0.0:5000",
+                        "http://*:5000",
+                        "http://localhost:5000",
+
+                        "https://0.0.0.0",
+                        "https://*",
+                        "https://localhost",
+
+                        "https://0.0.0.0:3000",
+                        "https://*:3000",
+                        "https://localhost:3000",
+
+                        "https://0.0.0.0:5001",
+                        "https://*:5001",
+                        "https://localhost:5001",
+
+                        "https://0.0.0.0:443",
+                        "https://*:443",
+                        "https://localhost:443",
+
+                        "http://cloud.autodrilling.ru",
+                        "http://cloud.digitaldrilling.ru",
+                        "http://test.digitaldrilling.ru",
+
+                        "https://cloud.autodrilling.ru",
+                        "https://cloud.digitaldrilling.ru",
+                        "https://testdigitaldrilling.ru",
+
+                        "smb2-digital-drilling-frontend-smb2-dev.apps.okd.cloud.nedra.digital",
+                        "http://smb2-digital-drilling-frontend-smb2-dev.apps.okd.cloud.nedra.digital",
+                        "https://smb2-digital-drilling-frontend-smb2-dev.apps.okd.cloud.nedra.digital"
+                        )
+                    .AllowCredentials();
+            });
+        });
+
+        services.AddResponseCompression(options =>
+        {
+            options.EnableForHttps = true;
+            options.Providers.Add<GzipCompressionProvider>();
+        });
+
+        services.AddMvc(c =>
+            c.Conventions.Add(new ApiExplorerGroupPerVersionConvention())
+        );
+    }
+
+    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        app.UseSwagger();
+        app.UseSwaggerUI(c =>
+        {
+            c.SwaggerEndpoint("/swagger/v1/swagger.json", "V1");
+            c.SwaggerEndpoint("/swagger/signalr/swagger.json", "signalr");
+            c.EnablePersistAuthorization();
+            c.EnableFilter();
+            c.DisplayOperationId();
+        });
+
+        if (env.IsDevelopment())
+        {
+            app.UseDeveloperExceptionPage();
         }
 
-        public void ConfigureServices(IServiceCollection services)
+        app.UseCors("ClientPermission");
+        app.UseRouting();
+
+        app.UseResponseCaching();
+        app.UseResponseCompression();
+
+        app.UseAuthentication();
+        app.UseAuthorization();
+
+        app.UseMiddleware<PermissionsMiddlware>(Configuration);
+        app.UseMiddleware<SimplifyExceptionsMiddleware>();
+        app.UseMiddleware<RequerstTrackerMiddleware>();
+
+        app.UseEndpoints(endpoints =>
         {
-            services.AddControllers()
-                .AddJsonOptions(new System.Action<JsonOptions>(options =>
-                {
-                    options.JsonSerializerOptions.NumberHandling =
-                        System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals |
-                        System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString;
-
-                    options.JsonSerializerOptions.Converters.Add(new DateOnlyJsonConverter());
-                    options.JsonSerializerOptions.Converters.Add(new JsonValueJsonConverter());
-                }))
-                .AddProtoBufNet();
-
-            services.AddControllers(options => options.UseDateOnlyTimeOnlyStringConverters());
-
-            ProtobufModel.EnsureRegistered();
-
-            services.AddSwagger();
-
-            services.AddInfrastructure(Configuration);
-            
-            services.AddNotificationTransportServices();
-
-            services.AddIntegrationEvents();
-
-            services.AddJWTAuthentication();
-
-            services.AddSignalR()
-                .Services.AddSingleton<ConnectionManagerService>();
-
-            services.AddCors(options =>
-            {
-                options.AddPolicy("ClientPermission", policy =>
-                {
-                    policy.AllowAnyHeader()
-                        .AllowAnyMethod()
-                        .WithOrigins(
-                            "http://0.0.0.0",
-                            "http://*",
-                            "http://localhost",
-
-                            "http://0.0.0.0:3000",
-                            "http://*:3000",
-                            "http://localhost:3000",
-
-                            "http://0.0.0.0:5000",
-                            "http://*:5000",
-                            "http://localhost:5000",
-
-                            "https://0.0.0.0",
-                            "https://*",
-                            "https://localhost",
-
-                            "https://0.0.0.0:3000",
-                            "https://*:3000",
-                            "https://localhost:3000",
-
-                            "https://0.0.0.0:5001",
-                            "https://*:5001",
-                            "https://localhost:5001",
-
-                            "https://0.0.0.0:443",
-                            "https://*:443",
-                            "https://localhost:443",
-
-                            "http://cloud.autodrilling.ru",
-                            "http://cloud.digitaldrilling.ru",
-                            "http://test.digitaldrilling.ru",
-
-                            "https://cloud.autodrilling.ru",
-                            "https://cloud.digitaldrilling.ru",
-                            "https://testdigitaldrilling.ru",
-
-                            "smb2-digital-drilling-frontend-smb2-dev.apps.okd.cloud.nedra.digital",
-                            "http://smb2-digital-drilling-frontend-smb2-dev.apps.okd.cloud.nedra.digital",
-                            "https://smb2-digital-drilling-frontend-smb2-dev.apps.okd.cloud.nedra.digital"
-                            )
-                        .AllowCredentials();
-                });
-            });
-
-            services.AddResponseCompression(options =>
-            {
-                options.EnableForHttps = true;
-                options.Providers.Add<GzipCompressionProvider>();
-            });
-
-            services.AddMvc(c =>
-                c.Conventions.Add(new ApiExplorerGroupPerVersionConvention())
-            );
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            app.UseSwagger();
-            app.UseSwaggerUI(c =>
-            {
-                c.SwaggerEndpoint("/swagger/v1/swagger.json", "V1");
-                c.SwaggerEndpoint("/swagger/signalr/swagger.json", "signalr");
-                c.EnablePersistAuthorization();
-                c.EnableFilter();
-                c.DisplayOperationId();
-            });
-
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
-            app.UseCors("ClientPermission");
-            app.UseRouting();
-
-            app.UseResponseCaching();
-            app.UseResponseCompression();
-
-            app.UseAuthentication();
-            app.UseAuthorization();
-
-            app.UseMiddleware<PermissionsMiddlware>(Configuration);
-            app.UseMiddleware<SimplifyExceptionsMiddleware>();
-            app.UseMiddleware<RequerstTrackerMiddleware>();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-                endpoints.MapHub<WellInfoHub>("/hubs/wellInfo");
-                endpoints.MapHub<NotificationHub>("/hubs/notifications");
-                endpoints.MapHub<TelemetryHub>("/hubs/telemetry");
-                endpoints.MapHub<ReportsHub>("/hubs/reports");
-            });
-        }
+            endpoints.MapControllers();
+            endpoints.MapHub<WellInfoHub>("/hubs/wellInfo");
+            endpoints.MapHub<NotificationHub>("/hubs/notifications");
+            endpoints.MapHub<TelemetryHub>("/hubs/telemetry");
+            endpoints.MapHub<ReportsHub>("/hubs/reports");
+        });
     }
 }