From b8f9a6ae4a3a4ae7fc88d53235a3dc3f46ccfe9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D0=BB=D1=8F=20=D0=91=D0=B8=D0=B7=D1=8E=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0?= <user2@kaidev.ru>
Date: Wed, 17 Jan 2024 13:12:17 +0500
Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=B0=D1=82=D1=80=D0=B8=D0=B1=D1=83=D1=82=20[Required?=
 =?UTF-8?q?]=20=D0=BD=D0=B0=20non-nullable=20=D0=BF=D0=BE=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=B2=20dtos=20(=D1=87.=203)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Blocks/WellOperation/WellOperationBlockDto.cs |  9 ++++++---
 AsbCloudApp/Data/GTR/WitsItemRecordDto.cs         |  3 +++
 AsbCloudApp/Data/GTR/WitsRecordDto.cs             |  3 +++
 .../Data/ProcessMaps/WellSectionPlanDto.cs        |  3 ++-
 AsbCloudApp/Data/WellCaseDto.cs                   |  4 ++++
 AsbCloudApp/Data/WellCompositeDto.cs              |  7 ++++++-
 AsbCloudApp/Data/WellDto.cs                       |  1 +
 AsbCloudApp/Data/WellFinalDocumentDto.cs          |  5 +++++
 AsbCloudApp/Data/WellFinalDocumentInputDto.cs     |  3 +++
 AsbCloudApp/Data/WellFinalDocumentsHistoryDto.cs  |  4 ++++
 AsbCloudApp/Data/WellGroupOpertionDto.cs          |  5 +++++
 AsbCloudApp/Data/WellOperationCategoryDto.cs      |  1 +
 AsbCloudApp/Data/WellOperationPlanDto.cs          |  2 ++
 AsbCloudApp/Data/WellSectionTypeDto.cs            | 11 ++++++++---
 AsbCloudApp/Data/WellboreDto.cs                   | 15 +++++++++++----
 15 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/AsbCloudApp/Data/DailyReport/Blocks/WellOperation/WellOperationBlockDto.cs b/AsbCloudApp/Data/DailyReport/Blocks/WellOperation/WellOperationBlockDto.cs
index f12fd6f3..1030a826 100644
--- a/AsbCloudApp/Data/DailyReport/Blocks/WellOperation/WellOperationBlockDto.cs
+++ b/AsbCloudApp/Data/DailyReport/Blocks/WellOperation/WellOperationBlockDto.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
 namespace AsbCloudApp.Data.DailyReport.Blocks.WellOperation;
