Adjust location of classes further.

wolverine/a-frame-architecture/FinancialApi.Application.UnitTests/ApplyFeeHandlerTests.cs

@@ -1,7 +1,9 @@
 using System.Security.Cryptography;
 using FinancialApi.Application.Commands;
 using FinancialApi.Application.Handlers;
+using FinancialApi.Application.Models;
 using FinancialApi.Domain;
+using FinancialApi.Domain.Entities;
 using FluentAssertions;
 using FluentAssertions.Execution;
 
@@ -16,7 +18,7 @@ public class ApplyFeeHandlerTests
         var command = new ApplyFeeCommand(1, 100);
         var account = new Account(1, 100, "Debit");
         var revenueAccount = new Account(99999, 0, "Credit");
-        var pair = new FeePair(account, revenueAccount, TimeProvider.System.GetUtcNow());
+        var pair = new FeeContext(account, revenueAccount, TimeProvider.System.GetUtcNow());
 
         // Act
         var intents = ApplyFeeHandler.Handle(command, pair);

wolverine/a-frame-architecture/FinancialApi.Application/FeePair.cs

@@ -1,5 +0,0 @@
-using FinancialApi.Domain;
-
-namespace FinancialApi.Application;
-
-public record FeePair(Account Source, Account Destination, DateTimeOffset TimeStamp);

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

@@ -1,14 +1,17 @@
 using FinancialApi.Application.Commands;
 using FinancialApi.Application.Events;
-using FinancialApi.Application.Queries;
+using FinancialApi.Application.Interfaces;
+using FinancialApi.Application.Models;
 using FinancialApi.Domain;
