Or 1949

src/AssociationRegistry.Admin.Api/AssociationRegistry.Admin.Api.csproj

@@ -43,6 +43,15 @@
 
   <ItemGroup>
     <EmbeddedResource Include="Contexten\*.json" />
+    <Compile Update="ValidationMessages.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ValidationMessages.resx</DependentUpon>
+    </Compile>
+    <EmbeddedResource Update="ValidationMessages.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>ValidationMessages.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
 
   <Import Project="..\..\.paket\Paket.Restore.targets" />

src/AssociationRegistry.Admin.Api/Infrastructure/BadHttpRequestExceptionHandler.cs → src/AssociationRegistry.Admin.Api/Infrastructure/ExceptionHandlers/BadHttpRequestExceptionHandler.cs

@@ -1,4 +1,4 @@
-namespace AssociationRegistry.Admin.Api.Infrastructure;
+namespace AssociationRegistry.Admin.Api.Infrastructure.ExceptionHandlers;
 
 using Be.Vlaanderen.Basisregisters.Api.Exceptions;
 using Be.Vlaanderen.Basisregisters.BasicApiProblem;

src/AssociationRegistry.Admin.Api/Infrastructure/CouldNotParseRequestException.cs → src/AssociationRegistry.Admin.Api/Infrastructure/ExceptionHandlers/CouldNotParseRequestException.cs

@@ -1,4 +1,4 @@
-namespace AssociationRegistry.Admin.Api.Infrastructure;
+namespace AssociationRegistry.Admin.Api.Infrastructure.ExceptionHandlers;
 
 using System;
 

src/AssociationRegistry.Admin.Api/Infrastructure/CouldNotParseRequestExceptionHandler.cs → src/AssociationRegistry.Admin.Api/Infrastructure/ExceptionHandlers/CouldNotParseRequestExceptionHandler.cs

@@ -1,4 +1,4 @@
-namespace AssociationRegistry.Admin.Api.Infrastructure;
+namespace AssociationRegistry.Admin.Api.Infrastructure.ExceptionHandlers;
 
 using Be.Vlaanderen.Basisregisters.Api.Exceptions;
 using Be.Vlaanderen.Basisregisters.BasicApiProblem;

src/AssociationRegistry.Admin.Api/Infrastructure/ExceptionHandlers/UnexpectedAggregateVersionExceptionHandler.cs

@@ -0,0 +1,26 @@
+namespace AssociationRegistry.Admin.Api.Infrastructure.ExceptionHandlers;
+
+using Be.Vlaanderen.Basisregisters.Api.Exceptions;
+using Be.Vlaanderen.Basisregisters.BasicApiProblem;
+using EventStore;
+using Microsoft.AspNetCore.Http;
+
+public class UnexpectedAggregateVersionExceptionHandler : DefaultExceptionHandler<UnexpectedAggregateVersionException>
+{
+    private readonly ProblemDetailsHelper _problemDetailsHelper;
+
+    public UnexpectedAggregateVersionExceptionHandler(ProblemDetailsHelper problemDetailsHelper)
+    {
+        _problemDetailsHelper = problemDetailsHelper;
+    }
+
+    protected override ProblemDetails GetApiProblemFor(UnexpectedAggregateVersionException exception)
+        => new()
+        {
+            HttpStatus = StatusCodes.Status412PreconditionFailed,
+            Title = ProblemDetails.DefaultTitle,
+            Detail = exception.Message,
+            ProblemTypeUri = _problemDetailsHelper.GetExceptionTypeUriFor(exception),
+            ProblemInstanceUri = $"{_problemDetailsHelper.GetInstanceBaseUri()}/{ProblemDetails.GetProblemNumber()}",
+        };
+}

src/AssociationRegistry.Admin.Api/Infrastructure/Extensions/FluentValidatorExtensions.cs

@@ -1,5 +1,6 @@
 namespace AssociationRegistry.Admin.Api.Infrastructure.Extensions;
 
+using ExceptionHandlers;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;

src/AssociationRegistry.Admin.Api/Infrastructure/Extensions/HttpResponseExtensions.cs