@@ -8,13 +9,15 @@ namespace AsbCloudApp.Data.DailyReport.Blocks.WellOperation;
 /// </summary>
 public class WellOperationBlockDto
 {
-	/// <summary>
-	/// Продолжительность бурения за секцию
-	/// </summary>
+    /// <summary>
+    /// Продолжительность бурения за секцию
+    /// </summary>
+    [Required]
 	public double SectionDrillingHours { get; set; }
 
 	/// <summary>
 	/// Операции проводимые на скважине
 	/// </summary>
+	[Required]
 	public IEnumerable<WellOperationRecordDto> WellOperations { get; set; } = Enumerable.Empty<WellOperationRecordDto>();
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/GTR/WitsItemRecordDto.cs b/AsbCloudApp/Data/GTR/WitsItemRecordDto.cs
index 46d82e6b..98c4dce8 100644
--- a/AsbCloudApp/Data/GTR/WitsItemRecordDto.cs
+++ b/AsbCloudApp/Data/GTR/WitsItemRecordDto.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations;
 
 namespace AsbCloudApp.Data.GTR
 {
@@ -10,11 +11,13 @@ namespace AsbCloudApp.Data.GTR
         /// <summary>
         /// Record Id
         /// </summary>
+        [Required]
         public int IdRecord { get; set; }
 
         /// <summary>
         /// Item Id
         /// </summary>
+        [Required]
         public int IdItem { get; set; }
 
         /// <summary>
diff --git a/AsbCloudApp/Data/GTR/WitsRecordDto.cs b/AsbCloudApp/Data/GTR/WitsRecordDto.cs
index 28e6ba81..e91fa8f0 100644
--- a/AsbCloudApp/Data/GTR/WitsRecordDto.cs
+++ b/AsbCloudApp/Data/GTR/WitsRecordDto.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 namespace AsbCloudApp.Data.GTR
 {
@@ -11,6 +12,7 @@ namespace AsbCloudApp.Data.GTR
         /// <summary>
         /// Id записи
         /// </summary>
+        [Required]
         public int Id { get; set; }
 
         /// <summary>
@@ -21,6 +23,7 @@ namespace AsbCloudApp.Data.GTR
         /// <summary>
         /// Параметры. Ключ - id_item. ValueContainer содержит значение.
         /// </summary>
+        [Required]
         public Dictionary<int, JsonValue> Items { get; set; } = new();
     }
 }
diff --git a/AsbCloudApp/Data/ProcessMaps/WellSectionPlanDto.cs b/AsbCloudApp/Data/ProcessMaps/WellSectionPlanDto.cs
index ba4fc8fb..35a99e7c 100644
--- a/AsbCloudApp/Data/ProcessMaps/WellSectionPlanDto.cs
+++ b/AsbCloudApp/Data/ProcessMaps/WellSectionPlanDto.cs
@@ -14,7 +14,8 @@ public class WellSectionPlanDto : ItemInfoDto,
 	/// <inheritdoc/>
 	public int Id { get; set; }
 
-	/// <inheritdoc/>
+    /// <inheritdoc/>
+    [Required]
 	public int IdWell { get; set; }
 
 	/// <summary>
diff --git a/AsbCloudApp/Data/WellCaseDto.cs b/AsbCloudApp/Data/WellCaseDto.cs
index 867d4426..0241faf6 100644
--- a/AsbCloudApp/Data/WellCaseDto.cs
+++ b/AsbCloudApp/Data/WellCaseDto.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
 namespace AsbCloudApp.Data
@@ -11,16 +12,19 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// Скважина
         /// </summary>
+        [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>();
     }
 
diff --git a/AsbCloudApp/Data/WellCompositeDto.cs b/AsbCloudApp/Data/WellCompositeDto.cs
index 4f5966b2..6fe39a40 100644
--- a/AsbCloudApp/Data/WellCompositeDto.cs
+++ b/AsbCloudApp/Data/WellCompositeDto.cs
@@ -1,4 +1,6 @@
-namespace AsbCloudApp.Data
+using System.ComponentModel.DataAnnotations;
+
+namespace AsbCloudApp.Data
 {
     /// <summary>
     /// DTO элемент композитной скважины
@@ -6,16 +8,19 @@
     public class WellCompositeDto : IWellRelated
     {
         /// <inheritdoc/>
+        [Required]
         public int IdWell { get; set; }
 
         /// <summary>
         /// id скважины входящей в композитную для этой
         /// </summary>
+        [Required]
         public int IdWellSrc { get; set; }
 
         /// <summary>
         /// id секции скважины входящей в композитную для этой
         /// </summary>
+        [Required]
         public int IdWellSectionType { get; set; }
     }
 }
diff --git a/AsbCloudApp/Data/WellDto.cs b/AsbCloudApp/Data/WellDto.cs
index 979d6885..30f524c2 100644
--- a/AsbCloudApp/Data/WellDto.cs
+++ b/AsbCloudApp/Data/WellDto.cs
@@ -19,6 +19,7 @@ namespace AsbCloudApp.Data
         /// 1 - в работе,
         /// 2 - завершена
         /// </summary>
+        [Required]
         public int IdState { get; set; }
     }
 
diff --git a/AsbCloudApp/Data/WellFinalDocumentDto.cs b/AsbCloudApp/Data/WellFinalDocumentDto.cs
index 1dab3ac0..a60afd6c 100644
--- a/AsbCloudApp/Data/WellFinalDocumentDto.cs
+++ b/AsbCloudApp/Data/WellFinalDocumentDto.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using AsbCloudApp.Data.User;
 