+using FinancialApi.Domain.Aggregates;
+using FinancialApi.Domain.Entities;
 using Wolverine.Persistence;
 
 namespace FinancialApi.Application.Handlers;
 
 public static class ApplyFeeHandler
 {
-    public static async Task<FeePair> LoadAsync(
+    public static async Task<FeeContext> LoadAsync(
         ApplyFeeCommand cmd,
         IAccountQuery query, TimeProvider timeProvider)
     {
@@ -19,7 +22,7 @@ public static class ApplyFeeHandler
             throw new InvalidOperationException($"Cannot process transfer. Account(s) not found.");
         }
 
-        return new FeePair(source, dest, timeProvider.GetUtcNow());
+        return new FeeContext(source, dest, timeProvider.GetUtcNow());
     }
 
     public static (
@@ -30,11 +33,11 @@ public static class ApplyFeeHandler
         )
         Handle(
             ApplyFeeCommand cmd,
-            FeePair pair
+            FeeContext context
         )
     {
-        var updatedSource = pair.Source.ApplyPosting(cmd.Amount, EntryType.Debit);
+        var updatedSource = context.Source.ApplyPosting(cmd.Amount, EntryType.Debit);
-        var updatedRevenue = pair.Destination.ApplyPosting(cmd.Amount, EntryType.Credit);
+        var updatedRevenue = context.Destination.ApplyPosting(cmd.Amount, EntryType.Credit);
         var serviceFee = 0.5m;
         
         var lines = new List<JournalLine>
@@ -46,7 +49,7 @@ public static class ApplyFeeHandler
         
         var journalEntry = BalancedJournal.Create(Guid.NewGuid(),
             $"Service Fee Applied: {cmd.Amount} to Account {cmd.AccountId}",
-            pair.TimeStamp, lines);
+            context.TimeStamp, lines);
 
         var @event = new FeeAppliedEvent(cmd.AccountId, cmd.Amount);
 

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

@@ -1,19 +1,17 @@
 using FinancialApi.Application.Commands;
 using FinancialApi.Application.Events;
-using FinancialApi.Application.Queries;
+using FinancialApi.Application.Interfaces;
+using FinancialApi.Application.Models;
 using FinancialApi.Domain;
+using FinancialApi.Domain.Aggregates;
+using FinancialApi.Domain.Entities;
 using Wolverine.Persistence;
 
 namespace FinancialApi.Application.Handlers;
 
-public record ReversalData(
-    JournalEntry OriginalJournalEntry,
-    IReadOnlyList<Account> AffectedAccounts,
-    DateTimeOffset TimeStamp);
-
 public static class ReverseJournalHandler
 {
-    public static async Task<ReversalData?> LoadAsync(ReverseJournalCommand cmd, IReversalQuery query,
+    public static async Task<JournalReversalContext?> LoadAsync(ReverseJournalCommand cmd, IReversalQuery query,
         TimeProvider timeProvider)
     {
         var data = await query.GetReversalDataAsync(cmd.OriginalJournalId);
@@ -24,11 +22,11 @@ public static class ReverseJournalHandler
         IStorageAction<JournalEntry> JournalWrite,
         UnitOfWork<Account> AccountWrites,
         JournalReversedEvent Event)
-        Handle(ReverseJournalCommand cmd, ReversalData data)
+        Handle(ReverseJournalCommand cmd, JournalReversalContext context)
     {
         var reversalJournal =
-            BalancedJournal.CreateReversal(data.OriginalJournalEntry, $"Reversal: {cmd.Reason}", data.TimeStamp);
+            BalancedJournal.CreateReversal(context.OriginalJournalEntry, $"Reversal: {cmd.Reason}", context.TimeStamp);
-        var accountState = data.AffectedAccounts.ToDictionary(a => a.Id);
+        var accountState = context.AffectedAccounts.ToDictionary(a => a.Id);
 
         reversalJournal.Entry.Lines.ForEach(l =>
         {

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

@@ -1,14 +1,17 @@
 using FinancialApi.Application.Commands;
 using FinancialApi.Application.Events;
-using FinancialApi.Application.Queries;
+using FinancialApi.Application.Interfaces;
+using FinancialApi.Application.Models;
 using FinancialApi.Domain;
+using FinancialApi.Domain.Aggregates;
+using FinancialApi.Domain.Entities;
 using Wolverine.Persistence;
 
 namespace FinancialApi.Application.Handlers;
 
 public static class TransferFundsHandler
 {
-    public static async Task<TransferPair?> LoadAsync(TransferFundsCommand cmd, IAccountQuery query,
+    public static async Task<TransferContext?> LoadAsync(TransferFundsCommand cmd, IAccountQuery query,
         TimeProvider timeProvider)
     {
         var source = await query.FindByIdAsync(cmd.SourceAccountId);
@@ -16,7 +19,7 @@ public static class TransferFundsHandler
 
         if (source == null || dest == null) return null;
 
-        return new TransferPair(source, dest, timeProvider.GetUtcNow());
+        return new TransferContext(source, dest, timeProvider.GetUtcNow());
     }
 
     public static (
@@ -24,21 +27,21 @@ public static class TransferFundsHandler
         IStorageAction<Account> DestWrite,
         IStorageAction<JournalEntry> JournalWrite,
         FundsTransferredEvent Event
-        ) Handle(TransferFundsCommand cmd, TransferPair pair)
+        ) Handle(TransferFundsCommand cmd, TransferContext context)
     {
-        var updatedSource = pair.Source.Debit(cmd.Amount);
+        var updatedSource = context.Source.Debit(cmd.Amount);
-        var updatedDest = pair.Destination.Credit(cmd.Amount);
+        var updatedDest = context.Destination.Credit(cmd.Amount);
 
         var lines = new List<JournalLine>
         {
-            new(pair.Source.Id, cmd.Amount, EntryType.Debit),
+            new(context.Source.Id, cmd.Amount, EntryType.Debit),
-            new(pair.Destination.Id, cmd.Amount, EntryType.Credit)
+            new(context.Destination.Id, cmd.Amount, EntryType.Credit)
         };
 
         var journalEntry =
             BalancedJournal.Create(Guid.NewGuid(),
                 $"Transfer: {cmd.Amount} from {cmd.SourceAccountId} to {cmd.DestinationAccountId}",
-                pair.TimeStamp, lines);
+                context.TimeStamp, lines);
 
         var @event = new FundsTransferredEvent(cmd.SourceAccountId, cmd.DestinationAccountId, cmd.Amount);
 

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

@@ -1,6 +1,7 @@
 using FinancialApi.Domain;
+using FinancialApi.Domain.Entities;
 
-namespace FinancialApi.Application.Queries;
+namespace FinancialApi.Application.Interfaces;
 
 public interface IAccountQuery
 {

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

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

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

@@ -0,0 +1,6 @@
+using FinancialApi.Domain;
+using FinancialApi.Domain.Entities;
+
+namespace FinancialApi.Application.Models;
+
+public record FeeContext(Account Source, Account Destination, DateTimeOffset TimeStamp);

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

@@ -0,0 +1,9 @@
+using FinancialApi.Domain;
+using FinancialApi.Domain.Entities;
+
+namespace FinancialApi.Application.Models;
+
+public record JournalReversalContext(
+    JournalEntry OriginalJournalEntry,
+    IReadOnlyList<Account> AffectedAccounts,
+    DateTimeOffset TimeStamp);

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

@@ -0,0 +1,6 @@
+using FinancialApi.Domain;
+using FinancialApi.Domain.Entities;
+
+namespace FinancialApi.Application.Models;
+
+public record TransferContext(Account Source, Account Destination, DateTimeOffset TimeStamp);

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

@@ -1,8 +0,0 @@
-using FinancialApi.Application.Handlers;
-
-namespace FinancialApi.Application.Queries;
-
-public interface IReversalQuery
-{
-    Task<ReversalData?> GetReversalDataAsync(Guid journalEntryId);
-}

wolverine/a-frame-architecture/FinancialApi.Application/TransferPair.cs

@@ -1,5 +0,0 @@
-using FinancialApi.Domain;
-
-namespace FinancialApi.Application;
-
-public record TransferPair(Account Source, Account Destination, DateTimeOffset TimeStamp);

wolverine/a-frame-architecture/FinancialApi.Domain/Aggregates/BalancedJournal.cs

@@ -1,4 +1,6 @@
-namespace FinancialApi.Domain;
+using FinancialApi.Domain.Entities;
+
+namespace FinancialApi.Domain.Aggregates;
 
 public record BalancedJournal
 {

wolverine/a-frame-architecture/FinancialApi.Domain/Entities/Account.cs

@@ -1,4 +1,4 @@
-namespace FinancialApi.Domain;
+namespace FinancialApi.Domain.Entities;
 
 public record Account(int Id, decimal Balance, string AccountType)
 {

wolverine/a-frame-architecture/FinancialApi.Domain/Entities/EntryType.cs

@@ -1,4 +1,4 @@
-namespace FinancialApi.Domain;
+namespace FinancialApi.Domain.Entities;
 
 public enum EntryType
 {

wolverine/a-frame-architecture/FinancialApi.Domain/Entities/JournalEntry.cs

@@ -1,4 +1,4 @@
-namespace FinancialApi.Domain;
+namespace FinancialApi.Domain.Entities;
 
 public record JournalEntry
 {

wolverine/a-frame-architecture/FinancialApi.Domain/Entities/JournalLine.cs

@@ -1,3 +1,3 @@
-namespace FinancialApi.Domain;
+namespace FinancialApi.Domain.Entities;
 
 public record JournalLine(int AccountId, decimal Amount, EntryType Type);

wolverine/a-frame-architecture/FinancialApi.Infrastructure/AccountDbContext.cs

@@ -1,4 +1,5 @@
 using FinancialApi.Domain;
+using FinancialApi.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace FinancialApi.Infrastructure;

wolverine/a-frame-architecture/FinancialApi.Infrastructure/AccountQuery.cs

@@ -1,5 +1,6 @@
-using FinancialApi.Application.Queries;
+using FinancialApi.Application.Interfaces;
 using FinancialApi.Domain;
+using FinancialApi.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace FinancialApi.Infrastructure;

wolverine/a-frame-architecture/FinancialApi.Infrastructure/ReversalQuery.cs

@@ -1,12 +1,14 @@
+using FinancialApi.Application.Commands;
 using FinancialApi.Application.Handlers;
-using FinancialApi.Application.Queries;
+using FinancialApi.Application.Interfaces;
+using FinancialApi.Application.Models;
 using Microsoft.EntityFrameworkCore;
 
 namespace FinancialApi.Infrastructure;
 
 public class ReversalQuery(AccountDbContext db, TimeProvider timeProvider) : IReversalQuery
 {
-    public async Task<ReversalData?> GetReversalDataAsync(Guid journalEntryId)
+    public async Task<JournalReversalContext?> GetReversalDataAsync(Guid journalEntryId)
     {
         var entry = await db.JournalEntries
             .Include(x => x.Lines)
@@ -25,6 +27,6 @@ public class ReversalQuery(AccountDbContext db, TimeProvider timeProvider) : IRe
             .Where(a => accountIds.Contains(a.Id))
             .ToListAsync();
 
-        return new ReversalData(entry, accounts, timeProvider.GetUtcNow());
+        return new JournalReversalContext(entry, accounts, timeProvider.GetUtcNow());
     }
 }

wolverine/a-frame-architecture/FinancialApi/Program.cs

@@ -2,7 +2,7 @@ using FinancialApi;
 using FinancialApi.Application.Commands;
 using FinancialApi.Application.Events;
 using FinancialApi.Application.Handlers;
-using FinancialApi.Application.Queries;
+using FinancialApi.Application.Interfaces;
 using FinancialApi.Infrastructure;
 using FinancialApi.ServiceDefaults;
 using JasperFx.Resources;