Skip to content

Reduce MerchantDomainService.MakeMerchantDeposit complexity #1676

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
Mar 18, 2026
Merged

Reduce MerchantDomainService.MakeMerchantDeposit complexity #1676

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b28bb4
Initial plan
Copilot Mar 18, 2026
89df0a3
Refactor merchant deposit flow helper
Copilot Mar 18, 2026
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
31 changes: 21 additions & 10 deletions TransactionProcessor.BusinessLogic/Services/MerchantDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,22 +359,17 @@ public async Task<Result> MakeMerchantDeposit(MerchantCommands.MakeMerchantDepos
if (validateResult.IsFailed)
return ResultHelpers.CreateFailure(validateResult);

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

MerchantDepositListAggregate merchantDepositListAggregate = getDepositListResult.Data;
Result createResult = this.EnsureMerchantDepositListCreated(merchantDepositListAggregate, merchantAggregate, command.RequestDto.DepositDateTime);
if (createResult.IsFailed)
return ResultHelpers.CreateFailure(createResult);
Result<MerchantDepositListAggregate> depositListResult = await this.GetOrCreateMerchantDepositList(command, merchantAggregate, cancellationToken);
if (depositListResult.IsFailed)
return ResultHelpers.CreateFailure(depositListResult);

PositiveMoney amount = PositiveMoney.Create(Money.Create(command.RequestDto.Amount));
MerchantDepositSource depositSource = this.ConvertDepositSource(command.DepositSource);
Result stateResult = merchantDepositListAggregate.MakeDeposit(depositSource, command.RequestDto.Reference, command.RequestDto.DepositDateTime, amount);
Result stateResult = depositListResult.Data.MakeDeposit(depositSource, command.RequestDto.Reference, command.RequestDto.DepositDateTime, amount);
if (stateResult.IsFailed)
return ResultHelpers.CreateFailure(stateResult);

Result saveResult = await this.AggregateService.Save(merchantDepositListAggregate, cancellationToken);
Result saveResult = await this.AggregateService.Save(depositListResult.Data, cancellationToken);
if (saveResult.IsFailed)
return ResultHelpers.CreateFailure(saveResult);

Expand Down Expand Up @@ -882,6 +877,22 @@ private async Task<Result<ContractAggregate>> GetCreatedContract(Guid contractId
return Result.Success(contractAggregate);
}

private async Task<Result<MerchantDepositListAggregate>> GetOrCreateMerchantDepositList(MerchantCommands.MakeMerchantDepositCommand command,
MerchantAggregate merchantAggregate,
CancellationToken cancellationToken)
{
Result<MerchantDepositListAggregate> getDepositListResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.GetLatest<MerchantDepositListAggregate>(command.MerchantId, ct), command.MerchantId, cancellationToken, false);
if (getDepositListResult.IsFailed)
return ResultHelpers.CreateFailure(getDepositListResult);

MerchantDepositListAggregate merchantDepositListAggregate = getDepositListResult.Data;
Result createResult = this.EnsureMerchantDepositListCreated(merchantDepositListAggregate, merchantAggregate, command.RequestDto.DepositDateTime);
if (createResult.IsFailed)
return ResultHelpers.CreateFailure(createResult);

return Result.Success(merchantDepositListAggregate);
}

private async Task<Result<MerchantDepositListAggregate>> GetMerchantDepositListForWithdrawal(MerchantCommands.MakeMerchantWithdrawalCommand command,
CancellationToken cancellationToken)
{
Expand Down
Loading