@@ -12,6 +13,7 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// Идентификатор категории файла
         /// </summary>
+        [Required]
         public int IdCategory { get; set; }
 
         /// <summary>
@@ -22,16 +24,19 @@ namespace AsbCloudApp.Data
         /// <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 int FilesCount { get; set; }
 
         /// <summary>
diff --git a/AsbCloudApp/Data/WellFinalDocumentInputDto.cs b/AsbCloudApp/Data/WellFinalDocumentInputDto.cs
index 80052e5c..75cb0ca3 100644
--- a/AsbCloudApp/Data/WellFinalDocumentInputDto.cs
+++ b/AsbCloudApp/Data/WellFinalDocumentInputDto.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
 namespace AsbCloudApp.Data
@@ -11,11 +12,13 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// Идентификатор категории файла
         /// </summary>
+        [Required]
         public int IdCategory { get; set; }
 
         /// <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 789dc9c0..f08c67e3 100644
--- a/AsbCloudApp/Data/WellFinalDocumentsHistoryDto.cs
+++ b/AsbCloudApp/Data/WellFinalDocumentsHistoryDto.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 namespace AsbCloudApp.Data
 {
@@ -10,16 +11,19 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// Вышка
         /// </summary>
+        [Required]
         public int IdWell { get; set; }
 
         /// <summary>
         /// Наименование категории файла
         /// </summary>
+        [Required]
         public int IdCategory { get; set; }
 
         /// <summary>
         /// Файлы
         /// </summary>
+        [Required]
         public IEnumerable<FileInfoDto> Files { get; set; } = null!;
     }
 }
diff --git a/AsbCloudApp/Data/WellGroupOpertionDto.cs b/AsbCloudApp/Data/WellGroupOpertionDto.cs
index 0839045c..acd8221d 100644
--- a/AsbCloudApp/Data/WellGroupOpertionDto.cs
+++ b/AsbCloudApp/Data/WellGroupOpertionDto.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
 namespace AsbCloudApp.Data;
@@ -10,6 +11,7 @@ public class WellGroupOpertionDto
     /// <summary>
     /// Id категории
     /// </summary>
+    [Required]
     public int IdCategory { get; set; }
 
     /// <summary>
@@ -26,11 +28,13 @@ public class WellGroupOpertionDto
     /// <summary>
     /// Количество операций
     /// </summary>
+    [Required]
     public int Count { get; set; }
 
     /// <summary>
     /// Суммарное время операций, мин
     /// </summary>
+    [Required]
     public double TotalMinutes { get; set; }
 
     /// <summary>
@@ -51,6 +55,7 @@ public class WellGroupOpertionDto
     /// <summary>
     /// Общая глубина забоя
     /// </summary>
+    [Required]
     public double DeltaDepth { get; set; }
 
     /// <summary>
