- Checkpoint: Refactor Commands

Author: NinjaRocks

src/SourceFlow.ConsoleApp/Aggregates/AccountAggregate.cs

@@ -1,7 +1,6 @@
 using SourceFlow.Aggregate;
 using SourceFlow.ConsoleApp.Commands;
 using SourceFlow.ConsoleApp.Events;
-using SourceFlow.Messaging;
 
 namespace SourceFlow.ConsoleApp.Aggregates
 {
@@ -11,53 +10,50 @@ public class AccountAggregate : BaseAggregate<BankAccount>,
     {
         public void CreateAccount(int accountId, string holder, decimal amount)
         {
-            Send(new CreateAccount
+            Send(new CreateAccount(new AccountPayload
             {
-                Entity = new Source(accountId, typeof(BankAccount)),
-                Payload = new AccountPayload
-                {
-                    AccountName = holder,
-                    InitialAmount = amount
-                }
-            });
+                Id = accountId,
+                AccountName = holder,
+                InitialAmount = amount
+            }));
         }
 
         public void Deposit(int accountId, decimal amount)
         {
-            Send(Command.For<BankAccount>(accountId)
-                              .Create<DepositMoney, TransactPayload>(new TransactPayload
-                              {
-                                  Amount = amount,
-                                  Type = TransactionType.Deposit
-                              }));
+            Send(new DepositMoney(new TransactPayload
+            {
+                Id = accountId,
+                Amount = amount,
+                Type = TransactionType.Deposit
+            }));
         }
 
         public void Withdraw(int accountId, decimal amount)
         {
-            Send(Command.For<BankAccount>(accountId)
-                              .Create<WithdrawMoney, TransactPayload>(new TransactPayload
-                              {
-                                  Amount = amount,
-                                  Type = TransactionType.Withdrawal
-                              }));
+            Send(new WithdrawMoney(new TransactPayload
+            {
+                Id = accountId,
+                Amount = amount,
+                Type = TransactionType.Withdrawal
+            }));
         }
 
         public void Close(int accountId, string reason)
         {
-            Send(Command.For<BankAccount>(accountId)
-                              .Create<CloseAccount, ClosurePayload>(new ClosurePayload
-                              {
-                                  ClosureReason = reason
-                              }));
+            Send(new CloseAccount(new ClosurePayload
+            {
+                Id = accountId,
+                ClosureReason = reason
+            }));
         }
 
         public Task Handle(AccountCreated @event)
         {
-            return Send(Command.For<BankAccount>(@event.Payload.Id)
-                                    .Create<ActivateAccount, ActivationPayload>(new ActivationPayload
-                                    {
-                                        ActiveOn = DateTime.UtcNow,
-                                    }));
+            return Send(new ActivateAccount(new ActivationPayload
+            {
+                Id = @event.Payload.Id,
+                ActiveOn = DateTime.UtcNow,
+            }));
         }
     }
 }

src/SourceFlow.ConsoleApp/Commands/AccountPayload.cs

