Skip to content

Refactor RemoveContractFromMerchant command usage #683

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 1 commit into from
Jan 24, 2026
Merged

Refactor RemoveContractFromMerchant command usage #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions EstateManagementUI.BlazorServer/Components/Pages/Merchants/Edit.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,9 @@ private async Task<Result> LoadContracts()
return ResultHelpers.CreateFailure(result);
}

availableContracts = ModelFactory.ConvertFrom(result.Data);

var unfiltered = ModelFactory.ConvertFrom(result.Data);
this.availableContracts = unfiltered.Where(u => this.assignedContracts.Select(a => a.ContractId).Contains(u.ContractId) == false).ToList();

return Result.Success();
}

Expand Down Expand Up @@ -457,12 +458,10 @@ private async Task RemoveContractFromMerchant(Guid contractId)
try
{
var correlationId = new CorrelationId(Guid.NewGuid());
var estateId = Guid.Parse("11111111-1111-1111-1111-111111111111");
var accessToken = "stubbed-token";
var estateId = await this.GetEstateId();

var command = new Commands.RemoveContractFromMerchantCommand(
var command = new MerchantCommands.RemoveContractFromMerchantCommand(
correlationId,
accessToken,
estateId,
MerchantId,
contractId
Expand Down
18 changes: 17 additions & 1 deletion EstateManagmentUI.BusinessLogic/Client/MerchantMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public partial interface IApiClient
Task<Result> UpdateMerchantContact(MerchantCommands.UpdateMerchantCommand request, CancellationToken cancellationToken);
Task<Result> RemoveOperatorFromMerchant(MerchantCommands.RemoveOperatorFromMerchantCommand request, CancellationToken cancellationToken);
Task<Result> AddOperatorToMerchant(MerchantCommands.AddOperatorToMerchantCommand request, CancellationToken cancellationToken);
Task<Result> RemoveContractFromMerchant(MerchantCommands.RemoveContractFromMerchantCommand request, CancellationToken cancellationToken);
}

public partial class ApiClient : IApiClient {
Expand All @@ -37,13 +38,27 @@ public async Task<Result> AddOperatorToMerchant(MerchantCommands.AddOperatorToMe
return ResultHelpers.CreateFailure(token);

var apiRequest = new AssignOperatorRequest { TerminalNumber = request.TerminalNumber, MerchantNumber = request.MerchantNumber, OperatorId = request.OperatorId };

var apiResult = await this.TransactionProcessorClient.AssignOperatorToMerchant(token.Data, request.EstateId, request.MerchantId, apiRequest, cancellationToken);
if (apiResult.IsFailed)
return ResultHelpers.CreateFailure(apiResult);

return Result.Success();
}

public async Task<Result> RemoveContractFromMerchant(MerchantCommands.RemoveContractFromMerchantCommand request,
CancellationToken cancellationToken) {
var token = await this.GetToken(cancellationToken);
if (token.IsFailed)
return ResultHelpers.CreateFailure(token);

var apiResult = await this.TransactionProcessorClient.RemoveContractFromMerchant(token.Data, request.EstateId, request.MerchantId, request.ContractId, cancellationToken);
if (apiResult.IsFailed)
return ResultHelpers.CreateFailure(apiResult);

return Result.Success();
}

public async Task<Result> RemoveOperatorFromMerchant(MerchantCommands.RemoveOperatorFromMerchantCommand request,
CancellationToken cancellationToken) {
var token = await this.GetToken(cancellationToken);
Expand Down Expand Up @@ -274,3 +289,4 @@ public async Task<Result<List<MerchantDropDownModel>>> GetMerchants(MerchantQuer
}
}
}

6 changes: 3 additions & 3 deletions EstateManagmentUI.BusinessLogic/RequestHandlers/DateRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class MerchantRequestHandler : IRequestHandler<MerchantQueries.GetMerchan
IRequestHandler<MerchantCommands.AddOperatorToMerchantCommand, Result>,
IRequestHandler<Commands.CreateMerchantCommand, Result>,
IRequestHandler<Commands.MakeMerchantDepositCommand, Result>,
IRequestHandler<Commands.RemoveContractFromMerchantCommand, Result>,
IRequestHandler<MerchantCommands.RemoveContractFromMerchantCommand, Result>,
IRequestHandler<MerchantCommands.RemoveOperatorFromMerchantCommand, Result>,
IRequestHandler<Commands.SwapMerchantDeviceCommand, Result>,
IRequestHandler<MerchantCommands.UpdateMerchantCommand, Result>,
Expand Down Expand Up @@ -101,9 +101,9 @@ public async Task<Result> Handle(Commands.MakeMerchantDepositCommand request,
return Result.Success();
}

public async Task<Result> Handle(Commands.RemoveContractFromMerchantCommand request,
public async Task<Result> Handle(MerchantCommands.RemoveContractFromMerchantCommand request,
CancellationToken cancellationToken) {
return Result.Success();
return await this.ApiClient.RemoveContractFromMerchant(request, cancellationToken);
}

public async Task<Result> Handle(MerchantCommands.RemoveOperatorFromMerchantCommand request,
Expand Down
2 changes: 1 addition & 1 deletion EstateManagmentUI.BusinessLogic/Requests/Requests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public record MerchantContact(Guid ContactId, string ContactName, string Contact
public record UpdateMerchantCommand(CorrelationId CorrelationId,Guid EstateId, Guid MerchantId, string Name, String SettlementSchedule, MerchantAddress MerchantAddress, MerchantContact MerchantContact) : IRequest<Result>;
public record RemoveOperatorFromMerchantCommand(CorrelationId CorrelationId, Guid EstateId, Guid MerchantId, Guid OperatorId) : IRequest<Result>;
public record AddOperatorToMerchantCommand(CorrelationId CorrelationId, Guid EstateId, Guid MerchantId, Guid OperatorId, string? MerchantNumber, string? TerminalNumber) : IRequest<Result>;
public record RemoveContractFromMerchantCommand(CorrelationId CorrelationId, Guid EstateId, Guid MerchantId, Guid ContractId) : IRequest<Result>;
}

public static class Commands
Expand All @@ -84,7 +85,6 @@ public record CreateMerchantCommand(CorrelationId CorrelationId, string AccessTo
public record CreateMerchantUserCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, string EmailAddress, string Password) : IRequest<Result>;
public record CreateOperatorCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, string Name, bool RequireCustomMerchantNumber, bool RequireCustomTerminalNumber) : IRequest<Result>;
public record MakeMerchantDepositCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, decimal Amount, DateTime Date, string Reference) : IRequest<Result>;
public record RemoveContractFromMerchantCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, Guid ContractId) : IRequest<Result>;

public record SwapMerchantDeviceCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, string OldDevice, string NewDevice) : IRequest<Result>;
public record UpdateOperatorCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid OperatorId, string Name, bool RequireCustomMerchantNumber, bool RequireCustomTerminalNumber) : IRequest<Result>;
Expand Down
4 changes: 2 additions & 2 deletions EstateManagmentUI.BusinessLogic/Services/TestMediatorService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public Task<TResponse> Send<TResponse>(IRequest<TResponse> request, Cancellation
Commands.AddProductToContractCommand cmd => Task.FromResult((TResponse)(object)this.ExecuteAddProductToContract(cmd)),
Commands.AddTransactionFeeForProductToContractCommand cmd => Task.FromResult((TResponse)(object)this.ExecuteAddTransactionFee(cmd)),
Commands.AssignContractToMerchantCommand cmd => Task.FromResult((TResponse)(object)this.ExecuteAssignContractToMerchant(cmd)),
Commands.RemoveContractFromMerchantCommand cmd => Task.FromResult((TResponse)(object)this.ExecuteRemoveContractFromMerchant(cmd)),
MerchantCommands.RemoveContractFromMerchantCommand cmd => Task.FromResult((TResponse)(object)this.ExecuteRemoveContractFromMerchant(cmd)),
MerchantCommands.AddOperatorToMerchantCommand cmd => Task.FromResult((TResponse)(object)this.ExecuteAddOperatorToMerchant(cmd)),
MerchantCommands.RemoveOperatorFromMerchantCommand cmd => Task.FromResult((TResponse)(object)this.ExecuteRemoveOperatorFromMerchant(cmd)),
EstateCommands.AddOperatorToEstateCommand cmd => Task.FromResult((TResponse)(object)this.ExecuteAddOperatorToEstate(cmd)),
Expand Down Expand Up @@ -272,7 +272,7 @@ private Result ExecuteAssignContractToMerchant(Commands.AssignContractToMerchant
return Result.Success();
}

private Result ExecuteRemoveContractFromMerchant(Commands.RemoveContractFromMerchantCommand cmd)
private Result ExecuteRemoveContractFromMerchant(MerchantCommands.RemoveContractFromMerchantCommand cmd)
{
var merchant = this._testDataStore.GetMerchant(cmd.EstateId, cmd.MerchantId);
if (merchant == null)
Expand Down
Loading