Merge pull request #255 from yollosun/feature/251

Feature/#251. Edit types checking

Author: i4004

src/Simplify.Web.Tests/Model/Validation/Attributes/MaxAttributeTests.cs

@@ -1,3 +1,4 @@
+using System;
 using NUnit.Framework;
 using Simplify.Web.Model.Validation.Attributes;
 
@@ -45,9 +46,16 @@ public void Validate_NullValue_NoExceptions()
 	}
 
 	[Test]
-	public void Validate_DifferentTypes_NoExceptions()
+	public void Validate_DifferentTypes_ExceptionThrown()
 	{
 		// Act & Assert
-		TestAttributeForValidValue((decimal)10.5);
+		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue(15.2));
+	}
+	
+	[Test]
+	public void Validate_ValueTypeNotInheritIComparable_ExceptionThrown()
+	{
+		// Act & Assert
+		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue(new object()));
 	}
 }

src/Simplify.Web.Tests/Model/Validation/Attributes/MinAttributeTests.cs

@@ -1,3 +1,4 @@
+using System;
 using NUnit.Framework;
 using Simplify.Web.Model.Validation.Attributes;
 
@@ -45,9 +46,16 @@ public void Validate_NullValue_NoExceptions()
 	}
 
 	[Test]
-	public void Validate_DifferentTypes_NoExceptions()
+	public void Validate_DifferentTypes_ExceptionThrown()
 	{
 		// Act & Assert
-		TestAttributeForValidValue((decimal)12.5);
+		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue(12.5));
+	}
+	
+	[Test]
+	public void Validate_ValueTypeNotInheritIComparable_ExceptionThrown()
+	{
+		// Act & Assert
+		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue(new object()));
 	}
 }

src/Simplify.Web/Model/Validation/Attributes/MaxAttribute.cs

@@ -34,13 +34,24 @@ public class MaxAttribute : ValidationAttribute
 	/// <param name="resolver">The objects resolver, useful if you need to retrieve some dependencies to perform validation.</param>
 	public override void Validate(object? value, PropertyInfo propertyInfo, IDIResolver resolver)
 	{
-		if (value is not IComparable comparableValue || comparableValue.GetType() != MaxValue.GetType())
+		if (value == null)
 			return;
 
+		if (value is not IComparable comparableValue)
+			throw new ArgumentException($"The type of specified property value must be inherited from {typeof(IComparable)}");
+
+		ValidateTypesMatching(comparableValue);
+		
 		TryThrowCustomOrStringTableException(resolver);
 
 		if (comparableValue.CompareTo(MaxValue) > 0)
 			throw new ModelValidationException(
 				$"Property '{propertyInfo.Name}' required maximum value is {MaxValue}, actual value: {value}");
 	}
+	
+	private void ValidateTypesMatching(IComparable comparableValue)
+	{
+		if (comparableValue.GetType() != MaxValue.GetType())
+			throw new ArgumentException("Type mismatch. The maximum value and property value should be of the same type.");
+	}
 }

src/Simplify.Web/Model/Validation/Attributes/MinAttribute.cs

@@ -34,13 +34,24 @@ public class MinAttribute : ValidationAttribute
 	/// <param name="resolver">The objects resolver, useful if you need to retrieve some dependencies to perform validation.</param>
 	public override void Validate(object? value, PropertyInfo propertyInfo, IDIResolver resolver)
 	{
-		if (value is not IComparable comparableValue || comparableValue.GetType() != MinValue.GetType())
+		if (value == null)
 			return;
 
+		if (value is not IComparable comparableValue)
+			throw new ArgumentException($"The type of specified property value must be inherited from {typeof(IComparable)}");
+
+		ValidateTypesMatching(comparableValue);
+		
 		TryThrowCustomOrStringTableException(resolver);
 
 		if (comparableValue.CompareTo(MinValue) < 0)
 			throw new ModelValidationException(
 				$"Property '{propertyInfo.Name}' required minimum value is {MinValue}, actual value: {value}");
 	}
+	
+	private void ValidateTypesMatching(IComparable comparableValue)
+	{
+		if (comparableValue.GetType() != MinValue.GetType())
+			throw new ArgumentException("Type mismatch. The minimum value and property value should be of the same type.");
+	}
 }