Some fixes to the queries and context records.

wolverine/a-frame-architecture/FinancialApi.Application/Handlers/ApplyFeeHandler.cs

@@ -2,7 +2,6 @@ using FinancialApi.Application.Commands;
 using FinancialApi.Application.Events;
 using FinancialApi.Application.Interfaces;
 using FinancialApi.Application.Models;
-using FinancialApi.Domain;
 using FinancialApi.Domain.Aggregates;
 using FinancialApi.Domain.Entities;
 using Wolverine.Persistence;

wolverine/a-frame-architecture/FinancialApi.Application/Handlers/ReverseJournalHandler.cs

@@ -2,7 +2,6 @@ using FinancialApi.Application.Commands;
 using FinancialApi.Application.Events;
 using FinancialApi.Application.Interfaces;
 using FinancialApi.Application.Models;
-using FinancialApi.Domain;
 using FinancialApi.Domain.Aggregates;
 using FinancialApi.Domain.Entities;
 using Wolverine.Persistence;
@@ -17,8 +16,19 @@ public static class ReverseJournalHandler
         TimeProvider timeProvider
     )
     {
-        var data = await query.GetReversalDataAsync(cmd.OriginalJournalId);
-        return data ?? throw new InvalidOperationException($"Journal Entry {cmd.OriginalJournalId} does not exist");
+        var (journalEnty, accounts) = await query.GetReversalDataAsync(cmd.OriginalJournalId);
+        if (journalEnty == null)
+        {
+            throw new InvalidOperationException("Journal not found");
+        }
+
+        if (accounts == null)
+        {
+            throw new InvalidOperationException("Journal accounts not found");
+        }
+
+        return new JournalReversalContext(journalEnty, accounts, timeProvider.GetUtcNow()) ??
+               throw new InvalidOperationException($"Journal Entry {cmd.OriginalJournalId} does not exist");
     }
 
     public static ( IStorageAction<JournalEntry> JournalWrite, UnitOfWork<Account> AccountWrites, JournalReversedEvent

wolverine/a-frame-architecture/FinancialApi.Application/Handlers/TransferFundsHandler.cs

@@ -2,7 +2,6 @@ using FinancialApi.Application.Commands;
 using FinancialApi.Application.Events;
 using FinancialApi.Application.Interfaces;
 using FinancialApi.Application.Models;
-using FinancialApi.Domain;
 using FinancialApi.Domain.Aggregates;
 using FinancialApi.Domain.Entities;
 using Wolverine.Persistence;

wolverine/a-frame-architecture/FinancialApi.Application/Interfaces/IAccountQuery.cs

@@ -1,4 +1,3 @@
-using FinancialApi.Domain;
 using FinancialApi.Domain.Entities;
 
 namespace FinancialApi.Application.Interfaces;

wolverine/a-frame-architecture/FinancialApi.Application/Interfaces/IReversalQuery.cs

@@ -1,10 +1,8 @@
-using FinancialApi.Application.Commands;
-using FinancialApi.Application.Handlers;
-using FinancialApi.Application.Models;
+using FinancialApi.Domain.Entities;
 
 namespace FinancialApi.Application.Interfaces;
 
 public interface IReversalQuery
 {
-    Task<JournalReversalContext?> GetReversalDataAsync(Guid journalEntryId);
+    Task<(JournalEntry?, List<Account>?)> GetReversalDataAsync(Guid journalEntryId);
 }

wolverine/a-frame-architecture/FinancialApi.Application/Models/FeeContext.cs

@@ -1,4 +1,3 @@
-using FinancialApi.Domain;
 using FinancialApi.Domain.Entities;
 
 namespace FinancialApi.Application.Models;

wolverine/a-frame-architecture/FinancialApi.Application/Models/JournalReversalContext.cs

@@ -1,4 +1,3 @@
-using FinancialApi.Domain;
 using FinancialApi.Domain.Entities;
 
 namespace FinancialApi.Application.Models;

wolverine/a-frame-architecture/FinancialApi.Application/Models/TransferContext.cs

@@ -1,4 +1,3 @@
-using FinancialApi.Domain;
 using FinancialApi.Domain.Entities;
 
 namespace FinancialApi.Application.Models;