Moved Categorise endpoint to Wolverine

oskardudycz · Aug 30, 2023 · 07ff838 · 07ff838
1 parent 62abac3
commit 07ff838
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 20 deletions.
diff --git a/Sample/Helpdesk.Wolverine/Helpdesk.Api.Tests/Incidents/CategoriseIncidentTests.cs b/Sample/Helpdesk.Wolverine/Helpdesk.Api.Tests/Incidents/CategoriseIncidentTests.cs
@@ -17,7 +17,7 @@ await API
             .When(
                 POST,
                 URI($"/api/agents/{agentId}/incidents/{API.Incident.Id}/category"),
-                BODY(new CategoriseIncidentRequest(category)),
+                BODY(new CategoriseIncidentRequest(API.Incident.Id, category)),
                 HEADERS(IF_MATCH(1))
             )
             .Then(OK);

diff --git a/Sample/Helpdesk.Wolverine/Helpdesk.Api/Helpdesk.Api.csproj b/Sample/Helpdesk.Wolverine/Helpdesk.Api/Helpdesk.Api.csproj
@@ -8,7 +8,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Marten.CommandLine" Version="6.0.5" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
         <PackageReference Include="Marten.AspNetCore" Version="6.0.5" />
         <PackageReference Include="Marten" Version="6.0.5" />

diff --git a/Sample/Helpdesk.Wolverine/Helpdesk.Api/Incidents/Categorise/CategoriseIncidentEndpoint.cs b/Sample/Helpdesk.Wolverine/Helpdesk.Api/Incidents/Categorise/CategoriseIncidentEndpoint.cs
@@ -0,0 +1,26 @@
+using Microsoft.AspNetCore.Mvc;
+using Wolverine.Http;
+using Wolverine.Marten;
+using static Microsoft.AspNetCore.Http.TypedResults;
+
+namespace Helpdesk.Api.Incidents.Categorise;
+
+public static class CategoriseIncidentEndpoint
+{
+    [AggregateHandler]
+    [WolverinePost("api/agents/{agentId:guid}/incidents/{incidentId:guid}/category")]
+    public static (IResult, Events) Post(
+        CategoriseIncidentRequest request,
+        Incident incident,
+        [FromRoute] Guid agentId,
+        [FromRoute] Guid incidentId,
+        DateTimeOffset now)
+    {
+        if (incident.Status == IncidentStatus.Closed)
+        {
+            throw new InvalidOperationException("Incident is already closed");
+        }
+
+        return (Ok(), new Events { new IncidentCategorised(incidentId, request.Category, agentId, now) });
+    }
+}
diff --git a/Sample/Helpdesk.Wolverine/Helpdesk.Api/Incidents/IncidentsEndpoints.cs b/Sample/Helpdesk.Wolverine/Helpdesk.Api/Incidents/IncidentsEndpoints.cs
@@ -13,23 +13,6 @@ namespace Helpdesk.Api.Incidents;
 
 public static class IncidentsEndpoints
 {
-    [WolverinePost("/api/agents/{agentId:guid}/incidents/{incidentId:guid}/category")]
-    public static async Task<IResult> CategoriseIncident
-    (
-        IDocumentSession documentSession,
-        Guid incidentId,
-        Guid agentId,
-        [FromIfMatchHeader] string eTag,
-        CategoriseIncidentRequest body,
-        CancellationToken ct
-    )
-    {
-        await documentSession.GetAndUpdate<Incident>(incidentId, ToExpectedVersion(eTag),
-            state => Handle(state, new CategoriseIncident(incidentId, body.Category, agentId, Now)), ct);
-
-        return Ok();
-    }
-
     [WolverinePost("/api/agents/{agentId:guid}/incidents/{incidentId:guid}/priority")]
     public static async Task<IResult> PrioritiseIncident
     (
@@ -159,6 +142,7 @@ string Description
 );
 
 public record CategoriseIncidentRequest(
+    Guid IncidentId,
     IncidentCategory Category
 );
 

diff --git a/Sample/Helpdesk.Wolverine/Helpdesk.Api/Program.cs b/Sample/Helpdesk.Wolverine/Helpdesk.Api/Program.cs
@@ -22,7 +22,6 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-
 builder.Services
     .AddEndpointsApiExplorer()
     .AddSwaggerGen()