Skip to content

Refactor: Move operator queries to OperatorQueries class #688

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

Refactor: Move operator queries to OperatorQueries class #688

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
6 changes: 3 additions & 3 deletions EstateManagementUI.BlazorServer.Tests/Pages/Estate/EstateIndexPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void EstateIndex_RendersCorrectly()
.ReturnsAsync(Result.Success(new List<RecentContractModel>()));
_mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), default))
.ReturnsAsync(Result.Success(new List<OperatorModel>()));
_mockMediator.Setup(x => x.Send(It.IsAny<Queries.GetOperatorsQuery>(), default))
_mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsQuery>(), default))
.ReturnsAsync(Result.Success(new List<OperatorModel>()));

// Act
Expand Down Expand Up @@ -65,7 +65,7 @@ public void EstateIndex_DisplaysEstateDetails()
.ReturnsAsync(Result.Success(new List<RecentContractModel>()));
_mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), default))
.ReturnsAsync(Result.Success(new List<OperatorModel>()));
_mockMediator.Setup(x => x.Send(It.IsAny<Queries.GetOperatorsQuery>(), default))
_mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsQuery>(), default))
.ReturnsAsync(Result.Success(new List<OperatorModel>()));

// Act
Expand All @@ -87,7 +87,7 @@ public void EstateIndex_HasCorrectPageTitle()
.ReturnsAsync(Result.Success(new List<RecentContractModel>()));
_mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), default))
.ReturnsAsync(Result.Success(new List<OperatorModel>()));
_mockMediator.Setup(x => x.Send(It.IsAny<Queries.GetOperatorsQuery>(), default))
_mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsQuery>(), default))
.ReturnsAsync(Result.Success(new List<OperatorModel>()));

// Act
Expand Down
10 changes: 5 additions & 5 deletions EstateManagementUI.BlazorServer.Tests/Pages/Operators/OperatorsIndexPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void OperatorsIndex_RendersCorrectly()
}
};

_mockMediator.Setup(x => x.Send(It.IsAny<Queries.GetOperatorsQuery>(), default))
_mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsQuery>(), default))
.ReturnsAsync(Result.Success(operators));

// Act
Expand All @@ -46,7 +46,7 @@ public void OperatorsIndex_WithNoOperators_ShowsEmptyState()
{
// Arrange
var emptyList = new List<OperatorModel>();
_mockMediator.Setup(x => x.Send(It.IsAny<Queries.GetOperatorsQuery>(), default))
_mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsQuery>(), default))
.ReturnsAsync(Result.Success(emptyList));

// Act
Expand Down Expand Up @@ -79,7 +79,7 @@ public void OperatorsIndex_WithOperators_DisplaysOperatorList()
}
};

_mockMediator.Setup(x => x.Send(It.IsAny<Queries.GetOperatorsQuery>(), default))
_mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsQuery>(), default))
.ReturnsAsync(Result.Success(operators));

// Act
Expand All @@ -106,7 +106,7 @@ public void OperatorsIndex_DisplaysCustomNumberRequirements()
}
};

_mockMediator.Setup(x => x.Send(It.IsAny<Queries.GetOperatorsQuery>(), default))
_mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsQuery>(), default))
.ReturnsAsync(Result.Success(operators));

// Act
Expand All @@ -122,7 +122,7 @@ public void OperatorsIndex_DisplaysCustomNumberRequirements()
public void OperatorsIndex_HasCorrectPageTitle()
{
// Arrange
_mockMediator.Setup(x => x.Send(It.IsAny<Queries.GetOperatorsQuery>(), default))
_mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsQuery>(), default))
.ReturnsAsync(Result.Success(new List<OperatorModel>()));

// Act
Expand Down
6 changes: 3 additions & 3 deletions EstateManagementUI.BlazorServer.Tests/Pages/Operators/OperatorsViewPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void OperatorsView_RendersCorrectly()
Name = "Test Operator"
};

_mockMediator.Setup(x => x.Send(It.IsAny<Queries.GetOperatorQuery>(), default))
_mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorQuery>(), default))
.ReturnsAsync(Result.Success(operatorModel));

