Skip to content

merchant deposit list result changes #920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 2 commits into from
Sep 11, 2025
Merged

merchant deposit list result changes #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c26c81
merchant deposit list result changes
StuartFerguson Sep 10, 2025
55f643b
Merge branch 'master' into task/#873_merchant_deposit_list_results
StuartFerguson Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 73 additions & 29 deletions TransactionProcessor.Aggregates.Tests/MerchantDepositListAggregateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Shared.EventStore.Aggregate;
using Shared.ValueObjects;
using Shouldly;
using SimpleResults;
using TransactionProcessor.Models.Merchant;
using TransactionProcessor.Testing;

Expand All @@ -17,7 +18,8 @@ public void MerchantDepositListAggregate_Create_IsCreated() {
TestData.SettlementScheduleModel);

MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);
Result result = merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);
result.IsSuccess.ShouldBeTrue();

merchantDepositListAggregate.AggregateId.ShouldBe(TestData.MerchantId);
merchantDepositListAggregate.EstateId.ShouldBe(TestData.EstateId);
Expand All @@ -34,7 +36,8 @@ public void MerchantDepositListAggregate_Create_AlreadyCreated_IsCreated()
MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);

merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);
Result result = merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);
result.IsSuccess.ShouldBeTrue();

merchantDepositListAggregate.AggregateId.ShouldBe(TestData.MerchantId);
merchantDepositListAggregate.EstateId.ShouldBe(TestData.EstateId);
Expand All @@ -46,7 +49,9 @@ public void MerchantDepositListAggregate_Create_MerchantNotCreated_ErrorThrown()
MerchantAggregate merchantAggregate = MerchantAggregate.Create(TestData.MerchantId);

MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
Should.Throw<InvalidOperationException>(() => { merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated); });
Result result = merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);
result.IsFailed.ShouldBeTrue();
result.Status.ShouldBe(ResultStatus.Invalid);
}

[Fact]
Expand All @@ -58,10 +63,11 @@ public void MerchantDepositListAggregate_MakeDeposit_AutomaticDepositSource_Depo
MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);

merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceAutomatic,
Result result = merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceAutomatic,
TestData.DepositReference,
TestData.DepositDateTime,
TestData.DepositAmount);
result.IsSuccess.ShouldBeTrue();

List<Deposit> depositListModel = merchantDepositListAggregate.GetDeposits();
depositListModel.ShouldHaveSingleItem();
Expand All @@ -80,7 +86,8 @@ public void MerchantDepositListAggregate_MakeDeposit_DepositMade() {
MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);

merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual, TestData.DepositReference, TestData.DepositDateTime, TestData.DepositAmount);
Result result = merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual, TestData.DepositReference, TestData.DepositDateTime, TestData.DepositAmount);
result.IsSuccess.ShouldBeTrue();

List<Deposit> depositListModel = merchantDepositListAggregate.GetDeposits();
depositListModel.ShouldHaveSingleItem();
Expand All @@ -100,12 +107,30 @@ public void MerchantDepositListAggregate_MakeDeposit_DepositSourceNotSet_ErrorTh
MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);

Should.Throw<InvalidOperationException>(() => {
merchantDepositListAggregate.MakeDeposit(MerchantDepositSource.NotSet,
Result result = merchantDepositListAggregate.MakeDeposit(MerchantDepositSource.NotSet,
TestData.DepositReference,
TestData.DepositDateTime,
TestData.DepositAmount);
result.IsFailed.ShouldBeTrue();
result.Status.ShouldBe(ResultStatus.Invalid);
}

[Fact]
public void MerchantDepositListAggregate_MakeDeposit_DepositSourceInvalid_ErrorThrown()
{
MerchantAggregate merchantAggregate = MerchantAggregate.Create(TestData.MerchantId);
merchantAggregate.Create(TestData.EstateId, TestData.MerchantName, TestData.DateMerchantCreated, TestData.AddressModel, TestData.ContactModel,
TestData.SettlementScheduleModel);

MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);

Result result = merchantDepositListAggregate.MakeDeposit((MerchantDepositSource)99,
TestData.DepositReference,
TestData.DepositDateTime,
TestData.DepositAmount);
});
result.IsFailed.ShouldBeTrue();
result.Status.ShouldBe(ResultStatus.Invalid);
}

