Merge pull request #54 from PandaTechAM/development

FluentValidation nuget change from ASPNETCORE to regular one. This mi…

Author: HaikAsatryan

SharedKernel.Demo/Program.cs

@@ -1,7 +1,7 @@
 using DistributedCache.Extensions;
-using DistributedCache.Options;
 using FluentMinimalApiMapper;
-using Microsoft.AspNetCore.HttpLogging;
+using FluentValidation;
+using MediatR;
 using Microsoft.AspNetCore.Mvc;
 using SharedKernel.Demo2;
 using ResponseCrafter.Enums;
@@ -40,6 +40,7 @@
    .AddOutboundLoggingHandler()
    .AddHealthChecks();
 
+
 builder.Services.ConfigureHttpJsonOptions(options =>
 {
    options.SerializerOptions.PropertyNamingPolicy = null;
@@ -71,6 +72,11 @@
    .UseOpenApi()
    .MapControllers();
 
+app.MapPost("user", async ([FromBody] UserCommand user, ISender sender) =>
+{
+   await sender.Send(user);
+   return Results.Ok();
+});
 
 app.MapPost("/receive-file", ([FromForm] IFormFile file) => TypedResults.Ok())
    .DisableAntiforgery();
@@ -141,4 +147,38 @@ public enum AnimalType
       Cat,
       Fish
    }
+}
+
+public record UserCommand(string Name, string Email) : ICommand<string>;
+
+public class UserCommandHandler : ICommandHandler<UserCommand, string>
+{
+   public Task<string> Handle(UserCommand request, CancellationToken cancellationToken)
+   {
+      return Task.FromResult($"User {request.Name} with email {request.Email} created successfully.");
+   }
+}
+
+public class User
+{
+   public string Name { get; set; } = string.Empty;
+   public string Email { get; set; } = string.Empty;
+}
+
+public class UserValidator : AbstractValidator<UserCommand>
+{
+   public UserValidator()
+   {
+      RuleFor(x => x.Name)
+         .NotEmpty()
+         .WithMessage("Name is required.")
+         .MaximumLength(100)
+         .WithMessage("Name cannot exceed 100 characters.");
+
+      RuleFor(x => x.Email)
+         .NotEmpty()
+         .WithMessage("Email is required.")
+         .EmailAddress()
+         .WithMessage("Invalid email format.");
+   }
 }

src/SharedKernel/Logging/StartupLoggerExtensions.cs

@@ -1,7 +1,6 @@
 using System.Diagnostics;
 using System.Globalization;
 using Microsoft.AspNetCore.Builder;
-using SharedKernel.Extensions;
 
 namespace SharedKernel.Logging;
 

src/SharedKernel/SharedKernel.csproj

@@ -8,13 +8,13 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.4.2</Version>
+        <Version>1.5.0</Version>
         <PackageId>Pandatech.SharedKernel</PackageId>
         <Title>Pandatech Shared Kernel Library</Title>
         <PackageTags>Pandatech, shared kernel, library, OpenAPI, Swagger, utilities, scalar</PackageTags>
         <Description>Pandatech.SharedKernel provides centralized configurations, utilities, and extensions for ASP.NET Core projects. For more information refere to readme.md document.</Description>
         <RepositoryUrl>https://github.com/PandaTechAM/be-lib-sharedkernel</RepositoryUrl>
-        <PackageReleaseNotes>Logging restructure</PackageReleaseNotes>
+        <PackageReleaseNotes>FluentValidation nuget change from ASPNETCORE to regular one. This might brake some code</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>
@@ -31,7 +31,7 @@
         <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />        
         <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.18.1" />
         <PackageReference Include="FluentDateTime" Version="3.0.0" />
-        <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.1" />
+        <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
         <PackageReference Include="HtmlSanitizer" Version="9.0.884" />
         <PackageReference Include="MediatR" Version="12.5.0" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.5" />

src/SharedKernel/ValidatorAndMediatR/Behaviors/ValidationBehavior.cs

@@ -0,0 +1,40 @@
+using FluentValidation;
+using MediatR;
+using ResponseCrafter.HttpExceptions;
+
+namespace SharedKernel.ValidatorAndMediatR.Behaviors;
+
+public sealed class ValidationBehavior<TRequest, TResponse>(
+   IEnumerable<IValidator<TRequest>> validators
+) : IPipelineBehavior<TRequest, TResponse> where TRequest : notnull
+{
+   private readonly IValidator<TRequest>[] _validators =
+      validators as IValidator<TRequest>[] ?? validators.ToArray();
+
+   public async Task<TResponse> Handle(
+      TRequest request,
+      RequestHandlerDelegate<TResponse> next,
+      CancellationToken cancellationToken
+   )
+   {
+      if (_validators.Length == 0)
+         return await next(cancellationToken);
+
+      var context = new ValidationContext<TRequest>(request);
+      var failures = (await Task.WhenAll(
+                        _validators.Select(v => v.ValidateAsync(context, cancellationToken))
+                     ))
+                     .SelectMany(r => r.Errors)
+                     .Where(e => e is not null)
+                     .ToList();
+
+      if (!failures.Any())
+         return await next(cancellationToken);
+
+      var errorMap = failures
+                     .GroupBy(e => e.PropertyName)
+                     .ToDictionary(g => g.Key, g => g.Select(e => e.ErrorMessage).Distinct().First());
+
+      throw new BadRequestException(errorMap);
+   }
+}

src/SharedKernel/ValidatorAndMediatR/MediatRExtension.cs

@@ -12,10 +12,11 @@ public static class MediatrExtension
    public static WebApplicationBuilder AddMediatrWithBehaviors(this WebApplicationBuilder builder,
       Assembly[] assemblies)
    {
-      builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(assemblies));
-      builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(ValidationBehaviorWithoutResponse<,>));
-      builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(ValidationBehaviorWithResponse<,>));
-      builder.Services.AddValidatorsFromAssemblies(assemblies, includeInternalTypes: true);
+      builder.Services
+             .AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(assemblies))
+             .AddValidatorsFromAssemblies(assemblies, includeInternalTypes: true)
+             .AddScoped(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>));
+
       return builder;
    }
 }

src/SharedKernel/ValidatorAndMediatR/Validators/JsonValidator.cs

@@ -1,6 +1,6 @@
-using System.Text.Json;
-using FluentValidation;
+using FluentValidation;
 using FluentValidation.Validators;
+using SharedKernel.Helpers;
 
 namespace SharedKernel.ValidatorAndMediatR.Validators;
 
@@ -15,16 +15,14 @@ public override bool IsValid(ValidationContext<T> context, string? value)
          return true;
       }
 
-      try
+      var isJson = ValidationHelper.IsJson(value);
+      if (isJson)
       {
-         JsonDocument.Parse(value);
          return true;
       }
-      catch (JsonException)
-      {
-         context.AddFailure("The input is not valid JSON.");
-         return false;
-      }
+
+      context.AddFailure("The input is not valid JSON.");
+      return false;
    }
 
    protected override string GetDefaultMessageTemplate(string errorCode)