Skip to content

Refactor estate operator add/remove to centralize token logic #677

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

Refactor estate operator add/remove to centralize token logic #677

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
9 changes: 2 additions & 7 deletions EstateManagementUI.BlazorServer/Components/Pages/Estate/Index.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,11 @@ private async Task AddOperatorToEstate()
try
{
var correlationId = new CorrelationId(Guid.NewGuid());
var estateId = Guid.Parse("11111111-1111-1111-1111-111111111111");
var accessToken = "stubbed-token";
Guid estateId = await this.GetEstateId();
var operatorId = Guid.Parse(selectedOperatorId);

var command = new Commands.AddOperatorToEstateCommand(
correlationId,
accessToken,
estateId,
operatorId
);
Expand Down Expand Up @@ -149,12 +147,9 @@ private async Task RemoveOperatorFromEstate(Guid operatorId)
try
{
var correlationId = new CorrelationId(Guid.NewGuid());
var estateId = Guid.Parse("11111111-1111-1111-1111-111111111111");
var accessToken = "stubbed-token";

Guid estateId = await this.GetEstateId();
var command = new Commands.RemoveOperatorFromEstateCommand(
correlationId,
accessToken,
estateId,
operatorId
);
Expand Down
40 changes: 40 additions & 0 deletions EstateManagmentUI.BusinessLogic/Client/EstateMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using System.Text;
using EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
using Shared.Results;
using TransactionProcessor.DataTransferObjects.Requests.Estate;
using TransactionProcessor.DataTransferObjects.Responses.Estate;

namespace EstateManagementUI.BusinessLogic.Client {
Expand All @@ -16,6 +17,11 @@ Task<Result<EstateModel>> GetEstate(Queries.GetEstateQuery request,

Task<Result<List<OperatorModel>>> GetEstateAssignedOperators(Queries.GetAssignedOperatorsQuery request,
CancellationToken cancellationToken);

Task<Result> RemoveEstateOperator(Commands.RemoveOperatorFromEstateCommand request,
CancellationToken cancellationToken);
Task<Result> AddEstateOperator(Commands.AddOperatorToEstateCommand request,
CancellationToken cancellationToken);
}

public partial class ApiClient : IApiClient {
Expand Down Expand Up @@ -51,5 +57,39 @@ public async Task<Result<List<OperatorModel>>> GetEstateAssignedOperators(Querie

return Result.Success(estateOperators);
}

public async Task<Result> RemoveEstateOperator(Commands.RemoveOperatorFromEstateCommand request,
CancellationToken cancellationToken) {
// Get a token here
Result<String> token = await this.GetToken(cancellationToken);
if (token.IsFailed)
return ResultHelpers.CreateFailure(token);

Result? apiResult = await this.TransactionProcessorClient.RemoveOperatorFromEstate(token.Data, request.EstateId, request.OperatorId, cancellationToken);
if (apiResult.IsFailed)
return ResultHelpers.CreateFailure(apiResult);

return Result.Success();
}

public async Task<Result> AddEstateOperator(Commands.AddOperatorToEstateCommand request,
CancellationToken cancellationToken)
{
// Get a token here
Result<String> token = await this.GetToken(cancellationToken);
if (token.IsFailed)
return ResultHelpers.CreateFailure(token);

AssignOperatorRequest assignOperatorRequest = new AssignOperatorRequest
{
OperatorId = request.OperatorId
};

Result? apiResult = await this.TransactionProcessorClient.AssignOperatorToEstate(token.Data, request.EstateId, assignOperatorRequest, cancellationToken);
if (apiResult.IsFailed)
return ResultHelpers.CreateFailure(apiResult);

return Result.Success();
}
}
}
4 changes: 2 additions & 2 deletions EstateManagmentUI.BusinessLogic/RequestHandlers/DateRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ public async Task<Result<EstateModel>> Handle(Queries.GetEstateQuery request,

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

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

public async Task<Result<List<OperatorModel>>> Handle(Queries.GetAssignedOperatorsQuery request,
Expand Down
4 changes: 2 additions & 2 deletions EstateManagmentUI.BusinessLogic/Requests/Requests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public static class Commands
{
public record AddMerchantDeviceCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, string DeviceIdentifier) : IRequest<Result>;
public record AddOperatorToMerchantCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, Guid OperatorId, string? MerchantNumber, string? TerminalNumber) : IRequest<Result>;
public record AddOperatorToEstateCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid OperatorId) : IRequest<Result>;
public record AddOperatorToEstateCommand(CorrelationId CorrelationId, Guid EstateId, Guid OperatorId) : IRequest<Result>;
public record AssignContractToMerchantCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, Guid ContractId) : IRequest<Result>;
public record CreateContractCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, string Description, Guid OperatorId) : IRequest<Result>;
public record CreateMerchantCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, string Name, string ContactName, string ContactEmail) : IRequest<Result>;
Expand All @@ -63,7 +63,7 @@ public record CreateOperatorCommand(CorrelationId CorrelationId, string AccessTo
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 RemoveOperatorFromMerchantCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, Guid OperatorId) : IRequest<Result>;
public record RemoveOperatorFromEstateCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid OperatorId) : IRequest<Result>;
public record RemoveOperatorFromEstateCommand(CorrelationId CorrelationId, Guid EstateId, Guid OperatorId) : IRequest<Result>;
public record SetMerchantSettlementScheduleCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, string Schedule) : IRequest<Result>;
public record SwapMerchantDeviceCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, string OldDevice, string NewDevice) : IRequest<Result>;
public record UpdateMerchantAddressCommand(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, string AddressLine1, string Town, string Region, string PostalCode, string Country) : IRequest<Result>;
Expand Down
Loading