// Act
Expand All @@ -48,7 +48,7 @@ public void OperatorsView_DisplaysOperatorName()
Name = "Test Operator"
};

_mockMediator.Setup(x => x.Send(It.IsAny<Queries.GetOperatorQuery>(), default))
_mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorQuery>(), default))
.ReturnsAsync(Result.Success(operatorModel));

// Act
Expand All @@ -65,7 +65,7 @@ public void OperatorsView_HasCorrectPageTitle()
{
// Arrange
var operatorId = Guid.NewGuid();
_mockMediator.Setup(x => x.Send(It.IsAny<Queries.GetOperatorQuery>(), default))
_mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorQuery>(), default))
.ReturnsAsync(Result.Success(new OperatorModel { OperatorId = operatorId }));

// Act
Expand Down
2 changes: 1 addition & 1 deletion EstateManagementUI.BlazorServer/Components/Pages/Contracts/New.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ else
try
{
isLoadingOperators = true;
var result = await Mediator.Send(new Queries.GetOperatorsQuery(CorrelationIdHelper.New(), Guid.Parse("11111111-1111-1111-1111-111111111111")));
var result = await Mediator.Send(new OperatorQueries.GetOperatorsQuery(CorrelationIdHelper.New(), Guid.Parse("11111111-1111-1111-1111-111111111111")));
if (result.IsSuccess)
{
operators = ModelFactory.ConvertFrom(result.Data);
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -54,7 +54,7 @@ private async Task<Result> LoadEstateData(CorrelationId correlationId, Guid esta
Task<Result<List<BusinessLogic.Models.RecentMerchantsModel>>> merchantTask = Mediator.Send(new MerchantQueries.GetRecentMerchantsQuery(correlationId, estateId));
Task<Result<List<BusinessLogic.Models.RecentContractModel>>> contractsTask = Mediator.Send(new ContractQueries.GetRecentContractsQuery(correlationId, estateId));
Task<Result<List<BusinessLogic.Models.OperatorModel>>> assignedOperatorsTask = Mediator.Send(new EstateQueries.GetAssignedOperatorsQuery(correlationId, estateId));
Task<Result<List<BusinessLogic.Models.OperatorModel>>> allOperatorsTask= Mediator.Send(new Queries.GetOperatorsQuery(correlationId, estateId));
Task<Result<List<BusinessLogic.Models.OperatorModel>>> allOperatorsTask= Mediator.Send(new OperatorQueries.GetOperatorsQuery(correlationId, estateId));

await Task.WhenAll(estateTask, merchantTask, contractsTask, assignedOperatorsTask, allOperatorsTask);

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -150,7 +150,7 @@ private async Task<Result> LoadOperators() {
var correlationId = new CorrelationId(Guid.NewGuid());
var estateId = await this.GetEstateId();

var result = await Mediator.Send(new Queries.GetOperatorsQuery(correlationId, estateId));
var result = await Mediator.Send(new OperatorQueries.GetOperatorsQuery(correlationId, estateId));

if (result.IsFailed) {
return ResultHelpers.CreateFailure(result);
Expand Down
2 changes: 1 addition & 1 deletion EstateManagementUI.BlazorServer/Components/Pages/Operators/Edit.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ else
var estateId = Guid.Parse("11111111-1111-1111-1111-111111111111");
var accessToken = "stubbed-token";

var result = await Mediator.Send(new Queries.GetOperatorQuery(correlationId, accessToken, estateId, OperatorId));
var result = await Mediator.Send(new OperatorQueries.GetOperatorQuery(correlationId, accessToken, estateId, OperatorId));

if (result.IsSuccess && result.Data != null)
{
Expand Down
25 changes: 1 addition & 24 deletions EstateManagementUI.BlazorServer/Components/Pages/Operators/Index.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,28 +113,5 @@
</div>

@code {
private bool isLoading = true;
private List<OperatorModel> operators;

protected override async Task OnInitializedAsync()
{
try
{
await RequirePermission(PermissionSection.Operator, PermissionFunction.List);

var correlationId = new CorrelationId(Guid.NewGuid());
var estateId = Guid.Parse("11111111-1111-1111-1111-111111111111");
var accessToken = "stubbed-token";

var result = await Mediator.Send(new Queries.GetOperatorsQuery(correlationId, estateId));
if (result.IsSuccess)
{
operators = ModelFactory.ConvertFrom(result.Data);
}
}
finally
{
isLoading = false;
}
}

}
40 changes: 40 additions & 0 deletions EstateManagementUI.BlazorServer/Components/Pages/Operators/Index.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using EstateManagementUI.BlazorServer.Factories;
using EstateManagementUI.BlazorServer.Models;
using EstateManagementUI.BlazorServer.Permissions;
using EstateManagementUI.BusinessLogic.Requests;

namespace EstateManagementUI.BlazorServer.Components.Pages.Operators
{
public partial class Index
{
private bool isLoading = true;
private List<OperatorModel> operators;

protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (!firstRender)
{
await base.OnAfterRenderAsync(firstRender);
return;
}

try {
await RequirePermission(PermissionSection.Operator, PermissionFunction.List);

var correlationId = new CorrelationId(Guid.NewGuid());
var estateId = await this.GetEstateId();

var result = await Mediator.Send(new OperatorQueries.GetOperatorsQuery(correlationId, estateId));
if (result.IsSuccess)
{
operators = ModelFactory.ConvertFrom(result.Data);
}
}
finally
{
isLoading = false;
this.StateHasChanged();
}
}
}
}
2 changes: 1 addition & 1 deletion EstateManagementUI.BlazorServer/Components/Pages/Operators/View.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
var estateId = Guid.Parse("11111111-1111-1111-1111-111111111111");
var accessToken = "stubbed-token";

var result = await Mediator.Send(new Queries.GetOperatorQuery(correlationId, accessToken, estateId, OperatorId));
var result = await Mediator.Send(new OperatorQueries.GetOperatorQuery(correlationId, accessToken, estateId, OperatorId));

if (result.IsSuccess && result.Data != null)
{
Expand Down
2 changes: 1 addition & 1 deletion EstateManagementUI.BlazorServer/Components/Pages/Reporting/TransactionDetail.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@

// Load filter options
var merchantsTask = Mediator.Send(new MerchantQueries.GetMerchantsForDropDownQuery(correlationId, estateId));
var operatorsTask = Mediator.Send(new Queries.GetOperatorsQuery(correlationId, estateId));
var operatorsTask = Mediator.Send(new OperatorQueries.GetOperatorsQuery(correlationId, estateId));
var contractsTask = Mediator.Send(new ContractQueries.GetContractsQuery(correlationId, accessToken, estateId));

await Task.WhenAll(merchantsTask, operatorsTask, contractsTask);
Expand Down
2 changes: 1 addition & 1 deletion EstateManagementUI.BlazorServer/Components/Pages/Reporting/TransactionSummaryMerchant.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@

// Load filter options
var merchantsTask = Mediator.Send(new MerchantQueries.GetMerchantsForDropDownQuery(correlationId, estateId));
var operatorsTask = Mediator.Send(new Queries.GetOperatorsQuery(correlationId, estateId));
var operatorsTask = Mediator.Send(new OperatorQueries.GetOperatorsQuery(correlationId, estateId));

await Task.WhenAll(merchantsTask, operatorsTask);

Expand Down
2 changes: 1 addition & 1 deletion EstateManagementUI.BlazorServer/Components/Pages/Reporting/TransactionSummaryOperator.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@

// Load filter options
var merchantsTask = Mediator.Send(new MerchantQueries.GetMerchantsForDropDownQuery(correlationId, estateId));
var operatorsTask = Mediator.Send(new Queries.GetOperatorsQuery(correlationId, estateId));
var operatorsTask = Mediator.Send(new OperatorQueries.GetOperatorsQuery(correlationId, estateId));

await Task.WhenAll(merchantsTask, operatorsTask);

Expand Down
4 changes: 2 additions & 2 deletions EstateManagmentUI.BusinessLogic/Client/OperatorMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ namespace EstateManagementUI.BusinessLogic.Client
{
public partial interface IApiClient
{
Task<Result<List<OperatorModel>>> GetOperators(Queries.GetOperatorsQuery request,
Task<Result<List<OperatorModel>>> GetOperators(OperatorQueries.GetOperatorsQuery request,
CancellationToken cancellationToken);
}

public partial class ApiClient : IApiClient {
public async Task<Result<List<OperatorModel>>> GetOperators(Queries.GetOperatorsQuery request,
public async Task<Result<List<OperatorModel>>> GetOperators(OperatorQueries.GetOperatorsQuery request,
CancellationToken cancellationToken) {
// Get a token here
var token = await this.GetToken(cancellationToken);
Expand Down
8 changes: 4 additions & 4 deletions EstateManagmentUI.BusinessLogic/RequestHandlers/DateRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ public async Task<Result<List<ContractDropDownModel>>> Handle(ContractQueries.Ge
}
}

public class OperatorRequestHandler : IRequestHandler<Queries.GetOperatorsQuery, Result<List<OperatorModel>>>,
IRequestHandler<Queries.GetOperatorQuery, Result<OperatorModel>>,
public class OperatorRequestHandler : IRequestHandler<OperatorQueries.GetOperatorsQuery, Result<List<OperatorModel>>>,
IRequestHandler<OperatorQueries.GetOperatorQuery, Result<OperatorModel>>,
IRequestHandler<Commands.CreateOperatorCommand, Result>,
IRequestHandler<Commands.UpdateOperatorCommand, Result>
{
Expand All @@ -234,11 +234,11 @@ public OperatorRequestHandler(IApiClient apiClient)
this.ApiClient = apiClient;
}

public async Task<Result<List<OperatorModel>>> Handle(Queries.GetOperatorsQuery request,
public async Task<Result<List<OperatorModel>>> Handle(OperatorQueries.GetOperatorsQuery request,
CancellationToken cancellationToken) {
return await this.ApiClient.GetOperators(request, cancellationToken);
}
public async Task<Result<OperatorModel>> Handle(Queries.GetOperatorQuery request,
public async Task<Result<OperatorModel>> Handle(OperatorQueries.GetOperatorQuery request,
CancellationToken cancellationToken) {
return Result.Success(StubTestData.GetMockOperator());
}
Expand Down
10 changes: 5 additions & 5 deletions EstateManagmentUI.BusinessLogic/Requests/Requests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ public record GetContractsQuery(CorrelationId CorrelationId, string AccessToken,
public record GetContractQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid ContractId) : IRequest<Result<ContractModel>>;
}

public static class Queries
{

public class OperatorQueries {
public record GetOperatorsQuery(CorrelationId CorrelationId, Guid EstateId) : IRequest<Result<List<OperatorModel>>>;

public record GetOperatorQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid OperatorId) : IRequest<Result<OperatorModel>>;

}

public static class Queries
{
public record GetFileImportLogsListQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, DateTime StartDate, DateTime EndDate)
: IRequest<Result<List<FileImportLogModel>>>;
public record GetFileImportLogQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, Guid FileImportLogId)
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 @@ -32,8 +32,8 @@ public Task<TResponse> Send<TResponse>(IRequest<TResponse> request, Cancellation
MerchantQueries.GetRecentMerchantsQuery query => Task.FromResult((TResponse)(object)Result.Success(this._testDataStore.GetRecentMerchants(query.EstateId))),

// Operator Queries
Queries.GetOperatorsQuery query => Task.FromResult((TResponse)(object)Result.Success(this._testDataStore.GetOperators(query.EstateId))),
Queries.GetOperatorQuery query => Task.FromResult((TResponse)(object)this.GetOperatorResult(query.EstateId, query.OperatorId)),
OperatorQueries.GetOperatorsQuery query => Task.FromResult((TResponse)(object)Result.Success(this._testDataStore.GetOperators(query.EstateId))),
OperatorQueries.GetOperatorQuery query => Task.FromResult((TResponse)(object)this.GetOperatorResult(query.EstateId, query.OperatorId)),

// Contract Queries
ContractQueries.GetContractsQuery query => Task.FromResult((TResponse)(object)Result.Success(this._testDataStore.GetContracts(query.EstateId))),
Expand Down
Loading