Merge pull request #80 from sitkoru/skip-validation

Skip validation
sitkoru · Mar 4, 2024 · 50829a8 · 50829a8
2 parents 456b2da + 3b023dc
commit 50829a8
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 16 deletions.
diff --git a/src/Sitko.FluentValidation/Graph/FluentGraphValidator.cs b/src/Sitko.FluentValidation/Graph/FluentGraphValidator.cs
@@ -14,6 +14,7 @@ public class FluentGraphValidator : IFluentGraphValidator
     private readonly ILogger<FluentGraphValidator> logger;
     private readonly IOptions<FluentGraphValidatorOptions> options;
     private readonly IServiceScope serviceScope;
+    private static readonly ConcurrentDictionary<string, bool> IgnoredPropertiesCache = new();
 
     public FluentGraphValidator(IServiceProvider serviceProvider, ILogger<FluentGraphValidator> logger,
         IOptions<FluentGraphValidatorOptions> options)
@@ -166,6 +167,13 @@ or char or uint or ulong or short or sbyte ||
 
             foreach (var property in modelGraphValidationContext.Model.GetType().GetProperties())
             {
+                var isSkippedProperty = IgnoredPropertiesCache.GetOrAdd($"{modelGraphValidationContext.Model.GetType()}_{property.Name}", _ => property.GetCustomAttributes(typeof(SkipGraphValidationAttribute), true)
+                    .Cast<SkipGraphValidationAttribute>()
+                    .FirstOrDefault() != null);
+                if (isSkippedProperty)
+                {
+                    continue;
+                }
                 var propertyModel = property.GetValue(modelGraphValidationContext.Model);
 
 

diff --git a/src/Sitko.FluentValidation/Sitko.FluentValidation.csproj b/src/Sitko.FluentValidation/Sitko.FluentValidation.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
@@ -22,11 +22,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.0.0"/>
+    <PackageReference Include="FluentValidation" Version="11.9.0" />
     <PackageReference Include="IsExternalInit" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net8.0' ">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0"/>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0"/>
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0"/>

diff --git a/src/Sitko.FluentValidation/SkipGraphValidationAttribute.cs b/src/Sitko.FluentValidation/SkipGraphValidationAttribute.cs
@@ -0,0 +1,4 @@
+namespace Sitko.FluentValidation;
+
+[AttributeUsage(AttributeTargets.Property)]
+public class SkipGraphValidationAttribute : Attribute;
diff --git a/tests/Sitko.FluentValidation.Tests/Data/BarModel.cs b/tests/Sitko.FluentValidation.Tests/Data/BarModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace Sitko.FluentValidation.Tests.Data;
 
@@ -7,4 +8,7 @@ public class BarModel
     public Guid TestGuid { get; set; } = Guid.Empty;
     public BarType Type { get; set; } = BarType.Bar;
     public int Val { get; set; }
+
+    [SkipGraphValidation]
+    public List<FooModel> FooModels { get; set; } = new();
 }
diff --git a/tests/Sitko.FluentValidation.Tests/FluentGraphValidatorTests.cs b/tests/Sitko.FluentValidation.Tests/FluentGraphValidatorTests.cs
@@ -17,6 +17,19 @@ public FluentGraphValidatorTests(ITestOutputHelper testOutputHelper) : base(test
     {
     }
 
+    [Fact]
+    public async Task ValidateSkipAttribute()
+    {
+        var scope = await GetScopeAsync();
+        var validator = scope.GetService<FluentGraphValidator>();
+
+        var bar = new BarModel { Val = 0, FooModels = new List<FooModel> { new() { Id = Guid.NewGuid() } } };
+        var foo = new FooModel { Id = Guid.NewGuid(), BarModels = new List<BarModel> { bar } };
+
+        var result = await validator.TryValidateModelAsync(foo);
+        result.Results.Where(r => r.Model.GetType() == typeof(FooModel)).Should().ContainSingle();
+    }
+
     [Fact]
     public async Task ValidateParent()
     {

diff --git a/tests/Sitko.FluentValidation.Tests/Sitko.FluentValidation.Tests.csproj b/tests/Sitko.FluentValidation.Tests/Sitko.FluentValidation.Tests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Sitko.Core.Xunit" Version="9.17.0"/>
+    <PackageReference Include="Sitko.Core.Xunit" Version="11.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Sitko.FluentValidation.Tests/ValidationTestScope.cs b/tests/Sitko.FluentValidation.Tests/ValidationTestScope.cs
@@ -1,4 +1,4 @@
-using Sitko.Core.App;
+using Microsoft.Extensions.Hosting;
 using Sitko.FluentValidation.Graph;
 
 namespace Sitko.FluentValidation.Tests;
@@ -11,23 +11,21 @@ namespace Sitko.FluentValidation.Tests;
 [UsedImplicitly]
 public class ValidationTestScope : BaseTestScope
 {
-    protected override IServiceCollection ConfigureServices(IApplicationContext applicationContext,
-        IServiceCollection services, string name)
+    protected override IHostApplicationBuilder ConfigureServices(IHostApplicationBuilder builder, string name)
     {
-        base.ConfigureServices(applicationContext, services, name);
-        services.AddFluentValidationExtensions();
-        services.AddValidatorsFromAssemblyContaining<FluentGraphValidatorTests>();
-        return services;
+        base.ConfigureServices(builder, name);
+        builder.Services.AddFluentValidationExtensions();
+        builder.Services.AddValidatorsFromAssemblyContaining<FluentGraphValidatorTests>();
+        return builder;
     }
 }
 
 public class ValidationWithExcludedPrefixTestScope : ValidationTestScope
 {
-    protected override IServiceCollection ConfigureServices(IApplicationContext applicationContext,
-        IServiceCollection services, string name)
+    protected override IHostApplicationBuilder ConfigureServices(IHostApplicationBuilder builder, string name)
     {
-        base.ConfigureServices(applicationContext, services, name);
-        services.Configure<FluentGraphValidatorOptions>(options => options.NamespacePrefixes.Add("Sitko"));
-        return services;
+        base.ConfigureServices(builder, name);
+        builder.Services.Configure<FluentGraphValidatorOptions>(options => options.NamespacePrefixes.Add("Sitko"));
+        return builder;
     }
 }