.net 7 updates minimal api samples

Author: christiannagel

5_More/Services/MinimalAPIWithGroupsAndTypedResults/Endpoints/GameEndpoints.cs 5_More/Services/GamesApiDotnet7/Endpoints/GameEndpoints.cs

@@ -1,17 +1,17 @@
 using Codebreaker.Utilities;
 
 using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Codebreaker.Endpoints;
 
-// polymorphic hierarchy https://learn.microsoft.com/en-us/dotnet/standard/serialization/system-text-json/polymorphism?pivots=dotnet-7-0
-
 public static class GameEndpoints
 {
     public static IEndpointRouteBuilder MapGameEndpoints(this IEndpointRouteBuilder routes, ILogger logger)
     {
         var group = routes.MapGroup("/games")
-            .WithTags(nameof(Game));
+            .WithTags("Gameplay")
+            .AddEndpointFilter<LoggingFilter>();
 
         group.MapGet("/", async (IGamesService gamesService) =>
         {
@@ -35,7 +35,7 @@ public static IEndpointRouteBuilder MapGameEndpoints(this IEndpointRouteBuilder
         .WithSummary("Gets a game by the given id")
         .WithOpenApi(op =>
         {
-            op.Parameters[0].Description = "The id of the game to get";
+            op.Parameters[0].Description = "The game-id to request a game run";
             return op;
         });
 
@@ -46,18 +46,15 @@ public static IEndpointRouteBuilder MapGameEndpoints(this IEndpointRouteBuilder
             try
             {
                 game = await gamesService.CreateGameAsync(request.GameType, request.PlayerName);
+
+                CreateGameResponse createGameResponse = new(game.GameId, game.GameType, game.PlayerName);
+                return TypedResults.Created($"/{game.GameId}", createGameResponse);
             }
             catch (InvalidGameException ex) when (ex.HResult == 4000)
             {
                 logger.LogError("Game Type not found {gametype}", request.GameType);
-
-                // InvalidGameRequest invalidRequest = new("Gametype does not exist, valid types:", new[] { GameTypes.Game6x4, GameTypes.Game8x5, GameTypes.Game5x5x4, GameTypes.Game6x4Simple });
-                // return TypedResults.BadRequest(invalidRequest);
                 return TypedResults.BadRequest();
             }
-
-            CreateGameResponse createGameResponse = new(game.GameId, game.GameType, game.PlayerName);
-            return TypedResults.Created($"/{game.GameId}", createGameResponse);
         })
         .WithName("CreateGame")
         .WithSummary("Creates and starts a game")
@@ -70,30 +67,16 @@ public static IEndpointRouteBuilder MapGameEndpoints(this IEndpointRouteBuilder
         // Create a move for a game
         group.MapPost("/{gameId:guid}/moves", async Task<Results<Ok<SetMoveResponse>, BadRequest<string>, NotFound>> (Guid gameId, SetMoveRequest request, IGamesService gamesService) =>
         {
-            if (gameId != request.GameId)
-            {
-                return TypedResults.BadRequest("id does not match");
-            }
-            if (request.ColorFields == default && request.ShapeAndColorFields == default)
-            {
-                return TypedResults.BadRequest("Either fill ColorFields or ShapeAndColorFields");
-            }
-            try
-            {
-                SetMoveResponse response = await gamesService.SetMoveAsync(request);
-                return TypedResults.Ok(response);
-            }
-            catch (GameNotFoundException)
-            {
-                logger.LogError("Game {gameid} not found", request.GameId);
-                return TypedResults.NotFound();
-            }
+            SetMoveResponse response = await gamesService.SetMoveAsync(request);
+            return TypedResults.Ok(response);
         })
+        .AddEndpointFilter<GameMoveValidationFilter>()
+        .AddEndpointFilter<GameMoveExceptionFilter>()
         .WithName("SetMove")
         .WithSummary("Sets a move with a game")
         .WithOpenApi(op =>
         {
-            op.RequestBody.Description = "The move to set";
+            op.RequestBody.Description = "The game move consisting of values for every available hole";
             return op;
         });
 

5_More/Services/GamesApiDotnet7/Endpoints/GameMoveExceptionFilter.cs

@@ -0,0 +1,25 @@
+using Codebreaker.Utilities;
+
+namespace Codebreaker.Endpoints;
+
+public class GameMoveExceptionFilter : IEndpointFilter
+{
+    private readonly ILogger _logger;
+    public GameMoveExceptionFilter(ILogger<GameMoveExceptionFilter> logger)
+    {
+        _logger = logger;
+    }
+    public async ValueTask<object?> InvokeAsync(EndpointFilterInvocationContext context, EndpointFilterDelegate next)
+    {
+        SetMoveRequest request = context.GetArgument<SetMoveRequest>(1);
+        try
+        {
+            return await next(context);
+        }
+        catch (GameNotFoundException ex)
+        {
+            _logger.LogError(ex, "Game {gameid} not found", request.GameId);
+            return TypedResults.NotFound();
+        }
+    }
+}

5_More/Services/GamesApiDotnet7/Endpoints/GameMoveValidationFilter.cs

@@ -0,0 +1,20 @@
+namespace Codebreaker.Endpoints;
+
+public class GameMoveValidationFilter : IEndpointFilter
+{
+    public async ValueTask<object?> InvokeAsync(EndpointFilterInvocationContext context, EndpointFilterDelegate next)
+    {
+        Guid id = context.GetArgument<Guid>(0);
+        SetMoveRequest request = context.GetArgument<SetMoveRequest>(1);
+        if (id != request.GameId)
+        {
+            return TypedResults.BadRequest("id does not match");
+        }
+
+        if (request.ColorFields == default && request.ShapeAndColorFields == default)
+        {
+            return TypedResults.BadRequest("Either fill ColorFields or ShapeAndColorFields");
+        }
+        return await next(context);
+    }
+}

5_More/Services/GamesApiDotnet7/Endpoints/LoggingFilter.cs

@@ -0,0 +1,18 @@
+using Microsoft.AspNetCore.Http.Extensions;
+
+namespace Codebreaker.Endpoints;
+
+public class LoggingFilter : IEndpointFilter
+{
+    private readonly ILogger _logger;
+    public LoggingFilter(ILoggerFactory loggerFactory)
+    {
+        _logger = loggerFactory.CreateLogger<LoggingFilter>();
+    }
+
+    public async ValueTask<object?> InvokeAsync(EndpointFilterInvocationContext context, EndpointFilterDelegate next)
+    {
+        _logger.LogTrace("{uri} called using {method}", context.HttpContext.Request.GetDisplayUrl(), context.HttpContext.Request.Method);
+        return await next(context);
+    }
+}

5_More/Services/MinimalAPIWithGroupsAndTypedResults/MinimalAPIWithGroupingAndTypedResults.csproj 5_More/Services/GamesApiDotnet7/GamesApiDotnet7.csproj

@@ -1,25 +1,25 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.6.33513.286
+VisualStudioVersion = 17.6.33620.401
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinimalAPIWithGroupingAndTypedResults", "MinimalAPIWithGroupingAndTypedResults.csproj", "{0DDD38E3-1DB6-4F81-BDA6-218422B9542B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GamesApiDotnet7", "GamesApiDotnet7.csproj", "{A412B5A8-C523-41A6-87AE-9D3286001C99}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0DDD38E3-1DB6-4F81-BDA6-218422B9542B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DDD38E3-1DB6-4F81-BDA6-218422B9542B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DDD38E3-1DB6-4F81-BDA6-218422B9542B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DDD38E3-1DB6-4F81-BDA6-218422B9542B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A412B5A8-C523-41A6-87AE-9D3286001C99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A412B5A8-C523-41A6-87AE-9D3286001C99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A412B5A8-C523-41A6-87AE-9D3286001C99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A412B5A8-C523-41A6-87AE-9D3286001C99}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {489BE7D4-744F-4FBE-B7B9-43C80F2EF9CA}
+		SolutionGuid = {6CA85128-AF22-4304-A42B-3F961DF88FA2}
 	EndGlobalSection
 EndGlobal

5_More/Services/MinimalAPIWithGroupsAndTypedResults/MinimalAPIWithGroupingAndTypedResults.sln 5_More/Services/GamesApiDotnet7/GamesApiDotnet7.sln

@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.AspNetCore.Http.Json;
 
 using System.Text.Json;
@@ -14,6 +15,7 @@
 {
     options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
 });
+
 builder.Services.Configure<JsonOptions>(options =>
 {
     options.SerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault;
@@ -23,7 +25,7 @@
 builder.Services.AddSingleton<IGamesRepository, InMemoryGamesRepository>();
 builder.Services.AddSingleton<GamesFactory>();
 builder.Services.AddTransient<IGamesService, GamesService>();
-
+Results<Ok, Created, Ok>
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
@@ -37,17 +39,4 @@
 
 app.MapGameEndpoints(app.Logger);
 
-SetMoveRequest req = new(Guid.NewGuid(), GameType.Game6x4, 1)
-{
-    ColorFields = new List<ColorField>
-    {
-        new("red"),
-        new("green"),
-        new("blue"),
-        new("blue")
-    }
-};
-string json = JsonSerializer.Serialize(req);
-
-
 app.Run();