Skip to content

Enhance SettlementAggregate tests and fee properties #786

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
merged 2 commits into from
Apr 26, 2025
Merged

Enhance SettlementAggregate tests and fee properties #786

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
a5054ed
Enhance SettlementAggregate tests and fee properties
StuartFerguson Apr 26, 2025
9ab8acf
Merge branch 'master' into bug/#783_statement_date_issues
StuartFerguson Apr 26, 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
12 changes: 12 additions & 0 deletions TransactionProcessor.Aggregates.Tests/SettlementAggregateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,18 @@ public void SettlementAggregate_AddFee_FeeIsAdded()

aggregate.AggregateId.ShouldBe(TestData.SettlementAggregateId);
aggregate.GetNumberOfFeesPendingSettlement().ShouldBe(1);
var fee = aggregate.GetFeesToBeSettled().SingleOrDefault();
fee.ShouldNotBe(default);
fee.merchantId.ShouldBe(TestData.MerchantId);
fee.transactionId.ShouldBe(TestData.TransactionId);
fee.calculatedFee.CalculatedValue.ShouldBe(TestData.CalculatedFeeMerchantFee().CalculatedValue);
fee.calculatedFee.FeeCalculationType.ShouldBe(TestData.CalculatedFeeMerchantFee().FeeCalculationType);
fee.calculatedFee.FeeId.ShouldBe(TestData.CalculatedFeeMerchantFee().FeeId);
fee.calculatedFee.FeeValue.ShouldBe(TestData.CalculatedFeeMerchantFee().FeeValue);
fee.calculatedFee.FeeType.ShouldBe(TestData.CalculatedFeeMerchantFee().FeeType);
fee.calculatedFee.FeeCalculatedDateTime.ShouldBe(TestData.CalculatedFeeMerchantFee().FeeCalculatedDateTime);
fee.calculatedFee.IsSettled.ShouldBe(TestData.CalculatedFeeMerchantFee().IsSettled);
fee.calculatedFee.SettlementDueDate.ShouldBe(TestData.CalculatedFeeMerchantFee().SettlementDueDate);
}

[Fact]
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.Aggregates/SettlementAggregate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@ public static void PlayEvent(this SettlementAggregate aggregate, SettlementDomai
FeeId = domainEvent.FeeId,
FeeType = FeeType.Merchant,
FeeValue = domainEvent.FeeValue,
FeeCalculationType = (CalculationType)domainEvent.FeeCalculationType
FeeCalculationType = (CalculationType)domainEvent.FeeCalculationType,
FeeCalculatedDateTime = domainEvent.FeeCalculatedDateTime
}));
}

Expand Down
5 changes: 4 additions & 1 deletion TransactionProcessor.Testing/TestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1570,7 +1570,10 @@ public static CalculatedFee CalculatedFeeMerchantFee() =>
FeeCalculationType = CalculationType.Fixed,
FeeId = TestData.TransactionFeeId,
FeeValue = TestData.TransactionFeeValue,
FeeType = TransactionProcessor.Models.Contract.FeeType.Merchant
FeeType = TransactionProcessor.Models.Contract.FeeType.Merchant,
FeeCalculatedDateTime = TransactionFeeCalculateDateTime,
IsSettled = false,
SettlementDueDate = DateTime.MinValue
};

public static CalculatedFee CalculatedFeeMerchantFee(Guid transactionFeeId) =>
Expand Down
Loading