Skip to content

Reduce AddContractToMerchant cyclomatic complexity #1613

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 4 commits into from
Mar 13, 2026
Merged

Reduce AddContractToMerchant cyclomatic complexity #1613

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1929bdf
Initial plan
Copilot Mar 13, 2026
d3fcaba
Merge branch 'master' into copilot/fix-cyclomatic-complexity-issue-again
StuartFerguson Mar 13, 2026
fea4295
Reduce AddContractToMerchant complexity
Copilot Mar 13, 2026
93211d4
Address review feedback on contract helper
Copilot Mar 13, 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
28 changes: 18 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 @@ -419,17 +419,11 @@ public async Task<Result> AddContractToMerchant(MerchantCommands.AddMerchantCont
if (validateResult.IsFailed)
return ResultHelpers.CreateFailure(validateResult);

Result<ContractAggregate> getContractResult = await this.AggregateService.Get<ContractAggregate>(command.RequestDto.ContractId, cancellationToken);
if (getContractResult.IsFailed) {
return ResultHelpers.CreateFailure(getContractResult);
}

ContractAggregate contractAggregate = getContractResult.Data;
if (contractAggregate.IsCreated == false) {
return Result.Invalid($"Contract Id {command.RequestDto.ContractId} has not been created");
}
Result<ContractAggregate> contractResult = await this.GetCreatedContract(command.RequestDto.ContractId, cancellationToken);
if (contractResult.IsFailed)
return ResultHelpers.CreateFailure(contractResult);

Result stateResult = merchantAggregate.AddContract(contractAggregate);
Result stateResult = merchantAggregate.AddContract(contractResult.Data);
if (stateResult.IsFailed)
return stateResult;

Expand Down Expand Up @@ -713,6 +707,20 @@ private Result ValidateEstateAndMerchant(EstateAggregate estateAggregate,
return Result.Success();
}

private async Task<Result<ContractAggregate>> GetCreatedContract(Guid contractId,
CancellationToken cancellationToken)
{
Result<ContractAggregate> contractResult = await this.AggregateService.Get<ContractAggregate>(contractId, cancellationToken);
if (contractResult.IsFailed)
return ResultHelpers.CreateFailure(contractResult);

ContractAggregate contractAggregate = contractResult.Data;
if (contractAggregate.IsCreated == false)
return Result.Invalid($"Contract Id {contractId} has not been created");

return Result.Success(contractAggregate);
}

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