Moved FluentValidation to standalone package

EasyWay.sln

@@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyWay.Auth.WebApi", "sour
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyWay.AuthSamples", "samples\EasyWay.AuthSamples\EasyWay.AuthSamples.csproj", "{04307081-E971-4A1A-ACF2-D709EA7F8AD3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyWay.FluentValidation", "source\EasyWay.FluentValidation\EasyWay.FluentValidation.csproj", "{16C0EBA2-2E35-40E1-B655-70D6C16B2ECC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -69,6 +71,10 @@ Global
 		{04307081-E971-4A1A-ACF2-D709EA7F8AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{04307081-E971-4A1A-ACF2-D709EA7F8AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{04307081-E971-4A1A-ACF2-D709EA7F8AD3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16C0EBA2-2E35-40E1-B655-70D6C16B2ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16C0EBA2-2E35-40E1-B655-70D6C16B2ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16C0EBA2-2E35-40E1-B655-70D6C16B2ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16C0EBA2-2E35-40E1-B655-70D6C16B2ECC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -83,6 +89,7 @@ Global
 		{AE66C586-5C48-4A23-9186-63D90F0BC4A1} = {92D4A304-6772-4482-83CC-68FDF54087C4}
 		{2CF71C5B-0A95-416A-AB6A-6DB3545DCCF5} = {92D4A304-6772-4482-83CC-68FDF54087C4}
 		{04307081-E971-4A1A-ACF2-D709EA7F8AD3} = {B403E9EE-655A-481E-889B-F292845AE5BF}
+		{16C0EBA2-2E35-40E1-B655-70D6C16B2ECC} = {92D4A304-6772-4482-83CC-68FDF54087C4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {45C12B7C-F737-4C98-B967-CCB84BFB9080}

samples/EasyWay.Samples/EasyWay.Samples.csproj

@@ -25,6 +25,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\source\EasyWay.EntityFrameworkCore\EasyWay.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\source\EasyWay.FluentValidation\EasyWay.FluentValidation.csproj" />
     <ProjectReference Include="..\..\source\EasyWay.WebApi\EasyWay.WebApi.csproj" />
     <ProjectReference Include="..\..\source\EasyWay\EasyWay.csproj" />
   </ItemGroup>

samples/EasyWay.Samples/SampleModule.cs

@@ -15,6 +15,8 @@ protected override void ConfigureDependencies(IServiceCollection services, IConf
         {
             string connectionString = configuration.GetConnectionString("Database");
 
+            services.AddFluentValidation(Assemblies);
+
             services.AddEntityFrameworkCore<SampleDbContext>(x => x.UseNpgsql(connectionString));
         }
     }

source/Directory.Packages.props

@@ -4,7 +4,7 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.10.0" />
+    <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />

source/EasyWay.FluentValidation/EasyWay.FluentValidation.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <ProjectReference Include="..\EasyWay\EasyWay.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" />
+  </ItemGroup>
+
+</Project>

source/EasyWay.FluentValidation/Extensions.cs

@@ -0,0 +1,22 @@
+using EasyWay.Internals;
+using EasyWay.Internals.Validation;
+using FluentValidation;
+using Microsoft.Extensions.DependencyInjection;
+using System.Reflection;
+
+namespace EasyWay
+{
+    public static class Extensions
+    {
+        public static IServiceCollection AddFluentValidation(
+            this IServiceCollection services,
+            IEnumerable<Assembly> assemblies)
+        {
+            services.AddValidatorsFromAssemblies(assemblies);
+
+            services.AddScoped(typeof(IEasyWayValidator<>), typeof(FluentValidator<>));
+
+            return services;
+        }
+}
+}

source/EasyWay.FluentValidation/Internals/FluentValidator.cs

@@ -0,0 +1,42 @@
+using EasyWay.Internals.Validation;
+using FluentValidation;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace EasyWay.Internals
+{
+    internal sealed class FluentValidator<T> : IEasyWayValidator<T>
+    {
+        private readonly IServiceProvider _serviceProvider;
+
+        public FluentValidator(IServiceProvider serviceProvider) 
+        {
+            _serviceProvider = serviceProvider;
+        }
+
+        public IDictionary<string, string[]> Validate(T objectToValidate)
+        {
+            var validator = _serviceProvider.GetService<IValidator<T>>();
+
+            if (validator is null)
+            {
+                return new Dictionary<string, string[]>();
+            }
+
+            var result = validator.Validate(objectToValidate);
+
+            if (result.IsValid)
+            {
+                return new Dictionary<string, string[]>();
+            }
+
+            var errors = result.Errors
+            .GroupBy(x => x.PropertyName)
+            .ToDictionary(
+                g => g.Key,
+                g => g.Select(x => x.ErrorCode).ToArray()
+            );
+
+            return errors;
+        }
+    }
+}

source/EasyWay/EasyWay.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
-	  <PackageReference Include="FluentValidation.DependencyInjectionExtensions" />
 	  <PackageReference Include="Microsoft.Extensions.Configuration" />
 	  <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
 	  <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
@@ -16,6 +15,7 @@
 		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
 		<InternalsVisibleTo Include="$(AssemblyName).Tests" />
 		<InternalsVisibleTo Include="$(AssemblyName).EntityFrameworkCore" />
+		<InternalsVisibleTo Include="$(AssemblyName).FluentValidation" />
 		<InternalsVisibleTo Include="$(AssemblyName).WebApi" />
 	</ItemGroup>
 </Project>

source/EasyWay/Internals/Commands/CommandExecutor.cs

@@ -1,5 +1,5 @@
 using EasyWay.Internals.Contexts;
-using FluentValidation;
+using EasyWay.Internals.Validation;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace EasyWay.Internals.Commands
@@ -28,21 +28,14 @@ public async Task<CommandResult> Execute<TCommand>(TCommand command, Cancellatio
         {
             _cancellationContextConstructor.Set(cancellationToken);
 
-            var validator = _serviceProvider.GetService<IValidator<TCommand>>();
+            var validator = _serviceProvider.GetService<IEasyWayValidator<TCommand>>();
 
             if (validator is not null)
             {
-                var result = validator.Validate(command);
+                var errors = validator.Validate(command);
 
-                if (!result.IsValid)
+                if (errors.Any())
                 {
-                    var errors = result.Errors
-                    .GroupBy(x => x.PropertyName)
-                    .ToDictionary(
-                        g => g.Key,
-                        g => g.Select(x => x.ErrorCode).ToArray()
-                    );
-
                     return CommandResult.Validation(errors);
                 }
             }

source/EasyWay/Internals/Commands/CommandWithOperationResultExecutor.cs

@@ -1,6 +1,5 @@
 using EasyWay.Internals.Contexts;
-using FluentValidation;
-using FluentValidation.Results;
+using EasyWay.Internals.Validation;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace EasyWay.Internals.Commands
@@ -31,25 +30,18 @@ public async Task<CommandResult<TOperationResult>> Execute<TOperationResult>(Com
 
             var commandType = command.GetType();
 
-            var validatorType = typeof(IValidator<>).MakeGenericType(commandType);
+            var validatorType = typeof(IEasyWayValidator<>).MakeGenericType(commandType);
 
             var validator = _serviceProvider.GetService(validatorType);
 
             if (validator is not null)
             {
-                var result = (ValidationResult)validatorType
+                var errors = (IDictionary<string, string[]>)validatorType
                     .GetMethod("Validate")
                     ?.Invoke(validator, [command]);
 
-                if (!result.IsValid)
+                if (errors.Any())
                 {
-                    var errors = result.Errors
-                    .GroupBy(x => x.PropertyName)
-                    .ToDictionary(
-                        g => g.Key,
-                        g => g.Select(x => x.ErrorCode).ToArray()
-                    );
-
                     return CommandResult<TOperationResult>.Validation(errors);
                 }
             }

source/EasyWay/Internals/Extensions.cs

@@ -8,7 +8,6 @@
 using EasyWay.Internals.Policies;
 using EasyWay.Internals.Queries;
 using EasyWay.Internals.Repositories;
-using EasyWay.Internals.Validation;
 using Microsoft.Extensions.DependencyInjection;
 using System.Reflection;
 
@@ -31,7 +30,6 @@ internal static void AddEasyWay(
                 .AddPolicies(assemblies)
                 .AddDomainServices(assemblies)
                 .AddFactories(assemblies)
-                .AddValidation(assemblies)
                 .AddInitializers(assemblies);
         }
     }

source/EasyWay/Internals/Queries/QueryExecutor.cs

@@ -1,6 +1,5 @@
 using EasyWay.Internals.Contexts;
-using FluentValidation;
-using FluentValidation.Results;
+using EasyWay.Internals.Validation;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace EasyWay.Internals.Queries
@@ -27,25 +26,18 @@
 
             var queryType = query.GetType();
 
-            var validatorType = typeof(IValidator<>).MakeGenericType(queryType);
+            var validatorType = typeof(IEasyWayValidator<>).MakeGenericType(queryType);
 
             var validator = _serviceProvider.GetService(validatorType);
 
             if (validator is not null)
             {
-                var result = (ValidationResult)validatorType
+                var errors = (IDictionary<string, string[]>)validatorType
                     .GetMethod("Validate")
                     ?.Invoke(validator, [query]);
 
-                if (!result.IsValid)
+                if (errors.Any())
                 {
-                    var errors = result.Errors
-                    .GroupBy(x => x.PropertyName)
-                    .ToDictionary(
-                        g => g.Key,
-                        g => g.Select(x => x.ErrorCode).ToArray()
-                    );
-
                     return QueryResult<TReadModel>.Validation(errors);
                 }
             }
@@ -54,7 +46,7 @@
 
             var queryHandler = _serviceProvider.GetRequiredService(queryHandlerType);
 
             var queryResult = await (Task<QueryResult<TReadModel>>) queryHandlerType.GetMethod("Handle").Invoke(queryHandler, [query]);
 
             return queryResult;
         }

source/EasyWay/Internals/Validation/IEasyWayValidator.cs

@@ -0,0 +1,7 @@
+namespace EasyWay.Internals.Validation
+{
+    internal interface IEasyWayValidator<T>
+    {
+        IDictionary<string, string[]> Validate(T objectToValidate);
+    }
+}