Fix IO poison in handlers (UtcNow instead of a passed in date time).
This commit is contained in:
@@ -8,13 +8,13 @@ public record ApplyFeeCommand(int AccountId, decimal Amount);
|
|||||||
|
|
||||||
public record FeeAppliedEvent(int AccountId, decimal Amount);
|
public record FeeAppliedEvent(int AccountId, decimal Amount);
|
||||||
|
|
||||||
public record FeePair(Account Source, Account Destination);
|
public record FeePair(Account Source, Account Destination, DateTimeOffset TimeStamp);
|
||||||
|
|
||||||
public static class ApplyFeeHandler
|
public static class ApplyFeeHandler
|
||||||
{
|
{
|
||||||
public static async Task<FeePair> LoadAsync(
|
public static async Task<FeePair> LoadAsync(
|
||||||
ApplyFeeCommand cmd,
|
ApplyFeeCommand cmd,
|
||||||
IAccountQuery query)
|
IAccountQuery query, TimeProvider timeProvider)
|
||||||
{
|
{
|
||||||
var source = await query.FindByIdAsync(cmd.AccountId);
|
var source = await query.FindByIdAsync(cmd.AccountId);
|
||||||
var dest = await query.FindByIdAsync(99999);
|
var dest = await query.FindByIdAsync(99999);
|
||||||
@@ -22,7 +22,8 @@ public static class ApplyFeeHandler
|
|||||||
{
|
{
|
||||||
throw new InvalidOperationException($"Cannot process transfer. Account(s) not found.");
|
throw new InvalidOperationException($"Cannot process transfer. Account(s) not found.");
|
||||||
}
|
}
|
||||||
return new FeePair(source, dest);
|
|
||||||
|
return new FeePair(source, dest, timeProvider.GetUtcNow());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static (
|
public static (
|
||||||
@@ -45,7 +46,7 @@ public static class ApplyFeeHandler
|
|||||||
};
|
};
|
||||||
var journalEntry = BalancedJournal.Create(Guid.NewGuid(),
|
var journalEntry = BalancedJournal.Create(Guid.NewGuid(),
|
||||||
$"Service Fee Applied: {cmd.Amount} to Account {cmd.AccountId}",
|
$"Service Fee Applied: {cmd.Amount} to Account {cmd.AccountId}",
|
||||||
DateTimeOffset.UtcNow, lines);
|
pair.TimeStamp, lines);
|
||||||
|
|
||||||
var @event = new FeeAppliedEvent(cmd.AccountId, cmd.Amount);
|
var @event = new FeeAppliedEvent(cmd.AccountId, cmd.Amount);
|
||||||
|
|
||||||
|
|||||||
@@ -10,10 +10,7 @@ public static class FinancialEventHandler
|
|||||||
ILogger logger)
|
ILogger logger)
|
||||||
{
|
{
|
||||||
var message = $"FeeApplied: ${@event.Amount} moved from Account {@event.AccountId} to Account 99999.";
|
var message = $"FeeApplied: ${@event.Amount} moved from Account {@event.AccountId} to Account 99999.";
|
||||||
|
|
||||||
logger.LogInformation("BACKGROUND EVENT FIRED: {Message}", message);
|
logger.LogInformation("BACKGROUND EVENT FIRED: {Message}", message);
|
||||||
|
|
||||||
// Save to our UI bucket
|
|
||||||
store.Add(message);
|
store.Add(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22,11 +19,9 @@ public static class FinancialEventHandler
|
|||||||
IEventTracker store,
|
IEventTracker store,
|
||||||
ILogger logger)
|
ILogger logger)
|
||||||
{
|
{
|
||||||
var message = $"FundsTransferred: ${@event.Amount} moved from Account {@event.SourceAccountId} to Account {@event.DestinationAccountId}.";
|
var message =
|
||||||
|
$"FundsTransferred: ${@event.Amount} moved from Account {@event.SourceAccountId} to Account {@event.DestinationAccountId}.";
|
||||||
logger.LogInformation("BACKGROUND EVENT FIRED: {Message}", message);
|
logger.LogInformation("BACKGROUND EVENT FIRED: {Message}", message);
|
||||||
|
|
||||||
// Save to our UI bucket
|
|
||||||
store.Add(message);
|
store.Add(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35,7 +30,8 @@ public static class FinancialEventHandler
|
|||||||
IEventTracker store,
|
IEventTracker store,
|
||||||
ILogger logger)
|
ILogger logger)
|
||||||
{
|
{
|
||||||
var message = $"JournalReversed: Original Entry {@event.OriginalJournalId} was reversed by Entry {@event.ReversalJournalId}.";
|
var message =
|
||||||
|
$"JournalReversed: Original Entry {@event.OriginalJournalId} was reversed by Entry {@event.ReversalJournalId}.";
|
||||||
logger.LogInformation("BACKGROUND EVENT FIRED: {Message}", message);
|
logger.LogInformation("BACKGROUND EVENT FIRED: {Message}", message);
|
||||||
store.Add(message);
|
store.Add(message);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,10 @@ public record ReverseJournalCommand(Guid OriginalJournalId, string Reason);
|
|||||||
|
|
||||||
public record JournalReversedEvent(Guid OriginalJournalId, Guid ReversalJournalId);
|
public record JournalReversedEvent(Guid OriginalJournalId, Guid ReversalJournalId);
|
||||||
|
|
||||||
public record ReversalData(JournalEntry OriginalJournalEntry, IReadOnlyList<Account> AffectedAccounts);
|
public record ReversalData(
|
||||||
|
JournalEntry OriginalJournalEntry,
|
||||||
|
IReadOnlyList<Account> AffectedAccounts,
|
||||||
|
DateTimeOffset TimeStamp);
|
||||||
|
|
||||||
public interface IReversalQuery
|
public interface IReversalQuery
|
||||||
{
|
{
|
||||||
@@ -16,7 +19,8 @@ public interface IReversalQuery
|
|||||||
|
|
||||||
public static class ReverseJournalHandler
|
public static class ReverseJournalHandler
|
||||||
{
|
{
|
||||||
public static async Task<ReversalData?> LoadAsync(ReverseJournalCommand cmd, IReversalQuery query)
|
public static async Task<ReversalData?> LoadAsync(ReverseJournalCommand cmd, IReversalQuery query,
|
||||||
|
TimeProvider timeProvider)
|
||||||
{
|
{
|
||||||
var data = await query.GetReversalDataAsync(cmd.OriginalJournalId);
|
var data = await query.GetReversalDataAsync(cmd.OriginalJournalId);
|
||||||
return data ?? throw new InvalidOperationException($"Journal Entry {cmd.OriginalJournalId} does not exist");
|
return data ?? throw new InvalidOperationException($"Journal Entry {cmd.OriginalJournalId} does not exist");
|
||||||
@@ -28,7 +32,7 @@ public static class ReverseJournalHandler
|
|||||||
JournalReversedEvent Event) Handle(ReverseJournalCommand cmd, ReversalData data)
|
JournalReversedEvent Event) Handle(ReverseJournalCommand cmd, ReversalData data)
|
||||||
{
|
{
|
||||||
var reversalJournal =
|
var reversalJournal =
|
||||||
BalancedJournal.CreateReversal(data.OriginalJournalEntry, $"Reversal: {cmd.Reason}", DateTimeOffset.UtcNow);
|
BalancedJournal.CreateReversal(data.OriginalJournalEntry, $"Reversal: {cmd.Reason}", data.TimeStamp);
|
||||||
var accountState = data.AffectedAccounts.ToDictionary(a => a.Id);
|
var accountState = data.AffectedAccounts.ToDictionary(a => a.Id);
|
||||||
|
|
||||||
reversalJournal.Entry.Lines.ForEach(l =>
|
reversalJournal.Entry.Lines.ForEach(l =>
|
||||||
@@ -41,6 +45,7 @@ public static class ReverseJournalHandler
|
|||||||
{
|
{
|
||||||
accountUow.Update(account);
|
accountUow.Update(account);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
Storage.Insert(reversalJournal.Entry),
|
Storage.Insert(reversalJournal.Entry),
|
||||||
accountUow,
|
accountUow,
|
||||||
|
|||||||
@@ -13,18 +13,19 @@ public record TransferFundsCommand(int SourceAccountId, int DestinationAccountId
|
|||||||
|
|
||||||
public record FundsTransferredEvent(int SourceAccountId, int DestinationAccountId, decimal Amount);
|
public record FundsTransferredEvent(int SourceAccountId, int DestinationAccountId, decimal Amount);
|
||||||
|
|
||||||
public record TransferPair(Account Source, Account Destination);
|
public record TransferPair(Account Source, Account Destination, DateTimeOffset TimeStamp);
|
||||||
|
|
||||||
public static class TransferFundsHandler
|
public static class TransferFundsHandler
|
||||||
{
|
{
|
||||||
public static async Task<TransferPair?> LoadAsync(TransferFundsCommand cmd, IAccountQuery query)
|
public static async Task<TransferPair?> LoadAsync(TransferFundsCommand cmd, IAccountQuery query,
|
||||||
|
TimeProvider timeProvider)
|
||||||
{
|
{
|
||||||
var source = await query.FindByIdAsync(cmd.SourceAccountId);
|
var source = await query.FindByIdAsync(cmd.SourceAccountId);
|
||||||
var dest = await query.FindByIdAsync(cmd.DestinationAccountId);
|
var dest = await query.FindByIdAsync(cmd.DestinationAccountId);
|
||||||
|
|
||||||
if (source == null || dest == null) return null;
|
if (source == null || dest == null) return null;
|
||||||
|
|
||||||
return new TransferPair(source, dest);
|
return new TransferPair(source, dest, timeProvider.GetUtcNow());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static (
|
public static (
|
||||||
@@ -46,7 +47,7 @@ public static class TransferFundsHandler
|
|||||||
var journalEntry =
|
var journalEntry =
|
||||||
BalancedJournal.Create(Guid.NewGuid(),
|
BalancedJournal.Create(Guid.NewGuid(),
|
||||||
$"Transfer: {cmd.Amount} from {cmd.SourceAccountId} to {cmd.DestinationAccountId}",
|
$"Transfer: {cmd.Amount} from {cmd.SourceAccountId} to {cmd.DestinationAccountId}",
|
||||||
DateTimeOffset.UtcNow, lines);
|
pair.TimeStamp, lines);
|
||||||
|
|
||||||
var @event = new FundsTransferredEvent(cmd.SourceAccountId, cmd.DestinationAccountId, cmd.Amount);
|
var @event = new FundsTransferredEvent(cmd.SourceAccountId, cmd.DestinationAccountId, cmd.Amount);
|
||||||
|
|
||||||
|
|||||||
@@ -3,15 +3,11 @@ using Microsoft.EntityFrameworkCore;
|
|||||||
|
|
||||||
namespace FinancialApi.Infrastructure;
|
namespace FinancialApi.Infrastructure;
|
||||||
|
|
||||||
public class ReversalQuery : IReversalQuery
|
public class ReversalQuery(AccountDbContext db, TimeProvider timeProvider) : IReversalQuery
|
||||||
{
|
{
|
||||||
private readonly AccountDbContext _db;
|
|
||||||
|
|
||||||
public ReversalQuery(AccountDbContext db) => _db = db;
|
|
||||||
|
|
||||||
public async Task<ReversalData?> GetReversalDataAsync(Guid journalEntryId)
|
public async Task<ReversalData?> GetReversalDataAsync(Guid journalEntryId)
|
||||||
{
|
{
|
||||||
var entry = await _db.JournalEntries
|
var entry = await db.JournalEntries
|
||||||
.Include(x => x.Lines)
|
.Include(x => x.Lines)
|
||||||
.AsNoTracking()
|
.AsNoTracking()
|
||||||
.FirstOrDefaultAsync(x => x.Id == journalEntryId);
|
.FirstOrDefaultAsync(x => x.Id == journalEntryId);
|
||||||
@@ -23,11 +19,11 @@ public class ReversalQuery : IReversalQuery
|
|||||||
|
|
||||||
var accountIds = entry.Lines.Select(l => l.AccountId).Distinct().ToList();
|
var accountIds = entry.Lines.Select(l => l.AccountId).Distinct().ToList();
|
||||||
|
|
||||||
var accounts = await _db.Accounts
|
var accounts = await db.Accounts
|
||||||
.AsNoTracking()
|
.AsNoTracking()
|
||||||
.Where(a => accountIds.Contains(a.Id))
|
.Where(a => accountIds.Contains(a.Id))
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
return new ReversalData(entry, accounts);
|
return new ReversalData(entry, accounts, timeProvider.GetUtcNow());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user