From bc35e187038838881f52367c7ab5f4b1f789833f Mon Sep 17 00:00:00 2001
From: ngfrolov <ng.frolov@autodrilling.ru>
Date: Wed, 22 Feb 2023 15:31:16 +0500
Subject: [PATCH 1/2] fix nullable

---
 AsbCloudApp/Data/MapPointBaseDto.cs | 2 +-
 AsbCloudApp/Data/MessageDto.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/AsbCloudApp/Data/MapPointBaseDto.cs b/AsbCloudApp/Data/MapPointBaseDto.cs
index f4580983..2a3a7ff0 100644
--- a/AsbCloudApp/Data/MapPointBaseDto.cs
+++ b/AsbCloudApp/Data/MapPointBaseDto.cs
@@ -11,7 +11,7 @@
         /// <summary>
         /// Название
         /// </summary>
-        public string Caption { get; set; } = string.Empty;
+        public string Caption { get; set; } = null!;
 
         /// <inheritdoc/>
         public double? Latitude { get; set; }
diff --git a/AsbCloudApp/Data/MessageDto.cs b/AsbCloudApp/Data/MessageDto.cs
index a8b982c2..b8d930c5 100644
--- a/AsbCloudApp/Data/MessageDto.cs
+++ b/AsbCloudApp/Data/MessageDto.cs
@@ -28,7 +28,7 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// пользователь панели оператора
         /// </summary>
-        public string User { get; set; } = null!;
+        public string? User { get; set; }
 
         /// <summary>
         /// текст сообщения

From 1e86c24258d4d50b270a2fb7fd5b0a505a932917 Mon Sep 17 00:00:00 2001
From: ngfrolov <ng.frolov@autodrilling.ru>
Date: Wed, 22 Feb 2023 17:10:29 +0500
Subject: [PATCH 2/2] Fix comparators implementation and revise some dtos

---
 AsbCloudApp/Comparators/ComparerIId.cs           | 16 ++++++----------
 .../Comparators/TelemetryUserDtoComparer.cs      | 10 ++++------
 AsbCloudApp/Data/ReportProgressDto.cs            |  2 +-
 AsbCloudApp/Data/ReportPropertiesDto.cs          |  1 -
 AsbCloudApp/Data/RequestLogDto.cs                |  2 --
 AsbCloudApp/Data/RequestLogUserDto.cs            |  2 --
 AsbCloudApp/Data/ScheduleDto.cs                  |  6 +++---
 AsbCloudApp/Data/SimpleTimezoneDto.cs            |  1 -
 AsbCloudApp/Data/StatClusterDto.cs               |  5 +++--
 AsbCloudApp/Data/StatSectionDto.cs               |  2 +-
 AsbCloudApp/Data/StatWellDto.cs                  | 13 +++++++------
 AsbCloudApp/Data/TelemetryDto.cs                 |  8 ++++----
 AsbCloudApp/Data/TimeDto.cs                      |  6 +++---
 13 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/AsbCloudApp/Comparators/ComparerIId.cs b/AsbCloudApp/Comparators/ComparerIId.cs
index 93b0d91a..4c02af80 100644
--- a/AsbCloudApp/Comparators/ComparerIId.cs
+++ b/AsbCloudApp/Comparators/ComparerIId.cs
@@ -25,12 +25,8 @@ namespace AsbCloudApp.Comparators
         /// <param name="y"></param>
         /// <returns></returns>
         public int Compare(IId? x, IId? y)
-        {
-            if (x is null || y is null)
-                return 0;
-            else
-                return x.Id.CompareTo(y.Id);
-        }
+            => (x?.Id??0).CompareTo(y?.Id??0);
+        
 
         /// <summary>
         /// 
@@ -39,11 +35,11 @@ namespace AsbCloudApp.Comparators
         /// <param name="y"></param>
         /// <returns></returns>
         public bool Equals(IId? x, IId? y)
