Skip to content

Reduce AssignOperatorToMerchant complexity in MerchantDomainService #1610

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

Reduce AssignOperatorToMerchant complexity in MerchantDomainService #1610

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73efe14
Initial plan
Copilot Mar 13, 2026
50d4299
refactor: reduce assign operator complexity
Copilot Mar 13, 2026
2d7a9a8
chore: address review feedback on helper contract
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
70 changes: 44 additions & 26 deletions TransactionProcessor.BusinessLogic/Services/MerchantDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,34 +124,12 @@ public async Task<Result> AssignOperatorToMerchant(MerchantCommands.AssignOperat
if (result.IsFailed)
return ResultHelpers.CreateFailure(result);

// Is the operator valid for this estate
Estate estate = estateAggregate.GetEstate();
Models.Estate.Operator @operator = estate.Operators?.SingleOrDefault(o => o.OperatorId == command.RequestDto.OperatorId);
if (@operator == null) {
return Result.Invalid($"Operator Id {command.RequestDto.OperatorId} is not supported on Estate [{estate.Name}]");
}

Result<OperatorAggregate> operatorResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.GetLatest<OperatorAggregate>(command.RequestDto.OperatorId, ct), command.RequestDto.OperatorId, cancellationToken);
if (operatorResult.IsFailed)
return ResultHelpers.CreateFailure(operatorResult);
OperatorAggregate @operatorAggregate = operatorResult.Data;
// Operator has been validated, now check the rules of the operator against the passed in data
if (@operatorAggregate.RequireCustomMerchantNumber) {
// requested addition must have a merchant number supplied
if (String.IsNullOrEmpty(command.RequestDto.MerchantNumber)) {
return Result.Invalid($"Operator Id {command.RequestDto.OperatorId} requires that a merchant number is provided");
}
}

if (@operatorAggregate.RequireCustomTerminalNumber) {
// requested addition must have a terminal number supplied
if (String.IsNullOrEmpty(command.RequestDto.TerminalNumber)) {
return Result.Invalid($"Operator Id {command.RequestDto.OperatorId} requires that a terminal number is provided");
}
}
(Result validationResult, String operatorName) = await this.GetOperatorAssignmentDetails(command, estateAggregate, cancellationToken);
if (validationResult.IsFailed)
return validationResult;

// Assign the operator
Result stateResult = merchantAggregate.AssignOperator(command.RequestDto.OperatorId, @operator.Name, command.RequestDto.MerchantNumber, command.RequestDto.TerminalNumber);
Result stateResult = merchantAggregate.AssignOperator(command.RequestDto.OperatorId, operatorName, command.RequestDto.MerchantNumber, command.RequestDto.TerminalNumber);
if (stateResult.IsFailed)
return stateResult;

Expand All @@ -166,6 +144,46 @@ public async Task<Result> AssignOperatorToMerchant(MerchantCommands.AssignOperat
}
}

private async Task<(Result ValidationResult, String OperatorName)> GetOperatorAssignmentDetails(MerchantCommands.AssignOperatorToMerchantCommand command,
EstateAggregate estateAggregate,
CancellationToken cancellationToken)
{
Estate estate = estateAggregate.GetEstate();
Models.Estate.Operator @operator = estate.Operators?.SingleOrDefault(o => o.OperatorId == command.RequestDto.OperatorId);
if (@operator == null) {
return (Result.Invalid($"Operator Id {command.RequestDto.OperatorId} is not supported on Estate [{estate.Name}]"), String.Empty);
}

Result<OperatorAggregate> operatorResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.GetLatest<OperatorAggregate>(command.RequestDto.OperatorId, ct), command.RequestDto.OperatorId, cancellationToken);
if (operatorResult.IsFailed)
return (ResultHelpers.CreateFailure(operatorResult), String.Empty);

Result validationResult = this.ValidateOperatorAssignment(command.RequestDto.OperatorId,
command.RequestDto.MerchantNumber,
command.RequestDto.TerminalNumber,
operatorResult.Data);

return validationResult.IsFailed
? (validationResult, String.Empty)
: (Result.Success(), @operator.Name);
}

private Result ValidateOperatorAssignment(Guid operatorId,
String merchantNumber,
String terminalNumber,
OperatorAggregate operatorAggregate)
{
if (operatorAggregate.RequireCustomMerchantNumber && String.IsNullOrEmpty(merchantNumber)) {
return Result.Invalid($"Operator Id {operatorId} requires that a merchant number is provided");
}

if (operatorAggregate.RequireCustomTerminalNumber && String.IsNullOrEmpty(terminalNumber)) {
return Result.Invalid($"Operator Id {operatorId} requires that a terminal number is provided");
}

return Result.Success();
}

private SettlementSchedule ConvertSettlementSchedule(DataTransferObjects.Responses.Merchant.SettlementSchedule settlementSchedule) =>
settlementSchedule switch
{
Expand Down
Loading