[Fact]
Expand All @@ -121,24 +146,24 @@ public void MerchantDepositListAggregate_MakeDeposit_DuplicateDeposit_ErrorThrow
List<Deposit> depositListModel = merchantDepositListAggregate.GetDeposits();
depositListModel.ShouldHaveSingleItem();

Should.Throw<InvalidOperationException>(() => {
merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
Result result = merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
TestData.DepositReference,
TestData.DepositDateTime,
TestData.DepositAmount);
});
result.IsFailed.ShouldBeTrue();
result.Status.ShouldBe(ResultStatus.Invalid);
}

[Fact]
public void MerchantDepositListAggregate_MakeDeposit_MerchantDepositListNotCreated_ErrorThrown() {
MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);

Should.Throw<InvalidOperationException>(() => {
merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
Result result = merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
TestData.DepositReference,
TestData.DepositDateTime,
TestData.DepositAmount);
});
result.IsFailed.ShouldBeTrue();
result.Status.ShouldBe(ResultStatus.Invalid);
}

[Fact]
Expand All @@ -150,11 +175,13 @@ public void MerchantDepositListAggregate_MakeDeposit_TwoDeposits_BothDepositsMad
MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);

merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual, TestData.DepositReference, TestData.DepositDateTime, TestData.DepositAmount);
merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
Result result = merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual, TestData.DepositReference, TestData.DepositDateTime, TestData.DepositAmount);
result.IsSuccess.ShouldBeTrue();
result = merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
TestData.DepositReference2,
TestData.DepositDateTime2,
TestData.DepositAmount2);
result.IsSuccess.ShouldBeTrue();

List<Deposit> depositListModel = merchantDepositListAggregate.GetDeposits();
depositListModel.Count.ShouldBe(2);
Expand All @@ -169,14 +196,16 @@ public void MerchantDepositListAggregate_MakeDeposit_TwoDepositsOneMonthApartSam
MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);

merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
Result result = merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
"Test Data Gen Deposit",
new DateTime(2021, 1, 1, 0, 0, 0),
PositiveMoney.Create(Money.Create(650.00m)));
merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
result.IsSuccess.ShouldBeTrue();
result = merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
"Test Data Gen Deposit",
new DateTime(2021, 2, 1, 0, 0, 0),
PositiveMoney.Create(Money.Create(650.00m)));
result.IsSuccess.ShouldBeTrue();

List<Deposit> depositListModel = merchantDepositListAggregate.GetDeposits();
depositListModel.Count.ShouldBe(2);
Expand All @@ -191,14 +220,16 @@ public void MerchantDepositListAggregate_MakeDeposit_TwoDepositsSameDetailsApart
MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);

merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
Result result = merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
"Test Data Gen Deposit",
new DateTime(2021, 1, 1, 0, 0, 0),
PositiveMoney.Create(Money.Create(650.00m)));
merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
result.IsSuccess.ShouldBeTrue();
result = merchantDepositListAggregate.MakeDeposit(TestData.MerchantDepositSourceManual,
"Test Data Gen Deposit",
new DateTime(2021, 1, 1, 0, 0, 0),
PositiveMoney.Create(Money.Create(934.00m)));
result.IsSuccess.ShouldBeTrue();

List<Deposit> depositListModel = merchantDepositListAggregate.GetDeposits();
depositListModel.Count.ShouldBe(2);
Expand All @@ -214,17 +245,22 @@ public void MerchantDepositListAggregate_MakeWithdrawal_DuplicateWithdrawal_Erro
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);

merchantDepositListAggregate.MakeWithdrawal(TestData.WithdrawalDateTime, TestData.WithdrawalAmount);

List<Withdrawal> withdrawalListModel = merchantDepositListAggregate.GetWithdrawals();
withdrawalListModel.ShouldHaveSingleItem();

Should.Throw<InvalidOperationException>(() => { merchantDepositListAggregate.MakeWithdrawal(TestData.WithdrawalDateTime, TestData.WithdrawalAmount); });
Result result = merchantDepositListAggregate.MakeWithdrawal(TestData.WithdrawalDateTime, TestData.WithdrawalAmount);
result.IsFailed.ShouldBeTrue();
result.Status.ShouldBe(ResultStatus.Invalid);
}

[Fact]
public void MerchantDepositListAggregate_MakeWithdrawal_MerchantDepositListNotCreated_ErrorThrown() {
MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);