diff --git a/AsbCloudApp/Data/WellOperationCategoryDto.cs b/AsbCloudApp/Data/WellOperationCategoryDto.cs
index 37a5178b..108a31f0 100644
--- a/AsbCloudApp/Data/WellOperationCategoryDto.cs
+++ b/AsbCloudApp/Data/WellOperationCategoryDto.cs
@@ -8,6 +8,7 @@ namespace AsbCloudApp.Data
     public class WellOperationCategoryDto : IId
     {
         /// <inheritdoc/>
+        [Required]
         public int Id { get; set; }
 
         /// <summary>
diff --git a/AsbCloudApp/Data/WellOperationPlanDto.cs b/AsbCloudApp/Data/WellOperationPlanDto.cs
index be469948..5c1bac9f 100644
--- a/AsbCloudApp/Data/WellOperationPlanDto.cs
+++ b/AsbCloudApp/Data/WellOperationPlanDto.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
 namespace AsbCloudApp.Data
@@ -14,6 +15,7 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// коллекция плановых операций
         /// </summary>
+        [Required]
         public IEnumerable<WellOperationDto> WellOperationsPlan { get; set; } = Enumerable.Empty<WellOperationDto>();
 
         /// <summary>
diff --git a/AsbCloudApp/Data/WellSectionTypeDto.cs b/AsbCloudApp/Data/WellSectionTypeDto.cs
index 28e9ba68..f8eef939 100644
--- a/AsbCloudApp/Data/WellSectionTypeDto.cs
+++ b/AsbCloudApp/Data/WellSectionTypeDto.cs
@@ -1,3 +1,5 @@
+using System.ComponentModel.DataAnnotations;
+
 namespace AsbCloudApp.Data;
 
 /// <summary>
@@ -5,18 +7,21 @@ namespace AsbCloudApp.Data;
 /// </summary>
 public class WellSectionTypeDto : IId
 {
-	/// <summary>
-	/// Id секции
-	/// </summary>
+    /// <summary>
+    /// Id секции
+    /// </summary>
+    [Required]
 	public int Id { get; set; }
 
 	/// <summary>
 	/// Название типа секции
 	/// </summary>
+	[Required]
 	public string Caption { get; set; } = null!;
 
 	/// <summary>
 	/// Порядок
 	/// </summary>
+	[Required]
 	public float Order { get; set; }
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/WellboreDto.cs b/AsbCloudApp/Data/WellboreDto.cs
index 68c5695b..4edf6256 100644
--- a/AsbCloudApp/Data/WellboreDto.cs
+++ b/AsbCloudApp/Data/WellboreDto.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations;
 
 namespace AsbCloudApp.Data;
 
@@ -15,30 +16,36 @@ public class WellboreDto
     /// <summary>
     /// Идентификатор
     /// </summary>
+	[Required]
     public int Id { get; set; }
 
 	/// <summary>
 	/// Название
 	/// </summary>
+	[Required]
 	public string Name { get; set; } = null!;
-	
+
 	/// <summary>
 	/// Начальная глубина ствола
 	/// </summary>
+	[Required]
 	public double DepthStart { get; set; }
-	
+
 	/// <summary>
 	/// Конечная глубина скважины
 	/// </summary>
+	[Required]
 	public double DepthEnd { get; set; }
-	
+
 	/// <summary>
 	/// Дата начала первой операции
 	/// </summary>
+	[Required]
 	public DateTimeOffset DateStart { get; set; }
-	
+
 	/// <summary>
 	/// Дата завершения последней операции
 	/// </summary>
+	[Required]
 	public DateTimeOffset DateEnd { get; set; }
 }
\ No newline at end of file

From b13353b994ca5bca1418edcb478597f1a33b5e8e Mon Sep 17 00:00:00 2001
From: Frolov-Nikita <nikita.grigorevich@gmail.com>
Date: Sun, 21 Jan 2024 12:52:46 +0500
Subject: [PATCH 2/2] Add some required attributes

---
 AsbCloudApp/Data/GTR/WitsItemRecordDto.cs | 2 ++
 AsbCloudApp/Data/GTR/WitsRecordDto.cs     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/AsbCloudApp/Data/GTR/WitsItemRecordDto.cs b/AsbCloudApp/Data/GTR/WitsItemRecordDto.cs
index 98c4dce8..0137754e 100644
--- a/AsbCloudApp/Data/GTR/WitsItemRecordDto.cs
+++ b/AsbCloudApp/Data/GTR/WitsItemRecordDto.cs
@@ -23,11 +23,13 @@ namespace AsbCloudApp.Data.GTR
         /// <summary>
         /// Дата создания записи
         /// </summary>
+        [Required]
         public DateTime Date { get; set; }
 
         /// <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 e91fa8f0..4e5da733 100644
--- a/AsbCloudApp/Data/GTR/WitsRecordDto.cs
+++ b/AsbCloudApp/Data/GTR/WitsRecordDto.cs
@@ -18,6 +18,7 @@ namespace AsbCloudApp.Data.GTR
         /// <summary>
         /// Дата создания записи
         /// </summary>
+        [Required]
         public DateTime Date { get; set; }
 
         /// <summary>