Remove redundant check and bug fixes

mr5z · May 9, 2021 · 07af7cf · 07af7cf
1 parent 7d97755
commit 07af7cf
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 19 deletions.
diff --git a/PropertyValidator/Extensions/ExpressionExtension.cs b/PropertyValidator/Extensions/ExpressionExtension.cs
@@ -4,7 +4,7 @@
 
 namespace PropertyValidator.Extensions
 {
-    public static class ExpressionExtension
+    static class ExpressionExtension
     {
         public static string GetMemberName<T>(this Expression<T> expression)
         {

diff --git a/PropertyValidator/Extensions/ObjectExtension.cs b/PropertyValidator/Extensions/ObjectExtension.cs
@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 
 namespace PropertyValidator.Extensions
 {
-    public static class ObjectExtension
+    static class ObjectExtension
 	{
 		public static T ToObject<T>(this IDictionary<string, object> source)
 			where T : class, new() => ToObject<T, object>(source);

diff --git a/PropertyValidator/Helpers/ReflectionHelper.cs b/PropertyValidator/Helpers/ReflectionHelper.cs
@@ -3,7 +3,7 @@
 
 namespace PropertyValidator.Helpers
 {
-    public static class ReflectionHelper
+    static class ReflectionHelper
     {
         public static FieldInfo? GetField(Type fromType, string fieldName)
         {

diff --git a/PropertyValidator/Models/RuleCollection.cs b/PropertyValidator/Models/RuleCollection.cs
@@ -11,7 +11,7 @@ namespace PropertyValidator.Models
 {
     public class RuleCollection<TModel>
     {
-        private readonly List<IValidationRule> validationRuleList = new List<IValidationRule>();
+        private readonly List<IValidationRule> validationRuleList = new();
         private readonly object? target;
 
         public RuleCollection(object? target)

diff --git a/PropertyValidator/Models/ValidationResultArgs.cs b/PropertyValidator/Models/ValidationResultArgs.cs
@@ -18,11 +18,14 @@ public ValidationResultArgs(string? propertyName, IDictionary<string, IEnumerabl
 
         public string? PropertyName { get; }
 
-        public IEnumerable<string?> ErrorMessages => ErrorDictionary.Values.FirstOrDefault();
-
         public IDictionary<string, IEnumerable<string?>> ErrorDictionary { get; }
 
-        public string? FirstError => ErrorDictionary.Values.FirstOrDefault()?.FirstOrDefault();
+        public IEnumerable<string?> ErrorMessages => ErrorDictionary
+            .Values
+            .FirstOrDefault(errors => errors.Any(message => !string.IsNullOrEmpty(message)));
+
+        public string? FirstError => ErrorMessages
+            .FirstOrDefault();
 
         public void FillErrorProperty<T>(T notifiableModel) where T : INotifyPropertyChanged
         {

diff --git a/PropertyValidator/Models/ValidationRule.cs b/PropertyValidator/Models/ValidationRule.cs
@@ -6,7 +6,11 @@ public abstract class ValidationRule<T> : IValidationRule
 
         public bool HasError { get; private set; }
 
-        public bool Validate(object value) => (HasError = !IsValid((T)value));
+        public bool Validate(object value)
+        {
+            HasError = !IsValid((T)value);
+            return !HasError;
+        }
 
         // TODO support async validations
         //public virtual Task<bool> IsValidAsync(T value) => Task.FromResult(IsValid(value));

diff --git a/PropertyValidator/PropertyValidator.csproj b/PropertyValidator/PropertyValidator.csproj
@@ -7,13 +7,14 @@
     <Authors>Mark Laureta</Authors>
     <Company>Nkraft</Company>
     <Description>A simple library to help you validate properties of class that implements INotifyPropertyChanged.</Description>
-    <PackageReleaseNotes>Fix property notification when the error message has been cleared for ValidationResultArgs::FillErrorProperty</PackageReleaseNotes>
+    <PackageReleaseNotes>- Fix property notification when the error message has been cleared for ValidationResultArgs::FillErrorProperty
+- Remove redundant check and bug fixes</PackageReleaseNotes>
     <PackageProjectUrl>https://github.com/mr5z/PropertyValidator</PackageProjectUrl>
     <RepositoryUrl>https://github.com/mr5z/PropertyValidator</RepositoryUrl>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <FileVersion>1.0.6.5</FileVersion>
-    <AssemblyVersion>1.0.6.5</AssemblyVersion>
-    <Version>1.0.6.5</Version>
+    <FileVersion>1.0.6.6</FileVersion>
+    <AssemblyVersion>1.0.6.6</AssemblyVersion>
+    <Version>1.0.6.6</Version>
     <NeutralLanguage>en</NeutralLanguage>
   </PropertyGroup>
 

diff --git a/PropertyValidator/Services/ValidationService.cs b/PropertyValidator/Services/ValidationService.cs
@@ -196,17 +196,18 @@ public static bool ValidateRuleCollection(
             object target,
             string? propertyName = null)
         {
+            if (string.IsNullOrEmpty(propertyName))
+                return true;
+
             bool noErrors = true;
-            foreach (var rule in ruleCollection)
+            var filteredCollection = ruleCollection.Where(it => it.PropertyName == propertyName);
+            foreach (var rule in filteredCollection)
             {
-                if (!string.IsNullOrEmpty(propertyName) && rule.PropertyName != propertyName)
-                    continue;
-
                 var type = target.GetType();
                 var property = type.GetProperty(rule.PropertyName);
                 var value = property.GetValue(target, null);
-                rule.Validate(value);
-                noErrors = noErrors && !rule.HasError;
+                var isValid = rule.Validate(value);
+                noErrors = noErrors && isValid;
             }
             return noErrors;
         }