@@ -3,21 +3,32 @@
 using System.Threading.Tasks;
 using Be.Vlaanderen.Basisregisters.Api.Exceptions;
 using Be.Vlaanderen.Basisregisters.AspNetCore.Mvc.Formatters.Json;
-using Be.Vlaanderen.Basisregisters.BasicApiProblem;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.NewtonsoftJson;
 using Newtonsoft.Json;
+using ProblemDetails = Be.Vlaanderen.Basisregisters.BasicApiProblem.ProblemDetails;
 
 public static class HttpResponseExtensions
 {
-    public static async Task WriteProblemDetailsAsync(this HttpResponse response, ProblemDetailsHelper problemDetailsHelper, string problemDetailsMessage)
+    public static async Task<IActionResult> WriteNotFoundProblemDetailsAsync(
+        this HttpResponse response,
+        ProblemDetailsHelper problemDetailsHelper,
+        string? message = null)
     {
-        response.StatusCode = StatusCodes.Status400BadRequest;
+        message ??= ValidationMessages.Status404NotFound;
+        await response.WriteProblemDetailsAsync(problemDetailsHelper, message, StatusCodes.Status404NotFound);
+        return new EmptyResult();
+    }
+
+    public static async Task WriteProblemDetailsAsync(this HttpResponse response, ProblemDetailsHelper problemDetailsHelper, string problemDetailsMessage, int statusCode = StatusCodes.Status400BadRequest)
+    {
+        response.StatusCode = statusCode;
         await response.WriteAsync(
             JsonConvert.SerializeObject(
                 new ProblemDetails
                 {
-                    HttpStatus = StatusCodes.Status400BadRequest,
+                    HttpStatus = statusCode,
                     Title = ProblemDetails.DefaultTitle,
                     Detail = problemDetailsMessage,
                     ProblemTypeUri = "urn:associationregistry.admin.api:validation",

src/AssociationRegistry.Admin.Api/Infrastructure/Middleware/UnexpectedAggregateVersionMiddleware.cs

@@ -1,7 +1,10 @@
 namespace AssociationRegistry.Admin.Api.Infrastructure.Middleware;
 
+using Be.Vlaanderen.Basisregisters.AggregateSource;
+using Be.Vlaanderen.Basisregisters.Api.Exceptions;
 using System.Threading.Tasks;
 using EventStore;
+using Extensions;
 using Microsoft.AspNetCore.Http;
 
 public class UnexpectedAggregateVersionMiddleware
@@ -13,16 +16,15 @@ public UnexpectedAggregateVersionMiddleware(RequestDelegate next)
         _next = next;
     }
 
-    public async Task InvokeAsync(HttpContext context)
+    public async Task InvokeAsync(HttpContext context, ProblemDetailsHelper problemDetailsHelper)
     {
         try
         {
             await _next(context);
         }
-        catch (UnexpectedAggregateVersionException)
+        catch (UnexpectedAggregateVersionException ex)
         {
-            context.Response.Clear();
-            context.Response.StatusCode = StatusCodes.Status412PreconditionFailed;
+            await context.Response.WriteProblemDetailsAsync(problemDetailsHelper, ex.Message, StatusCodes.Status412PreconditionFailed);
         }
     }
 }

src/AssociationRegistry.Admin.Api/Infrastructure/Swagger/Examples/NotFoundProblemDetailsExamples.cs

@@ -0,0 +1,25 @@
+namespace AssociationRegistry.Admin.Api.Infrastructure.Swagger.Examples;
+
+using Be.Vlaanderen.Basisregisters.Api.Exceptions;
+using Be.Vlaanderen.Basisregisters.BasicApiProblem;
+using Microsoft.AspNetCore.Http;
+using Swashbuckle.AspNetCore.Filters;
+
+public class NotFoundProblemDetailsExamples : IExamplesProvider<ProblemDetails>
+{
+    private readonly ProblemDetailsHelper _helper;
+
+    public NotFoundProblemDetailsExamples(ProblemDetailsHelper helper)
+    {
+        _helper = helper;
+    }
+    public ProblemDetails GetExamples()
+        => new()
+        {
+            HttpStatus = StatusCodes.Status404NotFound,
+            Title = ProblemDetails.DefaultTitle,
+            Detail = "De gevraagde vereniging werd niet gevonden.",
+            ProblemTypeUri = "urn:associationregistry.admin.api:validation",
+            ProblemInstanceUri = $"{_helper.GetInstanceBaseUri()}/{ProblemDetails.GetProblemNumber()}",
+        };
+}

src/AssociationRegistry.Admin.Api/Infrastructure/Swagger/Examples/PreconditionFailedProblemDetailsExamples.cs

@@ -0,0 +1,52 @@
+namespace AssociationRegistry.Admin.Api.Infrastructure.Swagger.Examples;
+
+using Be.Vlaanderen.Basisregisters.Api.Exceptions;
+using Be.Vlaanderen.Basisregisters.BasicApiProblem;
+using Microsoft.AspNetCore.Http;
+using Swashbuckle.AspNetCore.Filters;
+
+public abstract class PreconditionFailedProblemDetailsExamplesBase : IExamplesProvider<ProblemDetails>
+{
+    private readonly ProblemDetailsHelper _helper;
+    private readonly string _message;
+
+    protected PreconditionFailedProblemDetailsExamplesBase(ProblemDetailsHelper helper, string message)
+    {
+        _helper = helper;
+        _message = message;
+    }
+
+    public ProblemDetails GetExamples()
+        => new()
+        {
+            HttpStatus = StatusCodes.Status412PreconditionFailed,
+            Title = ProblemDetails.DefaultTitle,
+            Detail = _message,
+            ProblemTypeUri = "urn:associationregistry.admin.api:validation",
+            ProblemInstanceUri = $"{_helper.GetInstanceBaseUri()}/{ProblemDetails.GetProblemNumber()}",
+        };
+}
+
+public class PreconditionFailedProblemDetailsExamples : PreconditionFailedProblemDetailsExamplesBase
+{
+    public PreconditionFailedProblemDetailsExamples(ProblemDetailsHelper helper) :
+        base(helper, ValidationMessages.Status412PreconditionFailed)
+    {
+    }
+}
+
+public class HistoriekPreconditionFailedProblemDetailsExamples : PreconditionFailedProblemDetailsExamplesBase
+{
+    public HistoriekPreconditionFailedProblemDetailsExamples(ProblemDetailsHelper helper) :
+        base(helper, ValidationMessages.Status412Historiek)
+    {
+    }
+}
+
+public class DetailPreconditionFailedProblemDetailsExamples : PreconditionFailedProblemDetailsExamplesBase
+{
+    public DetailPreconditionFailedProblemDetailsExamples(ProblemDetailsHelper helper) :
+        base(helper, ValidationMessages.Status412Detail)
+    {
+    }
+}

src/AssociationRegistry.Admin.Api/Infrastructure/ValidationProblemDetailsExamples.cs

@@ -24,11 +24,12 @@ public ValidationProblemDetails GetExamples()
             },
         };
 }
