Merge branch 'feature/#95' into develop

Author: i4004

src/Simplify.Web.Tests/Model/Validation/ValidationAttributesExecutorTests.cs

@@ -4,7 +4,8 @@
 using Simplify.Web.Model.Validation;
 using Simplify.Web.Tests.Model.Validation.Attributes;
 using Simplify.Web.Tests.TestEntities;
-using Simplify.Web.Tests.TestEntities.HierarchyValidation;
+using Simplify.Web.Tests.TestEntities.Inheritance;
+using Simplify.Web.Tests.TestEntities.Nesting;
 
 namespace Simplify.Web.Tests.Model.Validation
 {
@@ -35,17 +36,16 @@ public void Validate_ModelWithOnePropertyAndOneValidateAttribute_AttributeValida
 		}
 
 		[Test]
-		public void Validate_HierarchicalModel_NestedNullAttributeException()
+		public void Validate_NestedProperties_NestedNullAttributeException()
 		{
 			// Arrange
-			var model = new RootModel
+			var model = new NestingRootModel
 			{
-				//BuiltInType = "test",
-				CustomType = new ChildModel
+				NestedProperty = new NestedModel
 				{
-					//BuiltInType = "test",
-					CustomType = new SubChildModel()
-				}
+					NestedProperty = new SubNestedModel()
+				},
+				TestInt = 1
 			};
 
 			// Act
@@ -54,7 +54,24 @@ public void Validate_HierarchicalModel_NestedNullAttributeException()
 
 			// Assert
 			Assert.That(ex.Message,
-				Does.StartWith($"Required property '{nameof(SubChildModel.BuiltInType)}' is null or empty"));
+				Does.StartWith($"Required property '{nameof(SubNestedModel.BuiltInType)}' is null or empty"));
+		}
+
+		[Test]
+		public void Validate_InheritedProperty_NestedNullAttributeException()
+		{
+			// Arrange
+			var model = new InheritanceRootModel
+			{
+				NestedProperty = new BaseNestedModel()
+			};
+
+			// Act
+			var ex = Assert.Throws<ModelValidationException>(() => _validator.Validate(model, null));
+
+			// Assert
+			Assert.That(ex.Message,
+				Does.StartWith($"Required property '{nameof(BaseNestedModel.BuiltInType)}' is null or empty"));
 		}
 	}
 }

src/Simplify.Web.Tests/TestEntities/HierarchyValidation/BaseModel.cs

@@ -0,0 +1,12 @@
+using Simplify.Web.Model.Validation.Attributes;
+
+#nullable disable
+
+namespace Simplify.Web.Tests.TestEntities.Inheritance
+{
+	public class BaseModel
+	{
+		[Required]
+		public BaseNestedModel NestedProperty { get; set; }
+	}
+}

src/Simplify.Web.Tests/TestEntities/HierarchyValidation/ChildModel.cs

@@ -0,0 +1,12 @@
+using Simplify.Web.Model.Validation.Attributes;
+
+#nullable disable
+
+namespace Simplify.Web.Tests.TestEntities.Inheritance
+{
+	public class BaseNestedModel
+	{
+		[Required]
+		public string BuiltInType { get; set; }
+	}
+}

src/Simplify.Web.Tests/TestEntities/HierarchyValidation/RootModel.cs

@@ -0,0 +1,8 @@
+#nullable disable
+
+namespace Simplify.Web.Tests.TestEntities.Inheritance
+{
+	public class InheritanceRootModel : BaseModel
+	{
+	}
+}

src/Simplify.Web.Tests/TestEntities/HierarchyValidation/SubChildModel.cs

@@ -1,8 +1,8 @@
 using Simplify.Web.Model.Validation.Attributes;
 
