Updated FluentValidatorCollection to support interface to allow for complex collections

Author: jamesmcroft

src/MADE.Data.Validation.FluentValidation/FluentValidatorCollection{T}.cs

@@ -11,8 +11,7 @@ namespace MADE.Data.Validation
     /// Defines a list of <see cref="FluentValidation.IValidator"/> objects that can be accessed by index.
     /// </summary>
     /// <typeparam name="T">The type of item being validated.</typeparam>
-    public class FluentValidatorCollection<T> : List<AbstractValidator<T>>, IValidatorCollection
-        where T : class
+    public class FluentValidatorCollection<T> : List<IValidator<T>>, IValidatorCollection
     {
         private readonly List<string> feedbackMessages = new();
 
@@ -71,7 +70,7 @@ public void Validate(object value)
 
             this.ForEach(validator =>
             {
-                var result = validator.Validate(value as T);
+                var result = validator.Validate((T)value);
                 if (!result.IsValid)
                 {
                     IsInvalid = true;

tests/MADE.Data.Validation.FluentValidation.Tests/Tests/FluentValidatorCollectionTests.cs

@@ -4,7 +4,10 @@ namespace MADE.Data.Validation.FluentValidation.Tests.Tests
     using System.Collections.Generic;
     using System.Diagnostics.CodeAnalysis;
     using System.Linq;
+    using System.Threading;
+    using System.Threading.Tasks;
     using global::FluentValidation;
+    using global::FluentValidation.Results;
     using MADE.Testing;
     using NUnit.Framework;
     using Shouldly;
@@ -147,6 +150,32 @@ public void ShouldHaveFeedbackMessagesIfInvalidValue()
                 collection.FeedbackMessages.Count().ShouldBe(1);
                 collection.FeedbackMessages.FirstOrDefault().ShouldBe(PersonValidator.DateOfBirthValidationMessage);
             }
+
+            [Test]
+            public void ShouldValidateComplexObjectWithMultipleValidators()
+            {
+                // Arrange
+                var value = new Staff
+                {
+                    Name = "Joe Bloggs",
+                    JobTitle = null, // Invalid job title
+                    Department = "Build",
+                    DateOfBirth = DateTime.UtcNow.AddDays(1) // Invalid birth date
+                };
+
+                var collection = new FluentValidatorCollection<Person> { new PersonValidator(), new StaffValidator() };
+
+                // Act
+                collection.Validate(value);
+
+                // Assert
+                collection.FeedbackMessages.ShouldNotBeEmpty();
+                collection.FeedbackMessages.Count().ShouldBe(2);
+                collection.FeedbackMessages.FirstOrDefault(x => x.Equals(PersonValidator.DateOfBirthValidationMessage,
+                    StringComparison.InvariantCultureIgnoreCase)).ShouldNotBeNull();
+                collection.FeedbackMessages.FirstOrDefault(x => x.Equals(StaffValidator.JobTitleValidationMessage,
+                    StringComparison.InvariantCultureIgnoreCase)).ShouldNotBeNull();
+            }
         }
     }
 
@@ -157,6 +186,13 @@ public class Person
         public DateTime? DateOfBirth { get; set; }
     }
 
+    public class Staff : Person
+    {
+        public string JobTitle { get; set; }
+
+        public string Department { get; set; }
+    }
+
     public class PersonValidator : AbstractValidator<Person>
     {
         public const string DateOfBirthValidationMessage = "Please specify a valid date of birth";
@@ -170,4 +206,25 @@ public PersonValidator()
                 .WithMessage(DateOfBirthValidationMessage);
         }
     }
+
+    public class StaffValidator : AbstractValidator<Staff>, IValidator<Person>
+    {
+        public const string JobTitleValidationMessage = "Please specify a job title";
+
+        public StaffValidator()
+        {
+            this.RuleFor(x => x.JobTitle).NotEmpty().WithMessage(JobTitleValidationMessage);
+            this.RuleFor(x => x.Department).NotEmpty();
+        }
+
+        public ValidationResult Validate(Person instance)
+        {
+            return base.Validate(instance as Staff);
+        }
+
+        public Task<ValidationResult> ValidateAsync(Person instance, CancellationToken cancellation = new())
+        {
+            return base.ValidateAsync(instance as Staff, cancellation);
+        }
+    }
 }