Updated fluent validator

madslundt · madslundt · commit 5446cbca0ed4 · 2020-07-18T00:57:35.000+02:00
diff --git a/Domain/Domain.csproj b/Domain/Domain.csproj
@@ -13,7 +13,6 @@
   <ItemGroup>
     <PackageReference Include="EventFlow" Version="0.79.4216" />
     <PackageReference Include="EventFlow.EntityFramework" Version="0.79.4216" />
-    <PackageReference Include="FluentValidation" Version="8.6.2" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.3.2" />
   </ItemGroup>
 
diff --git a/Infrastructures/Infrastructure/Controller/OurController.cs b/Infrastructures/Infrastructure/Controller/OurController.cs
@@ -59,7 +59,7 @@ protected async Task<TExecutionResult> PublishAsync<TAggregate, TIdentity, TExec
         private void ValidateRequest<TRequest>(TRequest request)
         {
             var validator = _validationFactory.GetValidator(request.GetType());
-            var result = validator?.Validate(request);
+            var result = validator?.Validate(new ValidationContext<TRequest>(request));
 
             if (result != null && !result.IsValid)
             {
diff --git a/Infrastructures/Infrastructure/Infrastructure.csproj b/Infrastructures/Infrastructure/Infrastructure.csproj
@@ -8,8 +8,8 @@
     <PackageReference Include="EventFlow" Version="0.79.4216" />
     <PackageReference Include="EventFlow.EntityFramework" Version="0.79.4216" />
     <PackageReference Include="EventFlow.RabbitMQ" Version="0.79.4216" />
-    <PackageReference Include="FluentValidation" Version="8.6.2" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="8.6.2" />
+    <PackageReference Include="FluentValidation" Version="9.0.1" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="9.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.6" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.6" />
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
diff --git a/Infrastructures/Infrastructure/StartupExtensions.cs b/Infrastructures/Infrastructure/StartupExtensions.cs
@@ -13,13 +13,13 @@ namespace Infrastructure
 {
     public static class StartupExtensions
     {
-        public static IServiceCollection ConfigureServices(this IServiceCollection services, EnvironmentConfiguration env, OpenApiInfo apiInfo)
+        public static IServiceCollection ConfigureServices(this IServiceCollection services, EnvironmentConfiguration env, Type type, OpenApiInfo apiInfo)
         {
             services
                 .AddSingleton(env)
                 .AddSwaggerGen(c => c.SwaggerDoc(apiInfo.Version, apiInfo))
                 .AddMvc(opt => { opt.Filters.Add(typeof(ExceptionFilter)); })
-                .AddFluentValidation();
+                .AddFluentValidation(cfg => { cfg.RegisterValidatorsFromAssemblyContaining(type); });
 
             services
                 .AddControllers()
diff --git a/MicroServices/Movies/Movies.Service/Commands/CreateMovieCommand.cs b/MicroServices/Movies/Movies.Service/Commands/CreateMovieCommand.cs
@@ -1,11 +1,11 @@
-﻿using EventFlow.Aggregates.ExecutionResults;
+﻿using Domain.Business.Movies;
 using EventFlow.Commands;
 using FluentValidation;
 using Infrastructure.Commands;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Domain.Business.Movies.Commands
+namespace Movies.Service.Movies.Commands
 {
     public class CreateMovieCommand
     {
diff --git a/MicroServices/Movies/Movies.Service/Controllers/MovieController.cs b/MicroServices/Movies/Movies.Service/Controllers/MovieController.cs
@@ -1,9 +1,9 @@
-﻿using Domain.Business.Movies.Commands;
-using EventFlow;
+﻿using EventFlow;
 using EventFlow.Queries;
 using FluentValidation;
 using Infrastructure.Controller;
 using Microsoft.AspNetCore.Mvc;
+using Movies.Service.Movies.Commands;
 using Movies.Service.Queries;
 using Movies.Service.VIewModels;
 using System;
diff --git a/MicroServices/Movies/Movies.Service/Movies.Service.csproj b/MicroServices/Movies/Movies.Service/Movies.Service.csproj
@@ -12,6 +12,8 @@
     <PackageReference Include="EventFlow" Version="0.79.4216" />
     <PackageReference Include="EventFlow.AspNetCore" Version="0.79.4216" />
     <PackageReference Include="EventFlow.DependencyInjection" Version="0.79.4216" />
+    <PackageReference Include="FluentValidation" Version="9.0.1" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="9.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.3.2" />
diff --git a/MicroServices/Movies/Movies.Service/Startup.cs b/MicroServices/Movies/Movies.Service/Startup.cs
@@ -36,7 +36,7 @@ public void ConfigureServices(IServiceCollection services)
         {
             var env = EnvironmentConfiguration.Bind(_configuration);
 
-            services.ConfigureServices(env, new OpenApiInfo
+            services.ConfigureServices(env, typeof(Startup), new OpenApiInfo
             {
                 Title = "Movies API",
                 Version = "v1"
diff --git a/MicroServices/Reviews/Reviews.Service/Reviews.Service.csproj b/MicroServices/Reviews/Reviews.Service/Reviews.Service.csproj
@@ -11,6 +11,8 @@
     <PackageReference Include="EventFlow" Version="0.79.4216" />
     <PackageReference Include="EventFlow.AspNetCore" Version="0.79.4216" />
     <PackageReference Include="EventFlow.DependencyInjection" Version="0.79.4216" />
+    <PackageReference Include="FluentValidation" Version="9.0.1" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="9.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.3.2" />
   </ItemGroup>
diff --git a/MicroServices/Reviews/Reviews.Service/Startup.cs b/MicroServices/Reviews/Reviews.Service/Startup.cs
@@ -36,7 +36,7 @@ public void ConfigureServices(IServiceCollection services)
         {
             var env = EnvironmentConfiguration.Bind(_configuration);
 
-            services.ConfigureServices(env, new OpenApiInfo
+            services.ConfigureServices(env, typeof(Startup), new OpenApiInfo
             {
                 Title = "Reviews API",
                 Version = "v1"

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ protected async Task<TExecutionResult> PublishAsync<TAggregate, TIdentity, TExec`
`59`	`59`	`private void ValidateRequest<TRequest>(TRequest request)`
`60`	`60`	`{`
`61`	`61`	`var validator = _validationFactory.GetValidator(request.GetType());`
`62`		`- var result = validator?.Validate(request);`
	`62`	`+ var result = validator?.Validate(new ValidationContext<TRequest>(request));`
`63`	`63`
`64`	`64`	`if (result != null && !result.IsValid)`
`65`	`65`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,13 @@ namespace Infrastructure`
`13`	`13`	`{`
`14`	`14`	`public static class StartupExtensions`
`15`	`15`	`{`
`16`		`- public static IServiceCollection ConfigureServices(this IServiceCollection services, EnvironmentConfiguration env, OpenApiInfo apiInfo)`
	`16`	`+ public static IServiceCollection ConfigureServices(this IServiceCollection services, EnvironmentConfiguration env, Type type, OpenApiInfo apiInfo)`
`17`	`17`	`{`
`18`	`18`	`services`
`19`	`19`	`.AddSingleton(env)`
`20`	`20`	`.AddSwaggerGen(c => c.SwaggerDoc(apiInfo.Version, apiInfo))`
`21`	`21`	`.AddMvc(opt => { opt.Filters.Add(typeof(ExceptionFilter)); })`
`22`		`- .AddFluentValidation();`
	`22`	`+ .AddFluentValidation(cfg => { cfg.RegisterValidatorsFromAssemblyContaining(type); });`
`23`	`23`
`24`	`24`	`services`
`25`	`25`	`.AddControllers()`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`		`-using EventFlow.Aggregates.ExecutionResults;`
	`1`	`+using Domain.Business.Movies;`
`2`	`2`	`using EventFlow.Commands;`
`3`	`3`	`using FluentValidation;`
`4`	`4`	`using Infrastructure.Commands;`
`5`	`5`	`using System.Threading;`
`6`	`6`	`using System.Threading.Tasks;`
`7`	`7`
`8`		`-namespace Domain.Business.Movies.Commands`
	`8`	`+namespace Movies.Service.Movies.Commands`
`9`	`9`	`{`
`10`	`10`	`public class CreateMovieCommand`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void ConfigureServices(IServiceCollection services)`
`36`	`36`	`{`
`37`	`37`	`var env = EnvironmentConfiguration.Bind(_configuration);`
`38`	`38`
`39`		`- services.ConfigureServices(env, new OpenApiInfo`
	`39`	`+ services.ConfigureServices(env, typeof(Startup), new OpenApiInfo`
`40`	`40`	`{`
`41`	`41`	`Title = "Movies API",`
`42`	`42`	`Version = "v1"`