-        {
-            if (x is null || y is null)
-                return false;
-            else
+        {            
+            if (x is not null && y is not null)
                 return x.Id == y.Id;
+
+            return x == y;
         }
 
         /// <summary>
diff --git a/AsbCloudApp/Comparators/TelemetryUserDtoComparer.cs b/AsbCloudApp/Comparators/TelemetryUserDtoComparer.cs
index eac2d83d..2c8035ed 100644
--- a/AsbCloudApp/Comparators/TelemetryUserDtoComparer.cs
+++ b/AsbCloudApp/Comparators/TelemetryUserDtoComparer.cs
@@ -9,12 +9,10 @@ namespace AsbCloudApp.Comparators
         /// <inheritdoc/>
         public bool Equals(TelemetryUserDto? prevUser, TelemetryUserDto? nextUser)
         {
-            if (prevUser is null || nextUser is null)
-                return false;
-            else if (prevUser.Id == nextUser.Id)
-                return true;
-            else
-                return false;
+            if (prevUser is not null && nextUser is not null)
+                return prevUser.Id == nextUser.Id;
+
+            return prevUser == nextUser;
         }
 
         /// <inheritdoc/>
diff --git a/AsbCloudApp/Data/ReportProgressDto.cs b/AsbCloudApp/Data/ReportProgressDto.cs
index 6a3caa51..c7bf4cbb 100644
--- a/AsbCloudApp/Data/ReportProgressDto.cs
+++ b/AsbCloudApp/Data/ReportProgressDto.cs
@@ -13,7 +13,7 @@
         /// <summary>
         /// название текущей операции генерации
         /// </summary>
-        public string Operation { get; set; }
+        public string? Operation { get; set; }
 
         /// <summary>
         /// номер текущей страницы
diff --git a/AsbCloudApp/Data/ReportPropertiesDto.cs b/AsbCloudApp/Data/ReportPropertiesDto.cs
index e8527d90..217f7598 100644
--- a/AsbCloudApp/Data/ReportPropertiesDto.cs
+++ b/AsbCloudApp/Data/ReportPropertiesDto.cs
@@ -2,7 +2,6 @@
 
 namespace AsbCloudApp.Data
 {
-#nullable enable
     /// <summary>
     /// DTO формирования рапорта
     /// </summary>
diff --git a/AsbCloudApp/Data/RequestLogDto.cs b/AsbCloudApp/Data/RequestLogDto.cs
index eb3231c0..ecdb183e 100644
--- a/AsbCloudApp/Data/RequestLogDto.cs
+++ b/AsbCloudApp/Data/RequestLogDto.cs
@@ -2,7 +2,6 @@
 
 namespace AsbCloudApp.Data
 {
-#nullable enable
     /// <summary>
     /// DTO журнала запросов
     /// </summary>
@@ -63,5 +62,4 @@ namespace AsbCloudApp.Data
         /// </summary>
         public string? ExceptionStack { get; set; } = null!;
     }
-#nullable disable
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/RequestLogUserDto.cs b/AsbCloudApp/Data/RequestLogUserDto.cs
index bd39eaef..3f5d6a39 100644
--- a/AsbCloudApp/Data/RequestLogUserDto.cs
+++ b/AsbCloudApp/Data/RequestLogUserDto.cs
@@ -2,7 +2,6 @@
 
 namespace AsbCloudApp.Data
 {
-#nullable enable
     /// <summary>
     /// DTO статистики запросов по пользователю
     /// </summary>
@@ -48,5 +47,4 @@ namespace AsbCloudApp.Data
         /// </summary>
         public UserDto User { get; set; } = null!;
     }
-#nullable disable
 }
diff --git a/AsbCloudApp/Data/ScheduleDto.cs b/AsbCloudApp/Data/ScheduleDto.cs
index 00fb51bb..cd0175b1 100644
--- a/AsbCloudApp/Data/ScheduleDto.cs
+++ b/AsbCloudApp/Data/ScheduleDto.cs
@@ -21,12 +21,12 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// Начало смены
         /// </summary>
-        public TimeDto ShiftStart { get; set; }
+        public TimeDto ShiftStart { get; set; } = null!;
 
         /// <summary>
         /// Конец смены
         /// </summary>
-        public TimeDto ShiftEnd { get; set; }
+        public TimeDto ShiftEnd { get; set; } = null!;
 
         /// <summary>
         /// Начало бурения
@@ -41,6 +41,6 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// Бурильщик
         /// </summary>
-        public DrillerDto Driller { get; set; }
+        public DrillerDto? Driller { get; set; }
     }
 }
diff --git a/AsbCloudApp/Data/SimpleTimezoneDto.cs b/AsbCloudApp/Data/SimpleTimezoneDto.cs
index 100ede09..3ec75814 100644
--- a/AsbCloudApp/Data/SimpleTimezoneDto.cs
+++ b/AsbCloudApp/Data/SimpleTimezoneDto.cs
@@ -1,6 +1,5 @@
 namespace AsbCloudApp.Data
 {
-#nullable enable
     /// <summary>
     /// ��������� ����
     /// </summary>
diff --git a/AsbCloudApp/Data/StatClusterDto.cs b/AsbCloudApp/Data/StatClusterDto.cs
index 0bcbfe65..db768ab1 100644
--- a/AsbCloudApp/Data/StatClusterDto.cs
+++ b/AsbCloudApp/Data/StatClusterDto.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AsbCloudApp.Data
 {
@@ -13,11 +14,11 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// название куста
         /// </summary>
-        public string Caption { get; set; }
+        public string Caption { get; set; } = string.Empty;
 
         /// <summary>
         /// список статистик скважин куста
         /// </summary>
-        public IEnumerable<StatWellDto> StatsWells { get; set; }
+        public IEnumerable<StatWellDto> StatsWells { get; set; } = Enumerable.Empty<StatWellDto>();
     }
 }