-public class ProblemDetailsExamples : IExamplesProvider<ProblemDetails>
+
+public class BadRequestProblemDetailsExamples : IExamplesProvider<ProblemDetails>
 {
     private readonly ProblemDetailsHelper _helper;
 
-    public ProblemDetailsExamples(ProblemDetailsHelper helper)
+    public BadRequestProblemDetailsExamples(ProblemDetailsHelper helper)
     {
         _helper = helper;
     }

src/AssociationRegistry.Admin.Api/Program.cs

@@ -21,6 +21,7 @@ namespace AssociationRegistry.Admin.Api;
 using Infrastructure;
 using Infrastructure.Configuration;
 using Infrastructure.ConfigurationBindings;
+using Infrastructure.ExceptionHandlers;
 using Infrastructure.Extensions;
 using Infrastructure.Json;
 using Infrastructure.Middleware;
@@ -204,6 +205,7 @@ private static void ConfigureExceptionHandler(WebApplication app)
             {
                 new BadHttpRequestExceptionHandler(problemDetailsHelper),
                 new CouldNotParseRequestExceptionHandler(problemDetailsHelper),
+                new UnexpectedAggregateVersionExceptionHandler(problemDetailsHelper),
                 new JsonReaderExceptionHandler(problemDetailsHelper),
             },
             problemDetailsHelper);