From 612fa19b109b0591ce2408fdf47912d120f5f96b Mon Sep 17 00:00:00 2001
From: eugeniy_ivanov <ea.ivanov@digitaldrilling.ru>
Date: Tue, 7 Mar 2023 00:36:09 +0500
Subject: [PATCH] add attrib's  -ProcessMap,permissions and remove validators

---
 AsbCloudApp/Data/PermissionDto.cs              |  8 ++++++--
 AsbCloudApp/Data/ProcessMap/ProcessMapDto.cs   |  6 +++++-
 .../Validators/CompanyDtoValidator.cs          | 16 ----------------
 .../Validators/PermissionDtoValidator.cs       | 16 ----------------
 .../Validators/ProcessMapValidator.cs          | 18 ------------------
 5 files changed, 11 insertions(+), 53 deletions(-)
 delete mode 100644 AsbCloudInfrastructure/Validators/CompanyDtoValidator.cs
 delete mode 100644 AsbCloudInfrastructure/Validators/PermissionDtoValidator.cs
 delete mode 100644 AsbCloudInfrastructure/Validators/ProcessMapValidator.cs

diff --git a/AsbCloudApp/Data/PermissionDto.cs b/AsbCloudApp/Data/PermissionDto.cs
index f4d02a2e..6bcaf46e 100644
--- a/AsbCloudApp/Data/PermissionDto.cs
+++ b/AsbCloudApp/Data/PermissionDto.cs
@@ -1,10 +1,12 @@
-namespace AsbCloudApp.Data
+using System.ComponentModel.DataAnnotations;
+
+namespace AsbCloudApp.Data
 {
     /// <summary>
     /// Разрешение для группы пользователей сделать что-либо через web-api. <br/>
     /// применяется как возможность доступа к Endpoint. <br/>
     /// </summary>
-    public class PermissionDto : IId
+    public class PermissionDto : IId       
     {
         /// <inheritdoc/>
         public int Id { get; set; }
@@ -12,11 +14,13 @@
         /// <summary>
         /// Название
         /// </summary>
+        [StringLength(50, MinimumLength = 1)]
         public string Name { get; set; } = string.Empty;
 
         /// <summary>
         /// Описание
         /// </summary>
+        [StringLength(1024, MinimumLength = 1)]
         public string? Description { get; set; }
     }
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/ProcessMap/ProcessMapDto.cs b/AsbCloudApp/Data/ProcessMap/ProcessMapDto.cs
index f76a98dd..2790b90e 100644
--- a/AsbCloudApp/Data/ProcessMap/ProcessMapDto.cs
+++ b/AsbCloudApp/Data/ProcessMap/ProcessMapDto.cs
@@ -1,16 +1,18 @@
 using System;
+using System.ComponentModel.DataAnnotations;
 
 namespace AsbCloudApp.Data.ProcessMap
 {
     /// <summary>
     /// РТК
-    /// </summary>
+    /// </summary>    
     public class ProcessMapDto : IId, IWellRelated
     {
         /// <inheritdoc/>
         public int Id { get; set; }
 
         /// <inheritdoc/>
+        [Range(1,int.MaxValue)]
         public int IdWell { get; set; }
 
         /// <summary>
@@ -31,11 +33,13 @@ namespace AsbCloudApp.Data.ProcessMap
         /// <summary>
         /// Стартовая глубина
         /// </summary>
+        [Range(0,50000)]
         public double DepthStart { get; set; }
 
         /// <summary>
         /// Глубина окончания интервала
         /// </summary>
+        [Range(0, 50000)]
         public double DepthEnd { get; set; }
 
         /// <summary>
diff --git a/AsbCloudInfrastructure/Validators/CompanyDtoValidator.cs b/AsbCloudInfrastructure/Validators/CompanyDtoValidator.cs
deleted file mode 100644
index d8a7c952..00000000
--- a/AsbCloudInfrastructure/Validators/CompanyDtoValidator.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using AsbCloudApp.Data;
-using FluentValidation;
-
-namespace AsbCloudInfrastructure.Validators
-{
-    public class CompanyDtoValidator : AbstractValidator<CompanyDto>
-    {
-        public CompanyDtoValidator()
-        {
-            RuleFor(x => x.Caption).Length(1, 50)
-                .WithMessage("Допустимое имя компании от 1 до 50 символов");
-            RuleFor(x => x.CompanyTypeCaption).Length(1, 30)
-                .WithMessage("Допустимое имя типа компании от 1 до 30 символов");
-        }
-    }
-}
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Validators/PermissionDtoValidator.cs b/AsbCloudInfrastructure/Validators/PermissionDtoValidator.cs
deleted file mode 100644
index 3ca63f69..00000000
--- a/AsbCloudInfrastructure/Validators/PermissionDtoValidator.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using AsbCloudApp.Data;
-using FluentValidation;
-
-namespace AsbCloudInfrastructure.Validators
-{
-    public class PermissionDtoValidator : AbstractValidator<PermissionDto>
-    {
-        public PermissionDtoValidator()
-        {
-            RuleFor(x => x.Name).Length(1, 50)
-                .WithMessage("Допустимая длина названия разрешения от 1 до 50 символов");
-            RuleFor(x => x.Description).Length(1, 1024)
-                .WithMessage("Допустимая длина описания от 1 до 1024 символов");
-        }
-    }
-}
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Validators/ProcessMapValidator.cs b/AsbCloudInfrastructure/Validators/ProcessMapValidator.cs
deleted file mode 100644
index 661d01be..00000000
--- a/AsbCloudInfrastructure/Validators/ProcessMapValidator.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using AsbCloudApp.Data.ProcessMap;
-using FluentValidation;
-
-namespace AsbCloudInfrastructure.Validators
-{
-    public class ProcessMapValidator : AbstractValidator<ProcessMapDto>
-    {
-        public ProcessMapValidator()
-        {
-            RuleFor(x => x.IdWell).GreaterThan(0)
-                .WithMessage("Id скважины не может быть меньше 1");
-            RuleFor(x => x.DepthStart).GreaterThan(-1)
-                .WithMessage("Глубина не может быть отрицательной");
-            RuleFor(x => x.DepthEnd).GreaterThan(-1)
-                .WithMessage("Глубина не может быть отрицательной");
-        }
-    }
-}
\ No newline at end of file