diff --git a/AsbCloudApp/Data/StatSectionDto.cs b/AsbCloudApp/Data/StatSectionDto.cs
index f0da2188..58fff71b 100644
--- a/AsbCloudApp/Data/StatSectionDto.cs
+++ b/AsbCloudApp/Data/StatSectionDto.cs
@@ -11,6 +11,6 @@
         /// <summary>
         /// название секции
         /// </summary>
-        public string Caption { get; set; }
+        public string Caption { get; set; } = string.Empty;
     }
 }
diff --git a/AsbCloudApp/Data/StatWellDto.cs b/AsbCloudApp/Data/StatWellDto.cs
index 08581313..9793e858 100644
--- a/AsbCloudApp/Data/StatWellDto.cs
+++ b/AsbCloudApp/Data/StatWellDto.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AsbCloudApp.Data
 {
@@ -14,12 +15,12 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// название 
         /// </summary>
-        public string Caption { get; set; }
+        public string Caption { get; set; } = string.Empty;
 
         /// <summary>
         /// тип скважины
         /// </summary>
-        public string WellType { get; set; }
+        public string WellType { get; set; } = string.Empty;
 
         /// <summary>
         /// ИД состояния скважины
@@ -29,7 +30,7 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// текст состояния скважины
         /// </summary>
-        public string State { get; set; }
+        public string State { get; set; } = string.Empty;
 
         /// <summary>
         /// дата прихода последней телеметрии
@@ -39,16 +40,16 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// Статистика по секциям
         /// </summary>
-        public IEnumerable<StatSectionDto> Sections { get; set; }
+        public IEnumerable<StatSectionDto> Sections { get; set; } = Enumerable.Empty<StatSectionDto>();
 
         /// <summary>
         /// статистика за всю скважину
         /// </summary>
-        public PlanFactBase<StatOperationsDto> Total { get; set; }
+        public PlanFactBase<StatOperationsDto> Total { get; set; } = new();
 
         /// <summary>
         /// компании участвующие в строительстве скважины
         /// </summary>
-        public IEnumerable<CompanyDto> Companies { get; set; }
+        public IEnumerable<CompanyDto> Companies { get; set; } = Enumerable.Empty<CompanyDto>();
     }
 }
diff --git a/AsbCloudApp/Data/TelemetryDto.cs b/AsbCloudApp/Data/TelemetryDto.cs
index d71afdd4..d243c749 100644
--- a/AsbCloudApp/Data/TelemetryDto.cs
+++ b/AsbCloudApp/Data/TelemetryDto.cs
@@ -9,16 +9,16 @@ namespace AsbCloudApp.Data
     {
         /// <inheritdoc/>
         public int Id { get; set; }
-        
+
         /// <summary>
         /// уникальный идентификатор телеметрии по которому панель оператора присылает данные
         /// </summary>
-        public string RemoteUid { get; set; }
+        public string RemoteUid { get; set; } = null!;
 
         /// <summary>
         /// информация о бурении, панели оператора и контроллерах
         /// </summary>
-        public TelemetryInfoDto Info { get; set; }
+        public TelemetryInfoDto? Info { get; set; }
     }
 
     /// <summary>
@@ -34,6 +34,6 @@ namespace AsbCloudApp.Data
         /// <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 faf99427..6a3620f2 100644
--- a/AsbCloudApp/Data/TimeDto.cs
+++ b/AsbCloudApp/Data/TimeDto.cs
@@ -118,11 +118,11 @@ namespace AsbCloudApp.Data
         public static bool operator >(TimeDto a, TimeDto b) => a.TotalSeconds > b.TotalSeconds;
 
         /// <inheritdoc/>
-        public int CompareTo(TimeDto other)
-            => TotalSeconds - other.TotalSeconds;
+        public int CompareTo(TimeDto? other)
+            => TotalSeconds - other?.TotalSeconds??0;
 
         /// <inheritdoc/>
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (ReferenceEquals(this, obj))
             {