Merge pull request #682 from PathfinderHonorManager/develop

brian-cummings · web-flow · commit 71cb3b57a149 · 2025-06-15T18:07:50.000-04:00
Upgraded fluent validation
diff --git a/.github/workflows/main_pathfinderhonormanager.yml b/.github/workflows/main_pathfinderhonormanager.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-dotnet
-      - name: Build solution
+      - name: Build solution (Debug)
         run: dotnet build --no-incremental
       - name: Test with the dotnet CLI (OpenCover)
         run: dotnet test PathfinderHonorManager.Tests/PathfinderHonorManager.Tests.csproj /p:CollectCoverage=true /p:CoverletOutput=TestResults/coverage.opencover.xml /p:CoverletOutputFormat=opencover /p:Exclude="[PathfinderHonorManager.Tests*]*"
@@ -65,7 +65,7 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
           ./.sonar/scanner/dotnet-sonarscanner begin /k:"PathfinderHonorManager_PathfinderHonorManagerAPI" /o:"pathfinderhonormanager" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="coverage.opencover.xml"
-      - name: Build solution (SonarQube)
+      - name: Build solution (for SonarQube)
         run: dotnet build --no-incremental
       - name: SonarQube end analysis
         env:
@@ -74,15 +74,13 @@ jobs:
 
   build:
     needs: [sonar, test]
+    if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
       - uses: ./.github/actions/setup-dotnet
-
-      - name: Build with dotnet
+      - name: Build with dotnet (Release)
         run: dotnet build --configuration Release
-
       - name: dotnet publish
         run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp
       
@@ -100,7 +98,6 @@ jobs:
           name: .net-app
           path: ${{env.DOTNET_ROOT}}/myapp
 
-  # Deployment job that only runs on main
   deploy:
     needs: build
     runs-on: ubuntu-latest
diff --git a/PathfinderHonorManager.Tests/PathfinderHonorManager.Tests.csproj b/PathfinderHonorManager.Tests/PathfinderHonorManager.Tests.csproj
@@ -12,15 +12,15 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="FluentValidation" Version="11.11.0" />
+    <PackageReference Include="FluentValidation" Version="12.0.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="NUnit" Version="4.3.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
     <PackageReference Include="FluentValidation.Validators.UnitTestExtension" Version="1.11.0.2" />
-    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
diff --git a/PathfinderHonorManager/Auth/HasScopeHandler.cs b/PathfinderHonorManager/Auth/HasScopeHandler.cs
@@ -1,9 +1,11 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using System.Diagnostics.CodeAnalysis;
 
 namespace PathfinderHonorManager.Auth
 {
+    [ExcludeFromCodeCoverage]
     public class HasScopeHandler : AuthorizationHandler<HasScopeRequirement>
     {
         protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, HasScopeRequirement requirement)
diff --git a/PathfinderHonorManager/Auth/HasScopeRequirement.cs b/PathfinderHonorManager/Auth/HasScopeRequirement.cs
@@ -1,8 +1,10 @@
 using System;
 using Microsoft.AspNetCore.Authorization;
+using System.Diagnostics.CodeAnalysis;
 
 namespace PathfinderHonorManager.Auth
 {
+    [ExcludeFromCodeCoverage]
     public class HasScopeRequirement : IAuthorizationRequirement
     {
         public string Issuer { get; }
diff --git a/PathfinderHonorManager/Controllers/AbstractController.cs b/PathfinderHonorManager/Controllers/AbstractController.cs
@@ -1,7 +1,9 @@
 ﻿using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics.CodeAnalysis;
 
 namespace PathfinderHonorManager.Controllers
 {
+    [ExcludeFromCodeCoverage]
     public abstract class CustomApiController : Controller
     {
         [NonAction]
diff --git a/PathfinderHonorManager/PathfinderHonorManager.csproj b/PathfinderHonorManager/PathfinderHonorManager.csproj
@@ -9,8 +9,8 @@
 
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'PathfinderHonorManager' " />
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.11.0" />
-    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
+    <PackageReference Include="FluentValidation" Version="12.0.0" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.4" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
@@ -19,7 +19,7 @@
     <PackageReference Include="Npgsql" Version="9.0.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.4" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.4" /> 
     <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="9.0.0" />
diff --git a/PathfinderHonorManager/Swagger/HealthCheckEndpointFilter.cs b/PathfinderHonorManager/Swagger/HealthCheckEndpointFilter.cs
@@ -2,9 +2,11 @@
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
+using System.Diagnostics.CodeAnalysis;
 
 namespace PathfinderHonorManager.Swagger
 {
+    [ExcludeFromCodeCoverage]
     public class HealthCheckEndpointFilter : IDocumentFilter
     {
         public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`	`1`	`using System.Linq;`
`2`	`2`	`using System.Threading.Tasks;`
`3`	`3`	`using Microsoft.AspNetCore.Authorization;`
	`4`	`+using System.Diagnostics.CodeAnalysis;`
`4`	`5`
`5`	`6`	`namespace PathfinderHonorManager.Auth`
`6`	`7`	`{`
	`8`	`+ [ExcludeFromCodeCoverage]`
`7`	`9`	`public class HasScopeHandler : AuthorizationHandler<HasScopeRequirement>`
`8`	`10`	`{`
`9`	`11`	`protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, HasScopeRequirement requirement)`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Microsoft.AspNetCore.Authorization;`
	`3`	`+using System.Diagnostics.CodeAnalysis;`
`3`	`4`
`4`	`5`	`namespace PathfinderHonorManager.Auth`
`5`	`6`	`{`
	`7`	`+ [ExcludeFromCodeCoverage]`
`6`	`8`	`public class HasScopeRequirement : IAuthorizationRequirement`
`7`	`9`	`{`
`8`	`10`	`public string Issuer { get; }`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`using Microsoft.AspNetCore.Mvc;`
	`2`	`+using System.Diagnostics.CodeAnalysis;`
`2`	`3`
`3`	`4`	`namespace PathfinderHonorManager.Controllers`
`4`	`5`	`{`
	`6`	`+ [ExcludeFromCodeCoverage]`
`5`	`7`	`public abstract class CustomApiController : Controller`
`6`	`8`	`{`
`7`	`9`	`[NonAction]`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,11 @@`
`2`	`2`	`using Microsoft.AspNetCore.Diagnostics.HealthChecks;`
`3`	`3`	`using Microsoft.OpenApi.Models;`
`4`	`4`	`using Swashbuckle.AspNetCore.SwaggerGen;`
	`5`	`+using System.Diagnostics.CodeAnalysis;`
`5`	`6`
`6`	`7`	`namespace PathfinderHonorManager.Swagger`
`7`	`8`	`{`
	`9`	`+ [ExcludeFromCodeCoverage]`
`8`	`10`	`public class HealthCheckEndpointFilter : IDocumentFilter`
`9`	`11`	`{`
`10`	`12`	`public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)`