Skip to content

Reduce CreateMerchantUser complexity in MerchantDomainService #1626

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 CreateMerchantUser complexity in MerchantDomainService #1626

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
604ce8f
Initial plan
Copilot Mar 13, 2026
06569ce
Refactor merchant user creation flow
Copilot Mar 13, 2026
dec22ac
Merge branch 'master' into copilot/fix-cyclomatic-complexity-issue-an…
StuartFerguson 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
69 changes: 42 additions & 27 deletions TransactionProcessor.BusinessLogic/Services/MerchantDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,21 +259,7 @@ public async Task<Result> CreateMerchant(MerchantCommands.CreateMerchantCommand
public async Task<Result> CreateMerchantUser(MerchantCommands.CreateMerchantUserCommand command, CancellationToken cancellationToken)
{
try {
CreateUserRequest createUserRequest = new() {
EmailAddress = command.RequestDto.EmailAddress,
FamilyName = command.RequestDto.FamilyName,
GivenName = command.RequestDto.GivenName,
MiddleName = command.RequestDto.MiddleName,
Password = command.RequestDto.Password,
PhoneNumber = "123456", // Is this really needed :|
Roles = new List<String>(),
Claims = new Dictionary<String, String>()
};

String merchantRoleName = Environment.GetEnvironmentVariable("MerchantRoleName");
createUserRequest.Roles.Add(String.IsNullOrEmpty(merchantRoleName) ? "Merchant" : merchantRoleName);
createUserRequest.Claims.Add("estateId", command.EstateId.ToString());
createUserRequest.Claims.Add("merchantId", command.MerchantId.ToString());
CreateUserRequest createUserRequest = this.BuildMerchantUserRequest(command);

Result<EstateAggregate> estateResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.Get<EstateAggregate>(command.EstateId, ct), command.EstateId, cancellationToken);
if (estateResult.IsFailed)
Expand All @@ -290,20 +276,12 @@ public async Task<Result> CreateMerchantUser(MerchantCommands.CreateMerchantUser
if (validateResult.IsFailed)
return ResultHelpers.CreateFailure(validateResult);

Result createUserResult = await this.SecurityServiceClient.CreateUser(createUserRequest, cancellationToken);
if (createUserResult.IsFailed)
return ResultHelpers.CreateFailure(createUserResult);

Result<List<UserDetails>> userDetailsResult = await this.SecurityServiceClient.GetUsers(createUserRequest.EmailAddress, cancellationToken);
if (userDetailsResult.IsFailed)
return ResultHelpers.CreateFailure(userDetailsResult);

UserDetails user = userDetailsResult.Data.SingleOrDefault();
if (user == null)
return Result.Failure($"Unable to get user details for username {createUserRequest.EmailAddress}");
Result<UserDetails> getUserResult = await this.CreateMerchantSecurityUser(createUserRequest, cancellationToken);
if (getUserResult.IsFailed)
return ResultHelpers.CreateFailure(getUserResult);

// Add the user to the aggregate
Result stateResult = merchantAggregate.AddSecurityUser(user.UserId, command.RequestDto.EmailAddress);
Result stateResult = merchantAggregate.AddSecurityUser(getUserResult.Data.UserId, command.RequestDto.EmailAddress);
if (stateResult.IsFailed)
return stateResult;

Expand All @@ -320,6 +298,43 @@ public async Task<Result> CreateMerchantUser(MerchantCommands.CreateMerchantUser
}
}

private CreateUserRequest BuildMerchantUserRequest(MerchantCommands.CreateMerchantUserCommand command) {
CreateUserRequest createUserRequest = new() {
EmailAddress = command.RequestDto.EmailAddress,
FamilyName = command.RequestDto.FamilyName,
GivenName = command.RequestDto.GivenName,
MiddleName = command.RequestDto.MiddleName,
Password = command.RequestDto.Password,
PhoneNumber = "123456", // Is this really needed :|
Roles = new List<String>(),
Claims = new Dictionary<String, String>()
};

String merchantRoleName = Environment.GetEnvironmentVariable("MerchantRoleName");
createUserRequest.Roles.Add(String.IsNullOrEmpty(merchantRoleName) ? "Merchant" : merchantRoleName);
createUserRequest.Claims.Add("estateId", command.EstateId.ToString());
createUserRequest.Claims.Add("merchantId", command.MerchantId.ToString());

return createUserRequest;
}

private async Task<Result<UserDetails>> CreateMerchantSecurityUser(CreateUserRequest createUserRequest,
CancellationToken cancellationToken) {
Result createUserResult = await this.SecurityServiceClient.CreateUser(createUserRequest, cancellationToken);
if (createUserResult.IsFailed)
return ResultHelpers.CreateFailure(createUserResult);

Result<List<UserDetails>> userDetailsResult = await this.SecurityServiceClient.GetUsers(createUserRequest.EmailAddress, cancellationToken);
if (userDetailsResult.IsFailed)
return ResultHelpers.CreateFailure(userDetailsResult);

UserDetails user = userDetailsResult.Data.SingleOrDefault();
if (user == null)
return Result.Failure($"Unable to get user details for username {createUserRequest.EmailAddress}");

return Result.Success(user);
}

public async Task<Result> MakeMerchantDeposit(MerchantCommands.MakeMerchantDepositCommand command, CancellationToken cancellationToken)
{
try
Expand Down
Loading