-namespace Simplify.Web.Tests.TestEntities.HierarchyValidation
+namespace Simplify.Web.Tests.TestEntities.Nesting
 {
-	public interface ISubChildModel
+	public interface ISubNestedModel
 	{
 		[Required]
 		string BuiltInType { get; set; }

src/Simplify.Web.Tests/TestEntities/Inheritance/BaseModel.cs

@@ -0,0 +1,12 @@
+#nullable disable
+
+using Simplify.Web.Model.Validation.Attributes;
+
+namespace Simplify.Web.Tests.TestEntities.Nesting
+{
+	public class NestedModel
+	{
+		[Required]
+		public ISubNestedModel NestedProperty { get; set; }
+	}
+}

src/Simplify.Web.Tests/TestEntities/Inheritance/BaseNestedModel.cs

@@ -0,0 +1,14 @@
+#nullable disable
+
+using Simplify.Web.Model.Validation.Attributes;
+
+namespace Simplify.Web.Tests.TestEntities.Nesting
+{
+	public class NestingRootModel
+	{
+		public NestedModel NestedProperty { get; set; }
+
+		[Required]
+		public int? TestInt { get; set; }
+	}
+}

src/Simplify.Web.Tests/TestEntities/Inheritance/InheritanceRootModel.cs

@@ -0,0 +1,9 @@
+#nullable disable
+
+namespace Simplify.Web.Tests.TestEntities.Nesting
+{
+	public class SubNestedModel : ISubNestedModel
+	{
+		public string BuiltInType { get; set; }
+	}
+}

src/Simplify.Web.Tests/TestEntities/HierarchyValidation/ISubChildModel.cs renamed to src/Simplify.Web.Tests/TestEntities/Nesting/ISubNestedModel.cs

@@ -426,7 +426,7 @@ public virtual void RegisterDefaultModelBinders()
 		/// </summary>
 		public virtual void RegisterDefaultModelValidators()
 		{
-			BootstrapperFactory.ContainerProvider.Register<ValidationAttributesExecutor>(LifetimeType.Singleton);
+			BootstrapperFactory.ContainerProvider.Register(r => new ValidationAttributesExecutor(), LifetimeType.Singleton);
 		}
 
 		#endregion Simplify.Web types registration

src/Simplify.Web.Tests/TestEntities/Nesting/NestedModel.cs

@@ -12,6 +12,20 @@ namespace Simplify.Web.Model.Validation
 	/// </summary>
 	public class ValidationAttributesExecutor : IModelValidator
 	{
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ValidationAttributesExecutor"/> class.
+		/// </summary>
+		/// <param name="nesting">if set to <c>true</c> then  <see cref="ValidationAttributesExecutor"/> should validate nested and inherited properties.</param>
+		public ValidationAttributesExecutor(bool nesting = true)
+		{
+			Nesting = nesting;
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether <see cref="ValidationAttributesExecutor"/> should validate nested and inherited properties.
+		/// </summary>
+		public bool Nesting { get; }
+
 		/// <summary>
 		/// Validates the specified model.
 		/// </summary>
@@ -24,21 +38,6 @@ public void Validate<T>(T model, IDIResolver resolver)
 			Validate(typeof(T), model, resolver);
 		}
 
-		private static void Validate(Type type, object? value, IDIResolver resolver)
-		{
-			var properties = type.GetProperties();
-
-			foreach (var item in properties)
-			{
-				var currentItemValue = item.GetValue(value);
-
-				ValidateProperty(currentItemValue, item, resolver);
-
-				if (currentItemValue != default)
-					Validate(item.PropertyType, currentItemValue, resolver);
-			}
-		}
-
 		/// <summary>
 		/// Validates the specified value.
 		/// </summary>
@@ -53,5 +52,22 @@ private static void ValidateProperty(object? value, PropertyInfo propertyInfo, I
 			foreach (var attribute in validationAttributes)
 				attribute.Validate(value, propertyInfo, resolver);
 		}
+
+		private void Validate(Type type, object? value, IDIResolver resolver)
+		{
+			if (Nesting)
+				if (type.BaseType != null && type.BaseType != typeof(object))
+					Validate(type.BaseType, value, resolver);
+
+			foreach (var item in type.GetProperties())
+			{
+				var currentItemValue = item.GetValue(value);
+
+				ValidateProperty(currentItemValue, item, resolver);
+
+				if (Nesting && currentItemValue != default)
+					Validate(item.PropertyType, currentItemValue, resolver);
+			}
+		}
 	}
 }