Square refactor

Author: CorruptComputer

Alidade.AppHost/Alidade.AppHost.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Aspire.AppHost.Sdk/13.2.3">
+<Project Sdk="Aspire.AppHost.Sdk/13.2.4">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <UserSecretsId>453dcf52-98c0-439a-b464-4f576ce577f1</UserSecretsId>

Alidade.Core/AlidadeCoreModule.cs

@@ -1,4 +1,3 @@
-using Alidade.Core.Consts;
 using Autofac;
 using NetTopologySuite.Geometries;
 

Alidade.Core/Models/CQRS/Response/CommandResult.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace Alidade.Core.Models.CQRS.Response;
 
 /// <summary>

Alidade.Core/Models/CQRS/Response/QueryResult.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace Alidade.Core.Models.CQRS.Response;
 
 /// <summary>
@@ -25,6 +23,11 @@ private QueryResult() { }
         Success = false,
         FailReason = failureReason
     };
+
+    /// <summary>
+    ///   Creates a success response, used to work around a C# limitation with interfaces.
+    /// </summary>
+    public static QueryResult<TResult> Pass(TResult result) => result;
 #pragma warning restore CA1000
 
     /// <summary>
@@ -47,9 +50,17 @@ public static implicit operator QueryResult<TResult>(TResult? result)
     {
         if (result is null)
         {
-            return new() { Success = false, FailReason = "Result is null" };
+            return new()
+            {
+                Success = false,
+                FailReason = "Result is null"
+            };
         }
 
-        return new() { Success = true, Result = result };
+        return new()
+        {
+            Success = true,
+            Result = result
+        };
     }
 }

Alidade.Core/Models/CQRS/Response/ResultBase.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace Alidade.Core.Models.CQRS.Response;
 
 /// <summary>

Alidade.Core/PipelineBehaviors/CommandBehavior.cs

@@ -8,5 +8,5 @@ public sealed class CommandBehavior<TRequest>(ILogger<CommandBehavior<TRequest>>
     protected override bool GetResult(CommandResult response) => response.Success;
 
     /// <inheritdoc />
-    protected override CommandResult GetGenericFailedResponse() => CommandResult.Fail();
+    protected override CommandResult GetGenericFailedResponse(string? failReason = null) => CommandResult.Fail(failReason);
 }

Alidade.Core/PipelineBehaviors/NotificationBehavior.cs

@@ -28,6 +28,10 @@ public async Task Handle(TNotification notification, CancellationToken cancellat
         {
             await inner.Handle(notification, cancellationToken);
         }
+        catch (OperationCanceledException)
+        {
+            logger.LogInformation("Request cancelled [{TypeName}]", typeof(TNotification).FullName);
+        }
         catch (Exception e)
         {
             logger.LogError(e, "Uncaught Exception [{NotificationName}] | ExceptionMessage = {Message}",

Alidade.Core/PipelineBehaviors/PipelineBehaviorBase.cs

@@ -16,7 +16,7 @@ public abstract class PipelineBehaviorBase<TRequest, TResponse>(ILogger<Pipeline
     /// <summary>
     ///   Generates a failure response for the given type.
     /// </summary>
-    protected abstract TResponse GetGenericFailedResponse();
+    protected abstract TResponse GetGenericFailedResponse(string? failReason = null);
 
     /// <inheritdoc />
     public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next, CancellationToken cancellationToken)
@@ -38,12 +38,17 @@ public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TRe
         {
             response = await next(cancellationToken);
         }
+        catch (OperationCanceledException)
+        {
+            logger.LogInformation("Request cancelled [{TypeName}]", typeof(TRequest).FullName);
+            return GetGenericFailedResponse("Operation cancelled.");
+        }
         catch (Exception e)
         {
             logger.LogError(e, "Uncaught Exception [{RequestName}] | ExceptionMessage = {Message}",
                 typeof(TRequest).FullName, e.Message);
             exception = e;
-            response = GetGenericFailedResponse();
+            response = GetGenericFailedResponse($"Uncaught exception from: {typeof(TRequest).FullName}");
         }
 
         bool success = GetResult(response);

Alidade.Core/PipelineBehaviors/QueryBehavior.cs

@@ -8,5 +8,5 @@ public sealed class QueryBehavior<TRequest, TValue>(ILogger<QueryBehavior<TReque
     protected override bool GetResult(QueryResult<TValue> response) => response.Success;
 
     /// <inheritdoc />
-    protected override QueryResult<TValue> GetGenericFailedResponse() => QueryResult<TValue>.Fail();
+    protected override QueryResult<TValue> GetGenericFailedResponse(string? failReason = null) => QueryResult<TValue>.Fail(failReason);
 }

Alidade.Osm/AlidadeOsmModule.cs

@@ -1,4 +1,3 @@
-using Alidade.Osm.Services;
 using Autofac;
 
 namespace Alidade.Osm;