Merge pull request #62 from futurum-dev/feature/WebApiEndpointExecutorService-code-cleanup

WebApiEndpointExecutorService - code cleanup

Author: futurum-dev

benchmark/Futurum.WebApiEndpoint.Benchmark.WebApiEndpoint/NoOpWebApiEndpointLogger.cs

@@ -20,11 +20,11 @@ public void Error(string path, IResultError error)
     {
     }
 
-    public void Error(Exception exception, IWebApiEndpointLogger.WebApiRouteErrorData errorData)
+    public void ErrorUnhandled(Exception exception, string route, string path, string status, int statusCode, string reason)
     {
     }
 
-    public void Error(IWebApiEndpointLogger.WebApiEndpointNotFoundData errorData)
+    public void ErrorWebApiEndpointNotFound(string path, string httpMethod)
     {
     }
 

src/Futurum.WebApiEndpoint/Internal/WebApiEndpointExecutorService.cs

@@ -9,26 +9,30 @@ namespace Futurum.WebApiEndpoint.Internal;
 
 internal static class WebApiEndpointExecutorService
 {
-    public static async Task ExecuteAsync(HttpContext httpContext, MetadataDefinition? metadataDefinition, string routePath, CancellationToken cancellationToken)
+    public static Task ExecuteAsync(HttpContext httpContext, MetadataDefinition? metadataDefinition, string routePath, CancellationToken cancellationToken) =>
+        metadataDefinition != null
+            ? WebApiEndpointAsync(httpContext, metadataDefinition, routePath, cancellationToken)
+            : WebApiEndpointNotFoundAsync(httpContext, routePath, cancellationToken);
+
+    private static async Task WebApiEndpointAsync(HttpContext httpContext, MetadataDefinition metadataDefinition, string routePath, CancellationToken cancellationToken)
     {
         try
         {
-            if (metadataDefinition != null)
-                await CallWebApiEndpointAsync(httpContext, metadataDefinition, cancellationToken).UnwrapAsync();
-            else
-                await WebApiEndpointNotFoundAsync(httpContext, routePath, cancellationToken);
+            await CallWebApiEndpointAsync(httpContext, metadataDefinition, cancellationToken).UnwrapAsync();
         }
         catch (Exception exception)
         {
-            var errorData = new IWebApiEndpointLogger.WebApiRouteErrorData(routePath, httpContext.Request.Path, "Internal Server Error", (int)HttpStatusCode.InternalServerError, exception.Message);
+            const HttpStatusCode internalServerError = HttpStatusCode.InternalServerError;
+
+            string requestPath = httpContext.Request.Path;
 
             var webApiEndpointLogger = httpContext.RequestServices.GetService<IWebApiEndpointLogger>();
-            webApiEndpointLogger.Error(exception, errorData);
+            webApiEndpointLogger.ErrorUnhandled(exception, routePath, requestPath, "Internal Server Error", (int)internalServerError, exception.Message);
 
-            var errorResponse = HttpStatusCode.InternalServerError.ToResultError(exception.ToResultError())
-                                         .ToProblemDetails((int)HttpStatusCode.InternalServerError, httpContext.Request.Path);
+            var errorResponse = internalServerError.ToResultError(exception.ToResultError())
+                                                   .ToProblemDetails((int)internalServerError, requestPath);
 
-            httpContext.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
+            httpContext.Response.StatusCode = (int)internalServerError;
 
             httpContext.Response.ContentType = WebApiEndpointContentType.ProblemJson;
 
@@ -38,22 +42,21 @@ public static async Task ExecuteAsync(HttpContext httpContext, MetadataDefinitio
 
     private static Task<Result<IWebApiEndpointDispatcher>> CallWebApiEndpointAsync(HttpContext httpContext, MetadataDefinition metadataDefinition, CancellationToken cancellationToken) =>
         httpContext.RequestServices.TryGetService<IWebApiEndpointDispatcher>(metadataDefinition.MetadataTypeDefinition.WebApiEndpointExecutorServiceType)
-                   .ThenAsync(webApiEndpointDispatcher => webApiEndpointDispatcher.ExecuteAsync(metadataDefinition, httpContext,  cancellationToken));
+                   .ThenAsync(webApiEndpointDispatcher => webApiEndpointDispatcher.ExecuteAsync(metadataDefinition, httpContext, cancellationToken));
 
     private static Task WebApiEndpointNotFoundAsync(HttpContext httpContext, string routePath, CancellationToken cancellationToken)
     {
-        var eventData = new IWebApiEndpointLogger.WebApiEndpointNotFoundData(routePath, httpContext.Request.Method);
+        const HttpStatusCode failedStatusCode = HttpStatusCode.BadRequest;
+
+        string requestPath = httpContext.Request.Path;
 
         var webApiEndpointLogger = httpContext.RequestServices.GetService<IWebApiEndpointLogger>();
-        webApiEndpointLogger.Error(eventData);
+        webApiEndpointLogger.ErrorWebApiEndpointNotFound(routePath, httpContext.Request.Method);
 
-        var failedStatusCode = (int)HttpStatusCode.BadRequest;
+        var errorResponse = $"WebApiEndpoint - Unable to find WebApiEndpoint for route : '{routePath}'".ToResultError()
+                                                                                                       .ToProblemDetails((int)failedStatusCode, requestPath);
 
-        var errorResponse = $"WebApiEndpoint - Unable to find WebApiEndpoint for route : '{routePath}'"
-                            .ToResultError()
-                            .ToProblemDetails(failedStatusCode, httpContext.Request.Path);
-        
-        httpContext.Response.StatusCode = failedStatusCode;
+        httpContext.Response.StatusCode = (int)failedStatusCode;
 
         httpContext.Response.ContentType = WebApiEndpointContentType.ProblemJson;
 

src/Futurum.WebApiEndpoint/WebApiEndpointLogger.cs

@@ -16,15 +16,11 @@ public interface IWebApiEndpointLogger : IApiEndpointLogger
 
     void Error(string path, IResultError error);
 
-    void Error(Exception exception, WebApiRouteErrorData errorData);
+    void ErrorUnhandled(Exception exception, string route, string path, string status, int statusCode, string reason);
 
-    void Error(WebApiEndpointNotFoundData errorData);
+    void ErrorWebApiEndpointNotFound(string path, string httpMethod);
 
     void EndpointConfiguring(string route, MetadataRouteDefinition metadataRouteDefinition);
-
-    public record struct WebApiEndpointNotFoundData(string RoutePath, string HttpMethod);
-
-    public record struct WebApiRouteErrorData(string Route, string Path, string Status, int StatusCode, string Reason);
 }
 
 [ExcludeFromCodeCoverage]
@@ -58,14 +54,18 @@ public void Error(string path, IResultError error)
         _logger.Error("WebApiEndpoint error {@eventData}", eventData);
     }
 
-    public void Error(Exception exception, IWebApiEndpointLogger.WebApiRouteErrorData errorData)
+    public void ErrorUnhandled(Exception exception, string Route, string Path, string Status, int StatusCode, string Reason)
     {
-        _logger.Error(exception, "WebApiEndpoint error - {@eventData}", errorData);
+        var eventData = new WebApiRouteErrorData(Route, Path, Status, StatusCode, Reason);
+        
+        _logger.Error(exception, "WebApiEndpoint error - {@eventData}", eventData);
     }
 
-    public void Error(IWebApiEndpointLogger.WebApiEndpointNotFoundData errorData)
+    public void ErrorWebApiEndpointNotFound(string path, string httpMethod)
     {
-        _logger.Error("Unable to find WebApiEndpoint - {@eventData}", errorData);
+        var eventData = new WebApiEndpointNotFoundData(path, httpMethod);
+
+        _logger.Error("Unable to find WebApiEndpoint - {@eventData}", eventData);
     }
 
     public void ApiEndpointDebugLog(string apiEndpointDebugLog)
@@ -88,6 +88,10 @@ private record struct ResponseSentData<TResponse>(Type RequestType, Type Respons
 
     private record struct ErrorData(string Path, string Error);
 
+    private record struct WebApiEndpointNotFoundData(string Path, string HttpMethod);
+
+    private record struct WebApiRouteErrorData(string Route, string Path, string Status, int StatusCode, string Reason);
+
     private record struct ApiEndpoints(string Log);
 
     private record struct EndpointConfiguringData(string Route, MetadataRouteDefinition MetadataRouteDefinition);