@@ -5,24 +5,28 @@ namespace SourceFlow.ConsoleApp.Commands
 {
     public class ActivationPayload : IPayload
     {
+        public int Id { get; set; }
         public DateTime ActiveOn { get; set; }
     }
 
     public class AccountPayload : IPayload
     {
+        public int Id { get; set; }
         public decimal InitialAmount { get; set; }
         public string AccountName { get; set; }
     }
 
     public class TransactPayload : IPayload
     {
+        public int Id { get; set; }
         public TransactionType Type { get; set; }
         public decimal Amount { get; set; }
         public decimal CurrentBalance { get; set; }
     }
 
     public class ClosurePayload : IPayload
     {
+        public int Id { get; set; }
         public bool IsClosed { get; set; }
         public string ClosureReason { get; set; } = string.Empty;
     }

src/SourceFlow.ConsoleApp/Commands/ActivateAccount.cs

@@ -4,5 +4,8 @@ namespace SourceFlow.ConsoleApp.Commands
 {
     public class ActivateAccount : BaseCommand<ActivationPayload>
     {
+        public ActivateAccount(ActivationPayload payload) : base(payload)
+        {
+        }
     }
 }

src/SourceFlow.ConsoleApp/Commands/CloseAccount.cs

@@ -4,5 +4,8 @@ namespace SourceFlow.ConsoleApp.Commands
 {
     public class CloseAccount : BaseCommand<ClosurePayload>
     {
+        public CloseAccount(ClosurePayload payload) : base(payload)
+        {
+        }
     }
 }

src/SourceFlow.ConsoleApp/Commands/CreateAccount.cs

@@ -4,5 +4,8 @@ namespace SourceFlow.ConsoleApp.Commands
 {
     public class CreateAccount : BaseCommand<AccountPayload>
     {
+        public CreateAccount(AccountPayload payload) : base(payload)
+        {
+        }
     }
 }

src/SourceFlow.ConsoleApp/Commands/DepositMoney.cs

@@ -4,5 +4,8 @@ namespace SourceFlow.ConsoleApp.Commands
 {
     public class DepositMoney : BaseCommand<TransactPayload>
     {
+        public DepositMoney(TransactPayload payload) : base(payload)
+        {
+        }
     }
 }

src/SourceFlow.ConsoleApp/Commands/WithdrawMoney.cs

@@ -4,5 +4,8 @@ namespace SourceFlow.ConsoleApp.Commands
 {
     public class WithdrawMoney : BaseCommand<TransactPayload>
     {
+        public WithdrawMoney(TransactPayload payload) : base(payload)
+        {
+        }
     }
 }

src/SourceFlow.ConsoleApp/Impl/InMemoryEventStore.cs

@@ -9,10 +9,10 @@ public class InMemoryEventStore : IEventStore
 
         public Task Append(ICommand @event)
         {
-            if (!_store.ContainsKey(@event.Entity.Id))
-                _store[@event.Entity.Id] = new List<ICommand>();
+            if (!_store.ContainsKey(@event.Payload.Id))
+                _store[@event.Payload.Id] = new List<ICommand>();
 
-            _store[@event.Entity.Id].Add(@event);
+            _store[@event.Payload.Id].Add(@event);
 
             return Task.CompletedTask;
         }

src/SourceFlow.ConsoleApp/Sagas/AccountSaga.cs

@@ -17,7 +17,7 @@ public class AccountSaga : BaseSaga<BankAccount>,
         public async Task Handle(CreateAccount command)
         {
             logger.LogInformation("Action=Account_Created, Account={AccountId}, Holder={AccountName}, Initial_Balance={InitialBalance}",
-                command.Entity.Id, command.Payload.AccountName, command.Payload.InitialAmount);
+                command.Payload.Id, command.Payload.AccountName, command.Payload.InitialAmount);
 
             if (string.IsNullOrEmpty(command.Payload.AccountName))
                 throw new ArgumentException("Account create requires account holder name.", nameof(command.Payload.AccountName));
@@ -27,7 +27,7 @@ public async Task Handle(CreateAccount command)
 
             var account = new BankAccount
             {
-                Id = command.Entity.Id,
+                Id = command.Payload.Id,
                 AccountName = command.Payload.AccountName,
                 Balance = command.Payload.InitialAmount
             };
@@ -39,9 +39,9 @@ public async Task Handle(CreateAccount command)
 
         public async Task Handle(ActivateAccount command)
         {
-            logger.LogInformation("Action=Account_Activate, ActivatedOn={ActiveOn}, Account={AccountId}", command.Payload.ActiveOn, command.Entity.Id);
+            logger.LogInformation("Action=Account_Activate, ActivatedOn={ActiveOn}, Account={AccountId}", command.Payload.ActiveOn, command.Payload.Id);
 
-            var account = await repository.Get<BankAccount>(command.Entity.Id);
+            var account = await repository.Get<BankAccount>(command.Payload.Id);
 
             if (account.IsClosed)
                 throw new InvalidOperationException("Cannot deposit to a closed account");
@@ -58,9 +58,9 @@ public async Task Handle(ActivateAccount command)
 
         public async Task Handle(DepositMoney command)
         {
-            logger.LogInformation("Action=Money_Deposited, Amount={Amount}, Account={AccountId}", command.Payload.Amount, command.Entity.Id);
+            logger.LogInformation("Action=Money_Deposited, Amount={Amount}, Account={AccountId}", command.Payload.Amount, command.Payload.Id);
 
-            var account = await repository.Get<BankAccount>(command.Entity.Id);
+            var account = await repository.Get<BankAccount>(command.Payload.Id);
 
             if (account.IsClosed)
                 throw new InvalidOperationException("Cannot deposit to a closed account");
@@ -78,9 +78,9 @@ public async Task Handle(DepositMoney command)
 
         public async Task Handle(WithdrawMoney command)
         {
-            logger.LogInformation("Action=Money_Withdrawn, Amount={Amount}, Account={AccountId}", command.Payload.Amount, command.Entity.Id);
+            logger.LogInformation("Action=Money_Withdrawn, Amount={Amount}, Account={AccountId}", command.Payload.Amount, command.Payload.Id);
 
-            var account = await repository.Get<BankAccount>(command.Entity.Id);
+            var account = await repository.Get<BankAccount>(command.Payload.Id);
 
             if (account.IsClosed)
                 throw new InvalidOperationException("Cannot deposit to a closed account");
@@ -98,12 +98,12 @@ public async Task Handle(WithdrawMoney command)
 
         public async Task Handle(CloseAccount command)
         {
-            logger.LogInformation("Action=Account_Closed, Account={AccountId}, Reason={Reason}", command.Entity.Id, command.Payload.ClosureReason);
+            logger.LogInformation("Action=Account_Closed, Account={AccountId}, Reason={Reason}", command.Payload.Id, command.Payload.ClosureReason);
 
             if (string.IsNullOrWhiteSpace(command.Payload.ClosureReason))
                 throw new ArgumentException("Reason for closing cannot be empty", nameof(command.Payload.ClosureReason));
 
-            var account = await repository.Get<BankAccount>(command.Entity.Id);
+            var account = await repository.Get<BankAccount>(command.Payload.Id);
 
             if (account.IsClosed)
                 throw new InvalidOperationException("Cannot close account on a closed account");

src/SourceFlow.ConsoleApp/Services/AccountService.cs

@@ -72,7 +72,7 @@ public async Task ReplayHistoryAsync(int accountId)
 
             var account = await CreateAggregate<AccountAggregate>();
 
-            await account.ReplayEvents(accountId);
+            await account.Replay(accountId);
         }
     }
 }