Merge pull request #61 from IgniteUI/validations-new

ddidgdimitrov-infragistics · web-flow · commit 093fb69617c9 · 2025-05-29T15:19:55.000+03:00
Validations new
diff --git a/NorthwindCRUD/Controllers/CategoriesController.cs b/NorthwindCRUD/Controllers/CategoriesController.cs
@@ -1,5 +1,6 @@
 namespace NorthwindCRUD.Controllers
 {
+    using System.ComponentModel.DataAnnotations;
     using AutoMapper;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -50,8 +51,8 @@ public ActionResult<CategoryDto[]> GetAll()
         /// <returns>A PagedResultDto object containing the fetched T and the total record count.</returns>
         [HttpGet("GetCategoriesWithSkip")]
         public ActionResult<PagedResultDto<CategoryDto>> GetCategoriesWithSkip(
-            [FromQuery][Attributes.SwaggerSkipParameter] int? skip,
-            [FromQuery][Attributes.SwaggerTopParameter] int? top,
+            [FromQuery][Attributes.SwaggerSkipParameter][Range(0, int.MaxValue)] int? skip,
+            [FromQuery][Attributes.SwaggerTopParameter][Range(0, int.MaxValue)] int? top,
             [FromQuery][Attributes.SwaggerOrderByParameter] string? orderBy)
         {
             try
diff --git a/NorthwindCRUD/Controllers/CustomersController.cs b/NorthwindCRUD/Controllers/CustomersController.cs
@@ -1,5 +1,6 @@
 ﻿namespace NorthwindCRUD.Controllers
 {
+    using System.ComponentModel.DataAnnotations;
     using AutoMapper;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -50,8 +51,8 @@ public ActionResult<CustomerDto[]> GetAll()
         /// <returns>A PagedResultDto object containing the fetched T and the total record count.</returns>
         [HttpGet("GetCustomersWithSkip")]
         public ActionResult<PagedResultDto<CustomerDto>> GetCustomersWithSkip(
-            [FromQuery][Attributes.SwaggerSkipParameter] int? skip,
-            [FromQuery][Attributes.SwaggerTopParameter] int? top,
+            [FromQuery][Attributes.SwaggerSkipParameter][Range(0, int.MaxValue)] int? skip,
+            [FromQuery][Attributes.SwaggerTopParameter][Range(0, int.MaxValue)] int? top,
             [FromQuery][Attributes.SwaggerOrderByParameter] string? orderBy)
         {
             try
diff --git a/NorthwindCRUD/Controllers/EmployeesController.cs b/NorthwindCRUD/Controllers/EmployeesController.cs
@@ -1,5 +1,6 @@
 ﻿namespace NorthwindCRUD.Controllers
 {
+    using System.ComponentModel.DataAnnotations;
     using AutoMapper;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -68,8 +69,8 @@ public ActionResult<OrderDto[]> GetAllAuthorized()
         /// <returns>A PagedResultDto object containing the fetched T and the total record count.</returns>
         [HttpGet("GetEmployeesWithSkip")]
         public ActionResult<PagedResultDto<EmployeeDto>> GetPagedEmployees(
-            [FromQuery][Attributes.SwaggerSkipParameter] int? skip,
-            [FromQuery][Attributes.SwaggerTopParameter] int? top,
+            [FromQuery][Attributes.SwaggerSkipParameter][Range(0, int.MaxValue)] int? skip,
+            [FromQuery][Attributes.SwaggerTopParameter][Range(0, int.MaxValue)] int? top,
             [FromQuery][Attributes.SwaggerOrderByParameter] string? orderBy)
         {
             try
diff --git a/NorthwindCRUD/Controllers/OrdersController.cs b/NorthwindCRUD/Controllers/OrdersController.cs
@@ -1,5 +1,6 @@
 ﻿namespace NorthwindCRUD.Controllers
 {
+    using System.ComponentModel.DataAnnotations;
     using AutoMapper;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -56,8 +57,8 @@ public ActionResult<OrderDto[]> GetAll()
         /// <returns>A PagedResultDto object containing the fetched T and the total record count.</returns>
         [HttpGet("GetPagedOrders")]
         public ActionResult<PagedResultDto<OrderDto>> GetAllOrders(
-            [FromQuery][Attributes.SwaggerSkipParameter] int? skip,
-            [FromQuery][Attributes.SwaggerTopParameter] int? top,
+            [FromQuery][Attributes.SwaggerSkipParameter][Range(0, int.MaxValue)] int? skip,
+            [FromQuery][Attributes.SwaggerTopParameter][Range(0, int.MaxValue)] int? top,
             [FromQuery][Attributes.SwaggerOrderByParameter] string? orderBy)
         {
             try
diff --git a/NorthwindCRUD/Controllers/ProductsController.cs b/NorthwindCRUD/Controllers/ProductsController.cs
@@ -1,5 +1,6 @@
 namespace NorthwindCRUD.Controllers
 {
+    using System.ComponentModel.DataAnnotations;
     using AutoMapper;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -70,8 +71,8 @@ public ActionResult<OrderDto[]> GetAllAuthorized()
         /// <returns>A PagedResultDto object containing the fetched T and the total record count.</returns>
         [HttpGet("GetPagedProducts")]
         public ActionResult<PagedResultDto<ProductDto>> GetAllProducts(
-            [FromQuery][Attributes.SwaggerSkipParameter] int? skip,
-            [FromQuery][Attributes.SwaggerTopParameter] int? top,
+            [FromQuery][Attributes.SwaggerSkipParameter][Range(0, int.MaxValue)] int? skip,
+            [FromQuery][Attributes.SwaggerTopParameter][Range(0, int.MaxValue)] int? top,
             [FromQuery][Attributes.SwaggerOrderByParameter] string? orderBy)
         {
             try
diff --git a/NorthwindCRUD/Controllers/RegionsController.cs b/NorthwindCRUD/Controllers/RegionsController.cs
@@ -1,5 +1,6 @@
 ﻿namespace NorthwindCRUD.Controllers
 {
+    using System.ComponentModel.DataAnnotations;
     using AutoMapper;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -50,8 +51,8 @@ public ActionResult<RegionDto[]> GetAll()
         /// <returns>A PagedResultDto object containing the fetched T and the total record count.</returns>
         [HttpGet("GetPagedRegions")]
         public ActionResult<PagedResultDto<RegionDto>> GetAllRegions(
-            [FromQuery][Attributes.SwaggerSkipParameter] int? skip,
-            [FromQuery][Attributes.SwaggerTopParameter] int? top,
+            [FromQuery][Attributes.SwaggerSkipParameter][Range(0, int.MaxValue)] int? skip,
+            [FromQuery][Attributes.SwaggerTopParameter][Range(0, int.MaxValue)] int? top,
             [FromQuery][Attributes.SwaggerOrderByParameter] string? orderBy)
         {
             try
diff --git a/NorthwindCRUD/Controllers/ShippersController.cs b/NorthwindCRUD/Controllers/ShippersController.cs
@@ -1,5 +1,6 @@
 ﻿namespace NorthwindCRUD.Controllers
 {
+    using System.ComponentModel.DataAnnotations;
     using AutoMapper;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -50,8 +51,8 @@ public ActionResult<ShipperDto[]> GetAll()
         /// <returns>A PagedResultDto object containing the fetched T and the total record count.</returns>
         [HttpGet("GetPagedShippersWithSkip")]
         public ActionResult<PagedResultDto<ShipperDto>> GetPagedShippersWithSkip(
-            [FromQuery][Attributes.SwaggerSkipParameter] int? skip,
-            [FromQuery][Attributes.SwaggerTopParameter] int? top,
+            [FromQuery][Attributes.SwaggerSkipParameter][Range(0, int.MaxValue)] int? skip,
+            [FromQuery][Attributes.SwaggerTopParameter][Range(0, int.MaxValue)] int? top,
             [FromQuery][Attributes.SwaggerOrderByParameter] string? orderBy)
         {
             try
diff --git a/NorthwindCRUD/Controllers/SuppliersController.cs b/NorthwindCRUD/Controllers/SuppliersController.cs
@@ -1,5 +1,6 @@
 ﻿namespace NorthwindCRUD.Controllers
 {
+    using System.ComponentModel.DataAnnotations;
     using AutoMapper;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -50,8 +51,8 @@ public ActionResult<SupplierDto[]> GetAll()
         /// <returns>A PagedResultDto object containing the fetched T and the total record count.</returns>
         [HttpGet("GetPagedSuppliers")]
         public ActionResult<PagedResultDto<SupplierDto>> GetAllSuppliers(
-            [FromQuery][Attributes.SwaggerSkipParameter] int? skip,
-            [FromQuery][Attributes.SwaggerTopParameter] int? top,
+            [FromQuery][Attributes.SwaggerSkipParameter][Range(0, int.MaxValue)] int? skip,
+            [FromQuery][Attributes.SwaggerTopParameter][Range(0, int.MaxValue)] int? top,
             [FromQuery][Attributes.SwaggerOrderByParameter] string? orderBy)
         {
             try
diff --git a/NorthwindCRUD/Controllers/TerritoriesController.cs b/NorthwindCRUD/Controllers/TerritoriesController.cs
@@ -1,5 +1,6 @@
 ﻿namespace NorthwindCRUD.Controllers
 {
+    using System.ComponentModel.DataAnnotations;
     using AutoMapper;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -52,8 +53,8 @@ public ActionResult<TerritoryDto[]> GetAll()
         /// <returns>A PagedResultDto object containing the fetched T and the total record count.</returns>
         [HttpGet("GetPagedTerritories")]
         public ActionResult<PagedResultDto<TerritoryDto>> GetAllTerritories(
-            [FromQuery][Attributes.SwaggerSkipParameter] int? skip,
-            [FromQuery][Attributes.SwaggerTopParameter] int? top,
+            [FromQuery][Attributes.SwaggerSkipParameter][Range(0, int.MaxValue)] int? skip,
+            [FromQuery][Attributes.SwaggerTopParameter][Range(0, int.MaxValue)] int? top,
             [FromQuery][Attributes.SwaggerOrderByParameter] string? orderBy)
         {
             try
diff --git a/NorthwindCRUD/Filters/EnumSchemaFilter.cs b/NorthwindCRUD/Filters/EnumSchemaFilter.cs
@@ -1,21 +1,22 @@
-﻿using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
+﻿﻿using Microsoft.OpenApi.Any;
+﻿using Microsoft.OpenApi.Models;
+﻿using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace NorthwindCRUD.Filters
+﻿namespace NorthwindCRUD.Filters
 {
     public class EnumSchemaFilter : ISchemaFilter
     {
         public void Apply(OpenApiSchema schema, SchemaFilterContext context)
         {
             if (context.Type.IsEnum)
             {
-                schema.Type = "string";
-                schema.Enum = context.Type
-                    .GetEnumNames()
-                    .Select(name => new OpenApiString(name))
+                var enumValues = Enum.GetValues(context.Type)
+                    .Cast<object>()
+                    .Select(e => new OpenApiString(e.ToString()))
                     .ToList<IOpenApiAny>();
+
+                schema.Enum = enumValues;
             }
         }
     }
-}
+}
diff --git a/NorthwindCRUD/Helpers/Enums.cs b/NorthwindCRUD/Helpers/Enums.cs
@@ -0,0 +1,19 @@
+﻿using System.Runtime.Serialization;
+
+namespace NorthwindCRUD.Helpers
+{
+    public class Enums
+    {
+        public enum Shipping
+        {
+            [EnumMember(Value = "SeaFreight")]
+            SeaFreight,
+
+            [EnumMember(Value = "GroundTransport")]
+            GroundTransport,
+
+            [EnumMember(Value = "AirCargo")]
+            AirCargo,
+        }
+    }
+}
diff --git a/NorthwindCRUD/Models/Contracts/IOrder.cs b/NorthwindCRUD/Models/Contracts/IOrder.cs
@@ -1,7 +1,7 @@
-﻿using NorthwindCRUD.Models.Dtos;
-using NorthwindCRUD.Models.Enums;
+﻿﻿using NorthwindCRUD.Models.Dtos;
+﻿using static NorthwindCRUD.Helpers.Enums;
 
-namespace NorthwindCRUD.Models.Contracts
+﻿namespace NorthwindCRUD.Models.Contracts
 {
     public interface IOrder
     {
diff --git a/NorthwindCRUD/Models/Dtos/AddressDto.cs b/NorthwindCRUD/Models/Dtos/AddressDto.cs
@@ -1,21 +1,27 @@
-﻿using System.ComponentModel.DataAnnotations;
-using NorthwindCRUD.Models.Contracts;
+﻿﻿using System.ComponentModel.DataAnnotations;
+﻿using NorthwindCRUD.Models.Contracts;
 
-namespace NorthwindCRUD.Models.Dtos
+﻿namespace NorthwindCRUD.Models.Dtos
 {
     public class AddressDto : IAddress
     {
+        [StringLength(100, ErrorMessage = "Street cannot exceed 100 characters.")]
         public string Street { get; set; }
 
+        [StringLength(50, ErrorMessage = "City cannot exceed 50 characters.")]
         public string City { get; set; }
 
+        [StringLength(50, ErrorMessage = "Region cannot exceed 50 characters.")]
         public string Region { get; set; }
 
+        [StringLength(20, ErrorMessage = "Postal code cannot exceed 20 characters.")]
         public string PostalCode { get; set; }
 
         [Required(ErrorMessage = "Country is required.")]
+        [StringLength(50, ErrorMessage = "Country cannot exceed 50 characters.")]
         public string Country { get; set; }
 
+        [RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Phone number is not valid.")]
         public string? Phone { get; set; }
     }
-}
+}
diff --git a/NorthwindCRUD/Models/Dtos/CategoryDetailsDto.cs b/NorthwindCRUD/Models/Dtos/CategoryDetailsDto.cs
@@ -1,10 +1,11 @@
-﻿using System.ComponentModel.DataAnnotations;
-using NorthwindCRUD.Models.Contracts;
+﻿﻿using System.ComponentModel.DataAnnotations;
+﻿using NorthwindCRUD.Models.Contracts;
 
-namespace NorthwindCRUD.Models.Dtos
+﻿namespace NorthwindCRUD.Models.Dtos
 {
     public class CategoryDetailsDto : CategoryDto, ICategoryDetail
     {
+        [RegularExpression(@"^(http[s]?://.*\.(?:jpg|jpeg|png|gif))$", ErrorMessage = "Picture URL must start with http/s and end with .jpg, .jpeg, .png, or .gif.")]
         public string Picture { get; set; }
     }
-}
+}
diff --git a/NorthwindCRUD/Models/Dtos/CategoryDto.cs b/NorthwindCRUD/Models/Dtos/CategoryDto.cs
@@ -1,15 +1,17 @@
-﻿using System.ComponentModel.DataAnnotations;
-using NorthwindCRUD.Models.Contracts;
+﻿﻿using System.ComponentModel.DataAnnotations;
+﻿using NorthwindCRUD.Models.Contracts;
 
-namespace NorthwindCRUD.Models.Dtos
+﻿namespace NorthwindCRUD.Models.Dtos
 {
     public class CategoryDto : ICategory
     {
         public int CategoryId { get; set; }
 
+        [StringLength(500, ErrorMessage = "Description cannot exceed 500 characters.")]
         public string Description { get; set; }
 
         [Required(ErrorMessage = "Name is required.")]
+        [StringLength(50, MinimumLength = 3, ErrorMessage = "Name must be between 3 and 50 characters.")]
         public string Name { get; set; }
     }
-}
+}
diff --git a/NorthwindCRUD/Models/Dtos/CustomerDto.cs b/NorthwindCRUD/Models/Dtos/CustomerDto.cs
@@ -8,10 +8,13 @@ public class CustomerDto : ICustomer
         public string CustomerId { get; set; }
 
         [Required(ErrorMessage = "Company Name is required.")]
+        [StringLength(100, ErrorMessage = "Company Name cannot exceed 100 characters.")]
         public string CompanyName { get; set; }
 
+        [StringLength(50, ErrorMessage = "Contact Name cannot exceed 50 characters.")]
         public string ContactName { get; set; }
 
+        [StringLength(50, ErrorMessage = "Contact Title cannot exceed 50 characters.")]
         public string ContactTitle { get; set; }
 
         public AddressDto Address { get; set; }
diff --git a/NorthwindCRUD/Models/Dtos/EmployeeDto.cs b/NorthwindCRUD/Models/Dtos/EmployeeDto.cs
@@ -10,36 +10,45 @@ public class EmployeeDto : IEmployee
         public int EmployeeId { get; set; }
 
         [Required(ErrorMessage = "Last name is required.")]
+        [StringLength(50, ErrorMessage = "Last name cannot exceed 50 characters.")]
         [SwaggerSchema("Employee's last name.")]
         public string LastName { get; set; }
 
+        [StringLength(50, ErrorMessage = "First name cannot exceed 50 characters.")]
         [SwaggerSchema("Employee's first name.")]
         public string FirstName { get; set; }
 
+        [StringLength(50, ErrorMessage = "Title cannot exceed 50 characters.")]
         [SwaggerSchema("Employee's title")]
         public string Title { get; set; }
 
+        [StringLength(50, ErrorMessage = "Title of courtesy cannot exceed 50 characters.")]
         [SwaggerSchema("Title used in salutations")]
         public string TitleOfCourtesy { get; set; }
 
         [DataType(DataType.Date, ErrorMessage = "BirthDate must be a valid date.")]
+        [DisplayFormat(ApplyFormatInEditMode = true, DataFormatString = "{0:yyyy-MM-dd}")]
         [SwaggerSchema("Employee's birth date")]
         public string BirthDate { get; set; }
 
         [DataType(DataType.Date, ErrorMessage = "HireDate must be a valid date.")]
+        [DisplayFormat(ApplyFormatInEditMode = true, DataFormatString = "{0:yyyy-MM-dd}")]
         [SwaggerSchema("Employee's hire date")]
         public string HireDate { get; set; }
 
         public string AddressId { get; set; }
 
         public AddressDto Address { get; set; }
 
+        [StringLength(1000, ErrorMessage = "Notes cannot exceed 1000 characters.")]
         [SwaggerSchema("General information about employee's background.")]
         public string Notes { get; set; }
 
+        [RegularExpression(@"^https?:\/\/.+\..+", ErrorMessage = "Avatar URL is not valid.")]
         [SwaggerSchema("Employee's avatar url.")]
         public string AvatarUrl { get; set; }
 
+        [Range(1, int.MaxValue, ErrorMessage = "ReportsTo must be a valid employee ID.")]
         [SwaggerSchema("Employee's supervisor.")]
         public int ReportsTo { get; set; }
     }
diff --git a/NorthwindCRUD/Models/Dtos/OrderDetailDto.cs b/NorthwindCRUD/Models/Dtos/OrderDetailDto.cs
@@ -1,6 +1,6 @@
-﻿using System.ComponentModel.DataAnnotations;
+﻿﻿using System.ComponentModel.DataAnnotations;
 
-namespace NorthwindCRUD.Models.Dtos
+﻿namespace NorthwindCRUD.Models.Dtos
 {
     public class OrderDetailDto
     {
@@ -9,10 +9,12 @@ public class OrderDetailDto
 
         public int ProductId { get; set; }
 
+        [Range(0.01, double.MaxValue, ErrorMessage = "Unit price must be greater than 0.")]
         public double UnitPrice { get; set; }
 
+        [Range(1, int.MaxValue, ErrorMessage = "Quantity must be at least 1.")]
         public int Quantity { get; set; }
 
         public float Discount { get; set; }
     }
-}
+}
diff --git a/NorthwindCRUD/Models/Dtos/OrderDto.cs b/NorthwindCRUD/Models/Dtos/OrderDto.cs
diff --git a/NorthwindCRUD/Models/Dtos/ProductDto.cs b/NorthwindCRUD/Models/Dtos/ProductDto.cs
diff --git a/NorthwindCRUD/Models/Dtos/SalesDto.cs b/NorthwindCRUD/Models/Dtos/SalesDto.cs
diff --git a/NorthwindCRUD/Models/Dtos/ShipperDto.cs b/NorthwindCRUD/Models/Dtos/ShipperDto.cs
diff --git a/NorthwindCRUD/Models/Dtos/SupplierDto.cs b/NorthwindCRUD/Models/Dtos/SupplierDto.cs
diff --git a/NorthwindCRUD/Program.cs b/NorthwindCRUD/Program.cs

Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,22 @@`
`1`		`-using Microsoft.OpenApi.Any;`
`2`		`-using Microsoft.OpenApi.Models;`
`3`		`-using Swashbuckle.AspNetCore.SwaggerGen;`
	`1`	`+using Microsoft.OpenApi.Any;`
	`2`	`+using Microsoft.OpenApi.Models;`
	`3`	`+using Swashbuckle.AspNetCore.SwaggerGen;`
`4`	`4`
`5`		`-namespace NorthwindCRUD.Filters`
	`5`	`+namespace NorthwindCRUD.Filters`
`6`	`6`	`{`
`7`	`7`	`public class EnumSchemaFilter : ISchemaFilter`
`8`	`8`	`{`
`9`	`9`	`public void Apply(OpenApiSchema schema, SchemaFilterContext context)`
`10`	`10`	`{`
`11`	`11`	`if (context.Type.IsEnum)`
`12`	`12`	`{`
`13`		`- schema.Type = "string";`
`14`		`- schema.Enum = context.Type`
`15`		`- .GetEnumNames()`
`16`		`- .Select(name => new OpenApiString(name))`
	`13`	`+ var enumValues = Enum.GetValues(context.Type)`
	`14`	`+ .Cast<object>()`
	`15`	`+ .Select(e => new OpenApiString(e.ToString()))`
`17`	`16`	`.ToList<IOpenApiAny>();`
	`17`	`+`
	`18`	`+ schema.Enum = enumValues;`
`18`	`19`	`}`
`19`	`20`	`}`
`20`	`21`	`}`
`21`		`-}`
	`22`	`+}`