Skip to content

Reduce cyclomatic complexity of ContractDomainService.CreateContract from 11 to 8 #1719

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
Apr 7, 2026
Merged

Reduce cyclomatic complexity of ContractDomainService.CreateContract from 11 to 8 #1719

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca503e5
Initial plan
Copilot Apr 7, 2026
d07257e
refactor: reduce CreateContract cyclomatic complexity from 11 to 8
Copilot Apr 7, 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
60 changes: 29 additions & 31 deletions TransactionProcessor.BusinessLogic/Services/ContractDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,41 +168,15 @@ public async Task<Result> CreateContract(ContractCommands.CreateContractCommand
return ResultHelpers.CreateFailure(contractResult);

ContractAggregate contractAggregate = contractResult.Data;
EstateAggregate estateAggregate = estateResult.Data;
Models.Estate.Estate estate = estateResult.Data.GetEstate();


Models.Estate.Estate estate = estateAggregate.GetEstate();
if (estate.Operators.Any(o => o.OperatorId == command.RequestDTO.OperatorId) == false)
{
return Result.NotFound($"Unable to create a contract for an operator that is not setup on estate [{estate.Name}]");
}

// Validate a duplicate name
String projection =
$"fromCategory(\"ContractAggregate\")\n.when({{\n $init: function (s, e) {{\n return {{\n total: 0,\n contractId: 0\n }};\n }},\n 'ContractCreatedEvent': function(s,e){{\n // Check if it matches\n if (e.data.description === '{command.RequestDTO.Description}' \n && e.data.operatorId === '{command.RequestDTO.OperatorId}'){{\n s.total += 1;\n s.contractId = e.data.contractId\n }}\n }}\n}})";

Result<String> result = await this.Context.RunTransientQuery(projection, cancellationToken);
if (result.IsFailed)
return ResultHelpers.CreateFailure(result);
String resultString = result.Data;
if (String.IsNullOrEmpty(resultString) == false)
{
JObject jsonResult = JObject.Parse(resultString);

String contractIdString = jsonResult.Property("contractId").Values<String>().Single();

Guid.TryParse(contractIdString, out Guid contractIdResult);

if (contractIdResult != Guid.Empty) {
return Result.Conflict(
$"Contract Description {command.RequestDTO.Description} already in use for operator {command.RequestDTO.OperatorId}");
}
}
Result preConditionResult = await this.ValidateContractCreationPreConditions(command, estate, cancellationToken);
if (preConditionResult.IsFailed)
return preConditionResult;

if (contractAggregate.IsCreated)
{
return Result.Forbidden($"Contract Id [{command.ContractId}] already created for estate [{estate.Name}]");
}

Result stateResult = contractAggregate.Create(command.EstateId, command.RequestDTO.OperatorId, command.RequestDTO.Description);
if (stateResult.IsFailed)
return ResultHelpers.CreateFailure(stateResult);
Expand All @@ -219,6 +193,30 @@ public async Task<Result> CreateContract(ContractCommands.CreateContractCommand
}
}

private async Task<Result> ValidateContractCreationPreConditions(ContractCommands.CreateContractCommand command, Models.Estate.Estate estate, CancellationToken cancellationToken)
{
if (estate.Operators.Any(o => o.OperatorId == command.RequestDTO.OperatorId) == false)
return Result.NotFound($"Unable to create a contract for an operator that is not setup on estate [{estate.Name}]");

String projection =
$"fromCategory(\"ContractAggregate\")\n.when({{\n $init: function (s, e) {{\n return {{\n total: 0,\n contractId: 0\n }};\n }},\n 'ContractCreatedEvent': function(s,e){{\n // Check if it matches\n if (e.data.description === '{command.RequestDTO.Description}' \n && e.data.operatorId === '{command.RequestDTO.OperatorId}'){{\n s.total += 1;\n s.contractId = e.data.contractId\n }}\n }}\n}})";

Result<String> result = await this.Context.RunTransientQuery(projection, cancellationToken);
if (result.IsFailed)
return ResultHelpers.CreateFailure(result);

String resultString = result.Data;
if (String.IsNullOrEmpty(resultString) == false)
{
JObject jsonResult = JObject.Parse(resultString);
String contractIdString = jsonResult["contractId"]?.Value<String>();
if (Guid.TryParse(contractIdString, out Guid contractIdResult) && contractIdResult != Guid.Empty)
return Result.Conflict($"Contract Description {command.RequestDTO.Description} already in use for operator {command.RequestDTO.OperatorId}");
}

return Result.Success();
}

#endregion
}
}
Loading