Skip to content

Fix issues with Settlement Tests #192

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 3 commits into from
Jan 13, 2022
Merged

Fix issues with Settlement Tests #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5734d8
Test with CI
StuartFerguson Jan 13, 2022
49587a6
Fix build errors
StuartFerguson Jan 13, 2022
79a9e67
Fix review comments
StuartFerguson Jan 13, 2022
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
8 changes: 4 additions & 4 deletions ...onProcessor.BusinessLogic.Tests/DomainEventHandlers/TransactionDomainEventHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public async Task TransactionDomainEventHandler_Handle_TransactionHasBeenComplet
this.TransactionAggregateManager.Setup(t => t.GetAggregate(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(TestData.GetCompletedAuthorisedSaleTransactionAggregate);

this.FeeCalculationManager.Setup(f => f.CalculateFees(It.IsAny<List<TransactionFeeToCalculate>>(), It.IsAny<Decimal>())).Returns(new List<CalculatedFee>
this.FeeCalculationManager.Setup(f => f.CalculateFees(It.IsAny<List<TransactionFeeToCalculate>>(), It.IsAny<Decimal>(), It.IsAny<DateTime>())).Returns(new List<CalculatedFee>
{
TestData.CalculatedFeeMerchantFee(),
TestData.CalculatedFeeServiceProviderFee
Expand Down Expand Up @@ -154,7 +154,7 @@ public async Task TransactionDomainEventHandler_Handle_TransactionHasBeenComplet
this.SettlementAggregateRepository.Setup(p => p.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(pendingSettlementAggregate);

this.FeeCalculationManager.Setup(f => f.CalculateFees(It.IsAny<List<TransactionFeeToCalculate>>(), It.IsAny<Decimal>())).Returns(new List<CalculatedFee>
this.FeeCalculationManager.Setup(f => f.CalculateFees(It.IsAny<List<TransactionFeeToCalculate>>(), It.IsAny<Decimal>(), It.IsAny<DateTime>())).Returns(new List<CalculatedFee>
{
TestData.CalculatedFeeMerchantFee(),
TestData.CalculatedFeeServiceProviderFee
Expand Down Expand Up @@ -204,7 +204,7 @@ public async Task TransactionDomainEventHandler_Handle_TransactionHasBeenComplet
this.SettlementAggregateRepository.Setup(p => p.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(pendingSettlementAggregate);

this.FeeCalculationManager.Setup(f => f.CalculateFees(It.IsAny<List<TransactionFeeToCalculate>>(), It.IsAny<Decimal>())).Returns(new List<CalculatedFee>
this.FeeCalculationManager.Setup(f => f.CalculateFees(It.IsAny<List<TransactionFeeToCalculate>>(), It.IsAny<Decimal>(), It.IsAny<DateTime>())).Returns(new List<CalculatedFee>
{
TestData.CalculatedFeeMerchantFee(),
TestData.CalculatedFeeServiceProviderFee
Expand Down Expand Up @@ -251,7 +251,7 @@ public async Task TransactionDomainEventHandler_Handle_TransactionHasBeenComplet
this.TransactionAggregateManager.Setup(t => t.GetAggregate(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(TestData.GetCompletedAuthorisedSaleTransactionAggregate);

this.FeeCalculationManager.Setup(f => f.CalculateFees(It.IsAny<List<TransactionFeeToCalculate>>(), It.IsAny<Decimal>())).Returns(new List<CalculatedFee>
this.FeeCalculationManager.Setup(f => f.CalculateFees(It.IsAny<List<TransactionFeeToCalculate>>(), It.IsAny<Decimal>(), It.IsAny<DateTime>())).Returns(new List<CalculatedFee>
{
TestData.CalculatedFeeMerchantFee(),
TestData.CalculatedFeeServiceProviderFee
Expand Down
2 changes: 1 addition & 1 deletion TransactionProcessor.BusinessLogic/EventHandling/TransactionDomainEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ private async Task HandleSpecificDomainEvent(TransactionHasBeenCompletedEvent do
}

// Do the fee calculation
List<CalculatedFee> resultFees = this.FeeCalculationManager.CalculateFees(feesForCalculation, transactionAggregate.TransactionAmount.Value);
List<CalculatedFee> resultFees = this.FeeCalculationManager.CalculateFees(feesForCalculation, transactionAggregate.TransactionAmount.Value, domainEvent.CompletedDateTime);

// Process the non merchant fees
IEnumerable<CalculatedFee> nonMerchantFees = resultFees.Where(f => f.FeeType == FeeType.ServiceProvider);
Expand Down
7 changes: 4 additions & 3 deletions TransactionProcessor.BusinessLogic/Manager/FeeCalculationManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ public class FeeCalculationManager : IFeeCalculationManager
/// <param name="transactionAmount">The transaction amount.</param>
/// <returns></returns>
public List<CalculatedFee> CalculateFees(List<TransactionFeeToCalculate> feeList,
Decimal transactionAmount)
Decimal transactionAmount,
DateTime calculationDateTime = new DateTime())
{
List<CalculatedFee> calculatedFees = new List<CalculatedFee>();

Expand All @@ -37,7 +38,7 @@ public List<CalculatedFee> CalculateFees(List<TransactionFeeToCalculate> feeList
FeeCalculationType = transactionFeeToCalculate.CalculationType,
FeeId = transactionFeeToCalculate.FeeId,
FeeValue = transactionFeeToCalculate.Value,
FeeCalculatedDateTime = DateTime.Now
FeeCalculatedDateTime = calculationDateTime == DateTime.MinValue ? DateTime.Now : calculationDateTime
});
}

Expand All @@ -51,7 +52,7 @@ public List<CalculatedFee> CalculateFees(List<TransactionFeeToCalculate> feeList
FeeCalculationType = transactionFeeToCalculate.CalculationType,
FeeId = transactionFeeToCalculate.FeeId,
FeeValue = transactionFeeToCalculate.Value,
FeeCalculatedDateTime = DateTime.Now
FeeCalculatedDateTime = calculationDateTime == DateTime.MinValue ? DateTime.Now : calculationDateTime
});
}
}
Expand Down
4 changes: 3 additions & 1 deletion TransactionProcessor.BusinessLogic/Manager/IFeeCalculationManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ public interface IFeeCalculationManager
/// </summary>
/// <param name="feeList">The fee list.</param>
/// <param name="transactionAmount">The transaction amount.</param>
/// <param name="calculationDateTime">The calculation date time.</param>
/// <returns></returns>
List<CalculatedFee> CalculateFees(List<TransactionFeeToCalculate> feeList,
Decimal transactionAmount);
Decimal transactionAmount,
DateTime calculationDateTime = new DateTime());

#endregion
}
Expand Down
1 change: 0 additions & 1 deletion TransactionProcessor.IntegrationTests/LogonTransaction/LogonTransaction.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ Scenario: Logon Transaction with Existing Device
| EstateName | MerchantName | TransactionNumber | ResponseCode | ResponseMessage |
| Test Estate 1 | Test Merchant 1 | 1 | 0000 | SUCCESS |

@PRTest
Scenario: Logon Transaction with Invalid Device

Given I have assigned the following devices to the merchants
Expand Down
28 changes: 13 additions & 15 deletions TransactionProcessor.IntegrationTests/LogonTransaction/LogonTransaction.feature.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions TransactionProcessor.IntegrationTests/SaleTransaction/SaleTransactionFeature.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ Scenario: Sale Transactions
| Test Estate 1 | Test Merchant 2 | 6 | 0000 | SUCCESS |
| Test Estate 2 | Test Merchant 3 | 7 | 0000 | SUCCESS |

@PRTest
Scenario: Sale Transaction with Invalid Device

When I perform the following transactions
Expand Down Expand Up @@ -135,7 +134,6 @@ Scenario: Sale Transaction with Invalid Merchant
| EstateName | MerchantName | TransactionNumber | ResponseCode | ResponseMessage |
| Test Estate 1 | InvalidMerchant | 1 | 1002 | Merchant Id [d59320fa-4c3e-4900-a999-483f6a10c69a] is not a valid merchant for estate [Test Estate 1] |

@PRTest
Scenario: Sale Transaction with Not Enough Credit Available

When I perform the following transactions
Expand Down
Loading