Skip to content

Build in retries to Process Settlement at the domain service #837

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
Jul 16, 2025
Merged

Build in retries to Process Settlement at the domain service #837

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
bec76d8
Build in retries to Process Settlement at the domain service
StuartFerguson Jul 16, 2025
7904ac5
code review changes
StuartFerguson Jul 16, 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
100 changes: 100 additions & 0 deletions TransactionProcessor.BusinessLogic.Tests/Services/SettlementDomainServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,106 @@ public async Task SettlementDomainService_ProcessSettlement_SettlementIsProcesse
result.Data.ShouldNotBe(Guid.Empty);
}

[Fact]
public async Task SettlementDomainService_ProcessSettlement_RunOutOfRetries_SettlementIsNotProcessed()
{
this.AggregateService.Setup(s => s.GetLatest<SettlementAggregate>(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(TestData.GetSettlementAggregateWithPendingMerchantFees(10)));
this.AggregateService.SetupSequence(s => s.GetLatest<TransactionAggregate>(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(0))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(1))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(2))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(3))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(4))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(5))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(6))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(7))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(8))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(9))));
this.AggregateService.SetupSequence(s => s.Save(It.IsAny<SettlementAggregate>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Failure(new List<String> { "WrongExpectedVersion" }))
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Failure(new List<String> { "WrongExpectedVersion" }))
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Failure(new List<String> { "WrongExpectedVersion" }))
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Failure(new List<String> { "WrongExpectedVersion" }))
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Failure(new List<String> { "WrongExpectedVersion" }))
.ReturnsAsync(Result.Failure(new List<String> { "WrongExpectedVersion" }));
this.AggregateService.SetupSequence(s => s.Save(It.IsAny<TransactionAggregate>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success());

this.AggregateService.Setup(e => e.Get<MerchantAggregate>(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(TestData.Aggregates.CreatedMerchantAggregate());

SettlementCommands.ProcessSettlementCommand command =
new(TestData.SettlementDate, TestData.MerchantId,
TestData.EstateId);

Result<Guid> result = await settlementDomainService.ProcessSettlement(command, CancellationToken.None);

result.IsSuccess.ShouldBeFalse();
this.AggregateService.Verify(s => s.Save(It.IsAny<SettlementAggregate>(), It.IsAny<CancellationToken>()), Times.Exactly(11));
}

[Fact]
public async Task SettlementDomainService_ProcessSettlement_RetryOnWrongExpected_SettlementIsProcessed()
{
this.AggregateService.Setup(s => s.GetLatest<SettlementAggregate>(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(TestData.GetSettlementAggregateWithPendingMerchantFees(10)));
this.AggregateService.SetupSequence(s => s.GetLatest<TransactionAggregate>(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(0))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(1))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(2))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(3))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(4))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(5))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(6))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(7))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(8))))
.ReturnsAsync(Result.Success(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(9))));
this.AggregateService.SetupSequence(s => s.Save(It.IsAny<SettlementAggregate>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Failure(new List<String>{ "WrongExpectedVersion" }))
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success());
this.AggregateService.SetupSequence(s => s.Save(It.IsAny<TransactionAggregate>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success())
.ReturnsAsync(Result.Success());

this.AggregateService.Setup(e => e.Get<MerchantAggregate>(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(TestData.Aggregates.CreatedMerchantAggregate());

SettlementCommands.ProcessSettlementCommand command =
new(TestData.SettlementDate, TestData.MerchantId,
TestData.EstateId);

Result<Guid> result = await settlementDomainService.ProcessSettlement(command, CancellationToken.None);

result.IsSuccess.ShouldBeTrue();
result.Data.ShouldNotBe(Guid.Empty);
this.AggregateService.Verify(s => s.Save(It.IsAny<SettlementAggregate>(), It.IsAny<CancellationToken>()), Times.Exactly(4));
}

[Fact]
public async Task SettlementDomainService_ProcessSettlement_MerchantWithImmediateSettlement_SettlementIsProcessed()
{
Expand Down
7 changes: 7 additions & 0 deletions TransactionProcessor.BusinessLogic/Services/SettlementDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ private async Task<Result> ApplyTransactionUpdates(Func<TransactionAggregate, Ta

public async Task<Result<Guid>> ProcessSettlement(SettlementCommands.ProcessSettlementCommand command,
CancellationToken cancellationToken) {

IAsyncPolicy<Result<Guid>> retryPolicy = PolicyFactory.CreatePolicy<Guid>(policyTag: "SettlementDomainService - ProcessSettlement");

return await PolicyFactory.ExecuteWithPolicyAsync<Guid>(async () => {

Guid settlementAggregateId = Helpers.CalculateSettlementAggregateId(command.SettlementDate, command.MerchantId, command.EstateId);
List<(Guid transactionId, Guid merchantId, CalculatedFee calculatedFee)> feesToBeSettled = new();

Expand Down Expand Up @@ -161,6 +166,8 @@ public async Task<Result<Guid>> ProcessSettlement(SettlementCommands.ProcessSett
}

return Result.Success(settlementAggregateId);
}, retryPolicy, "SettlementDomainService - ProcessSettlement");

}

public async Task<Result> AddMerchantFeePendingSettlement(SettlementCommands.AddMerchantFeePendingSettlementCommand command,
Expand Down
Loading