Should.Throw<InvalidOperationException>(() => { merchantDepositListAggregate.MakeWithdrawal(TestData.WithdrawalDateTime, TestData.WithdrawalAmount); });
Result result = merchantDepositListAggregate.MakeWithdrawal(TestData.WithdrawalDateTime, TestData.WithdrawalAmount);
result.IsFailed.ShouldBeTrue();
result.Status.ShouldBe(ResultStatus.Invalid);
}

[Fact]
Expand All @@ -236,8 +272,11 @@ public void MerchantDepositListAggregate_MakeWithdrawal_TwoWithdrawals_BothWithd
MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);

merchantDepositListAggregate.MakeWithdrawal(TestData.WithdrawalDateTime, TestData.WithdrawalAmount);
merchantDepositListAggregate.MakeWithdrawal(TestData.WithdrawalDateTime2, TestData.WithdrawalAmount2);
Result result = merchantDepositListAggregate.MakeWithdrawal(TestData.WithdrawalDateTime, TestData.WithdrawalAmount);
result.IsSuccess.ShouldBeTrue();

result = merchantDepositListAggregate.MakeWithdrawal(TestData.WithdrawalDateTime2, TestData.WithdrawalAmount2);
result.IsSuccess.ShouldBeTrue();

List<Withdrawal> withdrawalListModel = merchantDepositListAggregate.GetWithdrawals();
withdrawalListModel.Count.ShouldBe(2);
Expand All @@ -252,8 +291,10 @@ public void MerchantDepositListAggregate_MakeWithdrawal_TwoWithdrawalsOneMonthAp
MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);

merchantDepositListAggregate.MakeWithdrawal(new DateTime(2021, 1, 1, 0, 0, 0), PositiveMoney.Create(Money.Create(650.00m)));
merchantDepositListAggregate.MakeWithdrawal(new DateTime(2021, 2, 1, 0, 0, 0), PositiveMoney.Create(Money.Create(650.00m)));
Result result = merchantDepositListAggregate.MakeWithdrawal(new DateTime(2021, 1, 1, 0, 0, 0), PositiveMoney.Create(Money.Create(650.00m)));
result.IsSuccess.ShouldBeTrue();
result = merchantDepositListAggregate.MakeWithdrawal(new DateTime(2021, 2, 1, 0, 0, 0), PositiveMoney.Create(Money.Create(650.00m)));
result.IsSuccess.ShouldBeTrue();

List<Withdrawal> withdrawalListModel = merchantDepositListAggregate.GetWithdrawals();
withdrawalListModel.Count.ShouldBe(2);
Expand All @@ -268,8 +309,10 @@ public void MerchantDepositListAggregate_MakeWithdrawal_TwoWithdrawalsSameDetail
MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);

merchantDepositListAggregate.MakeWithdrawal(new DateTime(2021, 1, 1, 0, 0, 0), PositiveMoney.Create(Money.Create(650.00m)));
merchantDepositListAggregate.MakeWithdrawal(new DateTime(2021, 1, 1, 0, 0, 0), PositiveMoney.Create(Money.Create(934.00m)));
Result result = merchantDepositListAggregate.MakeWithdrawal(new DateTime(2021, 1, 1, 0, 0, 0), PositiveMoney.Create(Money.Create(650.00m)));
result.IsSuccess.ShouldBeTrue();
result = merchantDepositListAggregate.MakeWithdrawal(new DateTime(2021, 1, 1, 0, 0, 0), PositiveMoney.Create(Money.Create(934.00m)));
result.IsSuccess.ShouldBeTrue();

List<Withdrawal> withdrawalListModel = merchantDepositListAggregate.GetWithdrawals();
withdrawalListModel.Count.ShouldBe(2);
Expand All @@ -284,7 +327,8 @@ public void MerchantDepositListAggregate_MakeWithdrawal_WithdrawalMade() {
MerchantDepositListAggregate merchantDepositListAggregate = MerchantDepositListAggregate.Create(TestData.MerchantId);
merchantDepositListAggregate.Create(merchantAggregate, TestData.DateMerchantCreated);

merchantDepositListAggregate.MakeWithdrawal(TestData.WithdrawalDateTime, TestData.WithdrawalAmount);
Result result = merchantDepositListAggregate.MakeWithdrawal(TestData.WithdrawalDateTime, TestData.WithdrawalAmount);
result.IsSuccess.ShouldBeTrue();

List<Withdrawal> withdrawalListModel = merchantDepositListAggregate.GetWithdrawals();
withdrawalListModel.ShouldHaveSingleItem();
Expand Down
Loading
Loading