Skip to content

Refactor settlement service and update tests #864

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 1 commit into from
Aug 19, 2025
Merged

Refactor settlement service and update tests #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 10 deletions TransactionProcessor.BusinessLogic.Tests/Services/SettlementDomainServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,10 @@ public async Task SettlementDomainService_ProcessSettlement_RunOutOfRetries_Sett
.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>()))
Expand All @@ -132,7 +127,7 @@ public async Task SettlementDomainService_ProcessSettlement_RunOutOfRetries_Sett
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));
this.AggregateService.Verify(s => s.Save(It.IsAny<SettlementAggregate>(), It.IsAny<CancellationToken>()), Times.Exactly(6));
}

[Fact]
Expand All @@ -152,9 +147,7 @@ public async Task SettlementDomainService_ProcessSettlement_RetryOnWrongExpected
.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())
Expand All @@ -179,7 +172,7 @@ public async Task SettlementDomainService_ProcessSettlement_RetryOnWrongExpected

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

[Fact]
Expand Down Expand Up @@ -243,7 +236,6 @@ public async Task SettlementDomainService_ProcessSettlement_SettlementAggregateN
Result<Guid> result = await settlementDomainService.ProcessSettlement(command, CancellationToken.None);

result.IsSuccess.ShouldBeTrue();
result.Data.ShouldNotBe(Guid.Empty);
}

[Fact]
Expand Down
184 changes: 79 additions & 105 deletions TransactionProcessor.BusinessLogic/Services/SettlementDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using TransactionProcessor.Database.Entities;

