♻️ Incapsulate validators (#452)

Co-authored-by: Daniel Mackay [SSW] <[email protected]>
SSWConsulting · Nov 28, 2024 · 9262725 · 9262725
1 parent 869b3da
commit 9262725
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 22 deletions.
diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
@@ -3,9 +3,11 @@
     <RootNamespace>SSW.CleanArchitecture.Application</RootNamespace>
     <AssemblyName>SSW.CleanArchitecture.Application</AssemblyName>
   </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Domain\Domain.csproj" />
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Ardalis.Specification.EntityFrameworkCore" Version="8.0.0" />
     <PackageReference Include="ErrorOr" Version="2.0.1" />
@@ -15,4 +17,5 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Application/DependencyInjection.cs b/src/Application/DependencyInjection.cs
@@ -9,7 +9,7 @@ public static IServiceCollection AddApplication(this IServiceCollection services
     {
         var applicationAssembly = typeof(DependencyInjection).Assembly;
 
-        services.AddValidatorsFromAssembly(applicationAssembly);
+        services.AddValidatorsFromAssembly(applicationAssembly, includeInternalTypes: true);
 
         services.AddMediatR(config =>
         {

diff --git a/src/Application/UseCases/Heroes/Commands/CreateHero/CreateHeroCommand.cs b/src/Application/UseCases/Heroes/Commands/CreateHero/CreateHeroCommand.cs
@@ -26,7 +26,7 @@ public async Task<ErrorOr<Guid>> Handle(CreateHeroCommand request, CancellationT
     }
 }
 
-public class CreateHeroCommandValidator : AbstractValidator<CreateHeroCommand>
+internal sealed class CreateHeroCommandValidator : AbstractValidator<CreateHeroCommand>
 {
     public CreateHeroCommandValidator()
     {

diff --git a/src/Application/UseCases/Heroes/Commands/UpdateHero/UpdateHeroCommand.cs b/src/Application/UseCases/Heroes/Commands/UpdateHero/UpdateHeroCommand.cs
@@ -39,7 +39,7 @@ public async Task<ErrorOr<Guid>> Handle(UpdateHeroCommand request, CancellationT
     }
 }
 
-public class UpdateHeroCommandValidator : AbstractValidator<UpdateHeroCommand>
+internal sealed class UpdateHeroCommandValidator : AbstractValidator<UpdateHeroCommand>
 {
     public UpdateHeroCommandValidator()
     {

diff --git a/src/Application/UseCases/Teams/Commands/AddHeroToTeam/AddHeroToTeamCommand.cs b/src/Application/UseCases/Teams/Commands/AddHeroToTeam/AddHeroToTeamCommand.cs
@@ -35,7 +35,7 @@ public async Task<ErrorOr<Success>> Handle(AddHeroToTeamCommand request, Cancell
     }
 }
 
-public class AddHeroToTeamCommandValidator : AbstractValidator<AddHeroToTeamCommand>
+internal sealed class AddHeroToTeamCommandValidator : AbstractValidator<AddHeroToTeamCommand>
 {
     public AddHeroToTeamCommandValidator()
     {

diff --git a/src/Application/UseCases/Teams/Commands/CompleteMission/CompleteMissionCommand.cs b/src/Application/UseCases/Teams/Commands/CompleteMission/CompleteMissionCommand.cs
@@ -25,7 +25,7 @@ public async Task<ErrorOr<Success>> Handle(CompleteMissionCommand request, Cance
     }
 }
 
-public class CompleteMissionCommandValidator : AbstractValidator<CompleteMissionCommand>
+internal sealed class CompleteMissionCommandValidator : AbstractValidator<CompleteMissionCommand>
 {
     public CompleteMissionCommandValidator()
     {

diff --git a/src/Application/UseCases/Teams/Commands/CreateTeam/CreateTeamCommand.cs b/src/Application/UseCases/Teams/Commands/CreateTeam/CreateTeamCommand.cs
@@ -19,7 +19,7 @@ public async Task<ErrorOr<Success>> Handle(CreateTeamCommand request, Cancellati
     }
 }
 
-public class CreateTeamCommandValidator : AbstractValidator<CreateTeamCommand>
+internal sealed class CreateTeamCommandValidator : AbstractValidator<CreateTeamCommand>
 {
     public CreateTeamCommandValidator()
     {

diff --git a/src/Application/UseCases/Teams/Commands/ExecuteMission/ExecuteMissionCommand.cs b/src/Application/UseCases/Teams/Commands/ExecuteMission/ExecuteMissionCommand.cs
@@ -32,7 +32,7 @@ public async Task<ErrorOr<Success>> Handle(ExecuteMissionCommand request, Cancel
     }
 }
 
-public class ExecuteMissionCommandValidator : AbstractValidator<ExecuteMissionCommand>
+internal sealed class ExecuteMissionCommandValidator : AbstractValidator<ExecuteMissionCommand>
 {
     public ExecuteMissionCommandValidator()
     {

diff --git a/src/Domain/GlobalUsings.cs b/src/Domain/GlobalUsings.cs
@@ -1,5 +1,3 @@
-// Global using directives
-
 global using Ardalis.Specification;
 global using static System.ArgumentException;
 global using static System.ArgumentNullException;

diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj
@@ -7,7 +7,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Application\Application.csproj" />
-    <ProjectReference Include="..\Domain\Domain.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/WebApi/WebApi.csproj b/src/WebApi/WebApi.csproj
@@ -5,6 +5,10 @@
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <InternalsVisibleTo Include="Application.IntegrationTests" />
   </ItemGroup>
@@ -21,10 +25,5 @@
     </PackageReference>
     <PackageReference Include="Scalar.AspNetCore" Version="1.2.39" />
   </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Application\Application.csproj" />
-    <ProjectReference Include="..\Domain\Domain.csproj" />
-    <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
-  </ItemGroup>
+
 </Project>
diff --git a/templates/command/Commands/CommandName/CommandNameCommand.cs b/templates/command/Commands/CommandName/CommandNameCommand.cs
@@ -15,7 +15,7 @@ public async Task<ErrorOr<Success>> Handle(CommandNameCommand request, Cancellat
     }
 }
 
-public class CommandNameCommandValidator : AbstractValidator<CommandNameCommand>
+internal sealed class CommandNameCommandValidator : AbstractValidator<CommandNameCommand>
 {
     public CommandNameCommandValidator()
     {

diff --git a/tests/Architecture.Tests/GlobalUsings.cs b/tests/Architecture.Tests/GlobalUsings.cs
@@ -1,4 +1,3 @@
-// Global using directives
-
 global using FluentAssertions;
-global using NetArchTest.Rules;
+global using NetArchTest.Rules;
+global using Xunit;
diff --git a/tests/Architecture.Tests/Usings.cs b/tests/Architecture.Tests/Usings.cs
diff --git a/tests/Domain.UnitTests/Usings.cs → tests/Domain.UnitTests/GlobalUsings.cs b/tests/Domain.UnitTests/Usings.cs → tests/Domain.UnitTests/GlobalUsings.cs
diff --git a/tests/WebApi.IntegrationTests/Usings.cs → ...s/WebApi.IntegrationTests/GlobalUsings.cs b/tests/WebApi.IntegrationTests/Usings.cs → ...s/WebApi.IntegrationTests/GlobalUsings.cs
diff --git a/tools/AppHost/AppHost.csproj b/tools/AppHost/AppHost.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0-rc.1.24511.1"/>
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0"/>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-Original file line number
+Diff line change
@@ Expand Up @@
         }
     }
-    public class CreateHeroCommandValidator : AbstractValidator<CreateHeroCommand>
+    internal sealed class CreateHeroCommandValidator : AbstractValidator<CreateHeroCommand>
     {
         public CreateHeroCommandValidator()
         {
@@ Expand Down @@