public interface ISettlementDomainService
{
Expand All @@ -34,150 +35,104 @@
{
private readonly IAggregateService AggregateService;

private async Task<Result> ApplySettlementUpdates(Func<SettlementAggregate, Task<Result>> action,
Guid settlementId,
CancellationToken cancellationToken,
Boolean isNotFoundError = true)
{
try
{

Result<SettlementAggregate> getSettlementResult = await this.AggregateService.GetLatest<SettlementAggregate>(settlementId, cancellationToken);
Result<SettlementAggregate> settlementAggregateResult =
DomainServiceHelper.HandleGetAggregateResult(getSettlementResult, settlementId, isNotFoundError);

if (settlementAggregateResult.IsFailed)
return ResultHelpers.CreateFailure(settlementAggregateResult);

Logger.LogInformation("In ApplySettlementUpdates - got aggregate");
SettlementAggregate settlementAggregate = settlementAggregateResult.Data;
Result result = await action(settlementAggregate);
if (result.IsFailed)
return ResultHelpers.CreateFailure(result);
Logger.LogInformation("In ApplySettlementUpdates - action successful");
Result saveResult = await this.AggregateService.Save(settlementAggregate, cancellationToken);
if (saveResult.IsFailed)
return ResultHelpers.CreateFailure(saveResult);
Logger.LogInformation("In ApplySettlementUpdates - save successful");
return Result.Success();
}
catch (Exception ex)
{
Logger.LogInformation($"In ApplySettlementUpdates failed - {ex.Message}");
return Result.Failure(ex.GetExceptionMessages());
}
}

private async Task<Result> ApplyTransactionUpdates(Func<TransactionAggregate, Task<Result>> action,
Guid transactionId,
CancellationToken cancellationToken,
Boolean isNotFoundError = true)
{
try
{

Result<TransactionAggregate> getTransactionResult = await this.AggregateService.GetLatest<TransactionAggregate>(transactionId, cancellationToken);
Result<TransactionAggregate> transactionAggregateResult =
DomainServiceHelper.HandleGetAggregateResult(getTransactionResult, transactionId, isNotFoundError);

TransactionAggregate transactionAggregate = transactionAggregateResult.Data;
Result result = await action(transactionAggregate);
if (result.IsFailed)
return ResultHelpers.CreateFailure(result);

Result saveResult = await this.AggregateService.Save(transactionAggregate, cancellationToken);
if (saveResult.IsFailed)
return ResultHelpers.CreateFailure(saveResult);
return Result.Success();
}
catch (Exception ex)
{
return Result.Failure(ex.GetExceptionMessages());
}
}

// TODO: Add in a Get Settlement

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 () => {
try {
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();

Check warning on line 49 in TransactionProcessor.BusinessLogic/Services/SettlementDomainService.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

TransactionProcessor.BusinessLogic/Services/SettlementDomainService.cs#L49 

Remove this useless assignment to local variable 'feesToBeSettled'.

Result<SettlementAggregate> getSettlementResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.GetLatest<SettlementAggregate>(settlementAggregateId, ct), settlementAggregateId, cancellationToken, false);
if (getSettlementResult.IsFailed)
return ResultHelpers.CreateFailure(getSettlementResult);

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

Result settlementResult = await ApplySettlementUpdates(async (SettlementAggregate settlementAggregate) => {
if (settlementAggregate.IsCreated == false) {
Logger.LogInformation($"No pending settlement for {command.SettlementDate:yyyy-MM-dd}");
// Not pending settlement for this date
return Result.Success();
}

Result<MerchantAggregate> getMerchantResult = await this.AggregateService.Get<MerchantAggregate>(command.MerchantId, cancellationToken);
Result<MerchantAggregate> getMerchantResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.Get<MerchantAggregate>(command.MerchantId, ct), command.MerchantId, cancellationToken, false);
if (getMerchantResult.IsFailed)
return ResultHelpers.CreateFailure(getMerchantResult);

Result settlementSaveResult = Result.Success();
MerchantAggregate merchant = getMerchantResult.Data;
if (merchant.SettlementSchedule == SettlementSchedule.Immediate) {
// Mark the settlement as completed
settlementAggregate.StartProcessing(DateTime.Now);
settlementAggregate.ManuallyComplete();
Result result = await this.AggregateService.Save(settlementAggregate, cancellationToken);
return result;
settlementSaveResult = await this.AggregateService.Save(settlementAggregate, cancellationToken);
}

feesToBeSettled = settlementAggregate.GetFeesToBeSettled();

if (feesToBeSettled.Any()) {
// Record the process call
settlementAggregate.StartProcessing(DateTime.Now);
return await this.AggregateService.Save(settlementAggregate, cancellationToken);
settlementSaveResult = await this.AggregateService.Save(settlementAggregate, cancellationToken);
}

return Result.Success();
// Settlement updates done, now we need to update the transactions
if (settlementSaveResult.IsFailed)
return ResultHelpers.CreateFailure(settlementSaveResult);

}, settlementAggregateId, cancellationToken);
List<Result> failedResults = new();
foreach ((Guid transactionId, Guid merchantId, CalculatedFee calculatedFee) feeToSettle in feesToBeSettled) {
try {

if (settlementResult.IsFailed)
return settlementResult;
Result<TransactionAggregate> getTransactionResult = await this.AggregateService.GetLatest<TransactionAggregate>(feeToSettle.transactionId, cancellationToken);
if (getTransactionResult.IsFailed)
return ResultHelpers.CreateFailure(getTransactionResult);
var transactionAggregate = getTransactionResult.Data;

List<Result> failedResults = new();
foreach ((Guid transactionId, Guid merchantId, CalculatedFee calculatedFee) feeToSettle in feesToBeSettled) {
Result transactionResult = await ApplyTransactionUpdates(async (TransactionAggregate transactionAggregate) => {
try {
transactionAggregate.AddSettledFee(feeToSettle.calculatedFee, command.SettlementDate, settlementAggregateId);
return Result.Success();

Result saveResult = await this.AggregateService.Save(transactionAggregate, cancellationToken);
if (saveResult.IsFailed)
return ResultHelpers.CreateFailure(saveResult);
}
catch (Exception ex) {
Logger.LogError(ex);
return Result.Failure();
Logger.LogError($"Failed to process transaction {feeToSettle.transactionId} for settlement {settlementAggregateId}", ex);
failedResults.Add(Result.Failure($"Failed to process transaction {feeToSettle.transactionId} for settlement {settlementAggregateId}: {ex.Message}"));
}
}, feeToSettle.transactionId, cancellationToken);

if (transactionResult.IsFailed) {
failedResults.Add(transactionResult);
}
}

if (failedResults.Any()) {
return Result.Failure($"Not all fees were processed successfully {failedResults.Count} have failed");
}

return Result.Success(settlementAggregateId);
}, retryPolicy, "SettlementDomainService - ProcessSettlement");
if (failedResults.Any()) {
return Result.Failure($"Not all fees were processed successfully {failedResults.Count} have failed");
}

return Result.Success(settlementAggregateId);
}, retryPolicy, "SettlementDomainService - ProcessSettlement");
}
catch (Exception ex) {
return Result.Failure(ex.GetExceptionMessages());
}
}

public async Task<Result> AddMerchantFeePendingSettlement(SettlementCommands.AddMerchantFeePendingSettlementCommand command,
CancellationToken cancellationToken) {

try{
Logger.LogInformation("Processing command AddMerchantFeePendingSettlementCommand");

Guid settlementAggregateId = Helpers.CalculateSettlementAggregateId(command.SettlementDueDate.Date, command.MerchantId, command.EstateId);

Result<SettlementAggregate> getSettlementResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.GetLatest<SettlementAggregate>(settlementAggregateId, ct), settlementAggregateId, cancellationToken, false);
if (getSettlementResult.IsFailed)
return ResultHelpers.CreateFailure(getSettlementResult);

Guid aggregateId = Helpers.CalculateSettlementAggregateId(command.SettlementDueDate.Date, command.MerchantId, command.EstateId);
Result result = await ApplySettlementUpdates(async (SettlementAggregate settlementAggregate) => {
SettlementAggregate settlementAggregate = getSettlementResult.Data;

Logger.LogInformation("In ApplySettlementUpdates");
Logger.LogInformation("In ApplySettlementUpdates");
if (settlementAggregate.IsCreated == false)
{
Logger.LogInformation("In ApplySettlementUpdates - aggregate not created");
Expand All @@ -198,34 +153,53 @@
Logger.LogInformation("In ApplySettlementUpdates - about to add fee");
settlementAggregate.AddFee(command.MerchantId, command.TransactionId, calculatedFee);

return Result.Success();
Result saveResult = await this.AggregateService.Save(settlementAggregate, cancellationToken);
if (saveResult.IsFailed)
return ResultHelpers.CreateFailure(saveResult);

}, aggregateId, cancellationToken, false);
return result;
return saveResult;
}
catch (Exception ex)
{
return Result.Failure(ex.GetExceptionMessages());
}
}

public async Task<Result> AddSettledFeeToSettlement(SettlementCommands.AddSettledFeeToSettlementCommand command,
CancellationToken cancellationToken) {
Guid aggregateId = Helpers.CalculateSettlementAggregateId(command.SettledDate.Date, command.MerchantId, command.EstateId);
Result result = await ApplySettlementUpdates(async (SettlementAggregate settlementAggregate) => {

Result<MerchantAggregate> getMerchantResult = await this.AggregateService.Get<MerchantAggregate>(command.MerchantId, cancellationToken);
try {
Guid settlementAggregateId = Helpers.CalculateSettlementAggregateId(command.SettledDate.Date, command.MerchantId, command.EstateId);

Result<SettlementAggregate> getSettlementResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.GetLatest<SettlementAggregate>(settlementAggregateId, ct), settlementAggregateId, cancellationToken, false);
if (getSettlementResult.IsFailed)
return ResultHelpers.CreateFailure(getSettlementResult);

SettlementAggregate settlementAggregate = getSettlementResult.Data;


Result<MerchantAggregate> getMerchantResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.Get<MerchantAggregate>(command.MerchantId, ct), command.MerchantId, cancellationToken);
if (getMerchantResult.IsFailed)
return ResultHelpers.CreateFailure(getMerchantResult);

MerchantAggregate merchant = getMerchantResult.Data;

if (merchant.SettlementSchedule == SettlementSchedule.Immediate){
if (merchant.SettlementSchedule == SettlementSchedule.Immediate) {
settlementAggregate.ImmediatelyMarkFeeAsSettled(command.MerchantId, command.TransactionId, command.FeeId);
}
else {
settlementAggregate.MarkFeeAsSettled(command.MerchantId, command.TransactionId, command.FeeId, command.SettledDate.Date);
}

return Result.Success();
Result saveResult = await this.AggregateService.Save(settlementAggregate, cancellationToken);
if (saveResult.IsFailed)
return ResultHelpers.CreateFailure(saveResult);

}, aggregateId, cancellationToken);
return result;
return saveResult;
}
catch (Exception ex) {
return Result.Failure(ex.GetExceptionMessages());
}
}

public SettlementDomainService(Func<IAggregateService> aggregateService)
Expand Down
Loading