Skip to content

Genreal code tidy up #765

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
Feb 9, 2026
Merged

Genreal code tidy up #765

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
1 change: 0 additions & 1 deletion EstateManagementUI.BlazorServer.Tests/Pages/Contracts/ContractsEditPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using EstateManagementUI.BlazorServer.Components.Permissions;
using EstateManagementUI.BlazorServer.Models;
using EstateManagementUI.BlazorServer.Permissions;
using EstateManagementUI.BusinessLogic.Models;
using EstateManagementUI.BusinessLogic.Requests;
using MediatR;
using Microsoft.AspNetCore.Components;
Expand Down
1 change: 1 addition & 0 deletions EstateManagementUI.BlazorServer.Tests/Pages/Contracts/ContractsIndexPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using Shouldly;
using SimpleResults;
using TransactionProcessor.DataTransferObjects.Responses.Contract;
using ContractModels = EstateManagementUI.BlazorServer.Models.ContractModels;
using ContractsIndex = EstateManagementUI.BlazorServer.Components.Pages.Contracts.Index;

namespace EstateManagementUI.BlazorServer.Tests.Pages.Contracts;
Expand Down
2 changes: 0 additions & 2 deletions EstateManagementUI.BlazorServer.Tests/Pages/Contracts/ContractsNewPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using AngleSharp.Dom;
using Bunit;
using EstateManagementUI.BlazorServer.Models;
using EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
using EstateManagementUI.BusinessLogic.Models;
using EstateManagementUI.BusinessLogic.Requests;
using Moq;
using Shouldly;
Expand Down
7 changes: 0 additions & 7 deletions EstateManagementUI.BlazorServer.Tests/Pages/Contracts/ContractsViewPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
using AngleSharp.Dom;
using Bunit;
using EstateManagementUI.BlazorServer.Components.Pages.Contracts;
using EstateManagementUI.BlazorServer.Components.Permissions;
using EstateManagementUI.BlazorServer.Models;
using EstateManagementUI.BlazorServer.Permissions;
using EstateManagementUI.BlazorServer.Tests.Pages.FileProcessing;
using EstateManagementUI.BusinessLogic.Models;
using EstateManagementUI.BusinessLogic.Requests;
using MediatR;
using Microsoft.AspNetCore.Components;
using Microsoft.Extensions.DependencyInjection;
using Moq;
using Shouldly;
using SimpleResults;
Expand Down
1 change: 0 additions & 1 deletion EstateManagementUI.BlazorServer.Tests/Pages/Estate/EstateIndexPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using EstateManagementUI.BlazorServer.Common;
using EstateManagementUI.BlazorServer.Models;
using EstateManagementUI.BlazorServer.Tests.Pages.FileProcessing;
using EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
using EstateManagementUI.BusinessLogic.Requests;
using Microsoft.AspNetCore.Components.Web;
using Moq;
Expand Down
2 changes: 0 additions & 2 deletions EstateManagementUI.BlazorServer.Tests/Pages/Merchants/MerchantsIndexPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
using EstateManagementUI.BlazorServer.Models;
using EstateManagementUI.BlazorServer.Permissions;
using EstateManagementUI.BlazorServer.Tests.Pages.FileProcessing;
using EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
using EstateManagementUI.BusinessLogic.Models;
using EstateManagementUI.BusinessLogic.Requests;
using MediatR;
using Microsoft.AspNetCore.Components;
Expand Down
8 changes: 1 addition & 7 deletions EstateManagementUI.BlazorServer.Tests/Pages/Merchants/MerchantsViewPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,13 @@
using EstateManagementUI.BlazorServer.Components.Pages.Merchants;
using EstateManagementUI.BlazorServer.Models;
using EstateManagementUI.BlazorServer.Tests.Pages.FileProcessing;
using EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
using EstateManagementUI.BusinessLogic.Models;
using EstateManagementUI.BusinessLogic.Requests;
using MediatR;
using Microsoft.AspNetCore.Components;
using Microsoft.Extensions.DependencyInjection;
using Moq;
using Shouldly;
using SimpleResults;
using MerchantContractModel = EstateManagementUI.BusinessLogic.Models.MerchantContractModel;
using MerchantDeviceModel = EstateManagementUI.BusinessLogic.Models.MerchantDeviceModel;
using MerchantModel = EstateManagementUI.BusinessLogic.Models.MerchantModel;
using MerchantOperatorModel = EstateManagementUI.BusinessLogic.Models.MerchantOperatorModel;

namespace EstateManagementUI.BlazorServer.Tests.Pages.Merchants;

Expand Down Expand Up @@ -310,7 +304,7 @@ public void MerchantsView_DisplaysContracts_WhenPresent()
{
ProductId = Guid.NewGuid(),
ProductName = "Test Product",
DisplayText = "£10 Topup"
DisplayText = "£10 Topup"
}
}
}
Expand Down
1 change: 0 additions & 1 deletion EstateManagementUI.BlazorServer.Tests/Pages/Operators/OperatorsIndexPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using EstateManagementUI.BlazorServer.Models;
using EstateManagementUI.BlazorServer.Permissions;
using EstateManagementUI.BlazorServer.Tests.Pages.FileProcessing;
using EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
using EstateManagementUI.BusinessLogic.Requests;
using MediatR;
using Microsoft.AspNetCore.Components;
Expand Down
6 changes: 3 additions & 3 deletions EstateManagementUI.BlazorServer.Tests/Services/TestDataStoreTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using EstateManagementUI.BlazorServer.Models;
using EstateManagementUI.BusinessLogic.Services;
using Shouldly;
using EstateModel = EstateManagementUI.BusinessLogic.Models.EstateModel;
using MerchantModel = EstateManagementUI.BusinessLogic.Models.MerchantModel;
using OperatorModel = EstateManagementUI.BusinessLogic.Models.OperatorModel;
using EstateModel = EstateManagementUI.BusinessLogic.Models.EstateModels.EstateModel;
using MerchantModel = EstateManagementUI.BusinessLogic.Models.MerchantModels.MerchantModel;
using OperatorModel = EstateManagementUI.BusinessLogic.Models.OperatorModels.OperatorModel;

namespace EstateManagementUI.BlazorServer.Tests.Services;

Expand Down
10 changes: 5 additions & 5 deletions EstateManagementUI.BlazorServer.Tests/UIServices/ContractUIServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ public async Task GetContracts_ReturnsMappedList_WhenMediatorSucceeds()
var estateId = Guid.NewGuid();
var correlationId = CorrelationIdHelper.New();

var bizContracts = new List<BusinessLogic.Models.ContractModel>
var bizContracts = new List<BusinessLogic.Models.ContractModels.ContractModel>
{
new()
{
ContractId = Guid.NewGuid(),
Description = "Contract A",
OperatorId = Guid.NewGuid(),
OperatorName = "OpA",
Products = new List<BusinessLogic.Models.ContractProductModel>
Products = new List<BusinessLogic.Models.ContractModels.ContractProductModel>
{
new()
{
Expand All @@ -50,7 +50,7 @@ public async Task GetContracts_ReturnsMappedList_WhenMediatorSucceeds()
ProductType = "NotSet",
Value = "10.00",
NumberOfFees = 0,
TransactionFees = new List<BusinessLogic.Models.ContractProductTransactionFeeModel>()
TransactionFees = new List<BusinessLogic.Models.ContractModels.ContractProductTransactionFeeModel>()
}
}
}
Expand Down Expand Up @@ -97,13 +97,13 @@ public async Task GetContract_ReturnsMappedModel_WhenMediatorSucceeds()
// Arrange
var estateId = Guid.NewGuid();
var contractId = Guid.NewGuid();
var bizContract = new BusinessLogic.Models.ContractModel
var bizContract = new BusinessLogic.Models.ContractModels.ContractModel
{
ContractId = contractId,
Description = "Contract Detail",
OperatorId = Guid.NewGuid(),
OperatorName = "OpDetail",
Products = new List<BusinessLogic.Models.ContractProductModel>()
Products = new List<BusinessLogic.Models.ContractModels.ContractProductModel>()
};

_mockMediator
Expand Down
56 changes: 28 additions & 28 deletions EstateManagementUI.BlazorServer.Tests/UIServices/EstateUIServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,33 @@ public async Task LoadEstate_ReturnsMappedModel_WhenAllQueriesSucceed()
var estateId = Guid.NewGuid();
var correlationId = CorrelationIdHelper.New();

var bizEstate = new BusinessLogic.Models.EstateModel
var bizEstate = new BusinessLogic.Models.EstateModels.EstateModel
{
EstateId = estateId,
EstateName = "Test Estate",
Reference = "REF001",
Merchants = new List<BusinessLogic.Models.EstateMerchantModel> { new() { MerchantId = Guid.NewGuid(), Name = "M1", Reference = "R1" } },
Contracts = new List<BusinessLogic.Models.EstateContractModel> { new() { ContractId = Guid.NewGuid(), Name = "C1", OperatorName = "Op" } },
Operators = new List<BusinessLogic.Models.EstateOperatorModel> { new() { OperatorId = Guid.NewGuid(), Name = "OpAssigned" } },
Users = new List<BusinessLogic.Models.EstateUserModel> { new() { UserId = Guid.NewGuid(), EmailAddress = "u@x" } }
Merchants = new List<BusinessLogic.Models.EstateModels.EstateMerchantModel> { new() { MerchantId = Guid.NewGuid(), Name = "M1", Reference = "R1" } },
Contracts = new List<BusinessLogic.Models.EstateModels.EstateContractModel> { new() { ContractId = Guid.NewGuid(), Name = "C1", OperatorName = "Op" } },
Operators = new List<BusinessLogic.Models.EstateModels.EstateOperatorModel> { new() { OperatorId = Guid.NewGuid(), Name = "OpAssigned" } },
Users = new List<BusinessLogic.Models.EstateModels.EstateUserModel> { new() { UserId = Guid.NewGuid(), EmailAddress = "u@x" } }
};

var recentMerchants = new List<BusinessLogic.Models.RecentMerchantsModel>
var recentMerchants = new List<BusinessLogic.Models.MerchantModels.RecentMerchantsModel>
{
new() { MerchantId = Guid.NewGuid(), Name = "RecentM", Reference = "RM", CreatedDateTime = DateTime.UtcNow }
};

var recentContracts = new List<BusinessLogic.Models.RecentContractModel>
var recentContracts = new List<BusinessLogic.Models.ContractModels.RecentContractModel>
{
new() { ContractId = Guid.NewGuid(), Description = "RecentC", OperatorName = "Op" }
};

var assignedOperators = new List<BusinessLogic.Models.OperatorModel>
var assignedOperators = new List<BusinessLogic.Models.OperatorModels.OperatorModel>
{
new() { OperatorId = bizEstate.Operators!.First().OperatorId, Name = "OpAssigned" }
};

var allOperators = new List<BusinessLogic.Models.OperatorDropDownModel>
var allOperators = new List<BusinessLogic.Models.OperatorModels.OperatorDropDownModel>
{
new() { OperatorId = Guid.NewGuid(), OperatorName = "OpA" },
new() { OperatorId = assignedOperators[0].OperatorId, OperatorName = "OpAssigned" }
Expand Down Expand Up @@ -105,13 +105,13 @@ public async Task LoadEstate_ReturnsFailure_WhenEstateQueryFails()

// Provide success for other queries so the service behaviour is isolated
_mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.RecentMerchantsModel>()));
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.MerchantModels.RecentMerchantsModel>()));
_mockMediator.Setup(m => m.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.RecentContractModel>()));
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.ContractModels.RecentContractModel>()));
_mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorModel>()));
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorModels.OperatorModel>()));
_mockMediator.Setup(m => m.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorDropDownModel>()));
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorModels.OperatorDropDownModel>()));

// Act
var result = await _service.LoadEstate(correlationId, estateId);
Expand All @@ -132,11 +132,11 @@ public async Task LoadEstate_ReturnsFailure_WhenRecentMerchantQueryFails()
_mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Failure());
_mockMediator.Setup(m => m.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.RecentContractModel>()));
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.ContractModels.RecentContractModel>()));
_mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorModel>()));
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorModels.OperatorModel>()));
_mockMediator.Setup(m => m.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorDropDownModel>()));
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorModels.OperatorDropDownModel>()));

// Act
var result = await _service.LoadEstate(correlationId, estateId);
Expand All @@ -153,15 +153,15 @@ public async Task LoadEstate_ReturnsFailure_WhenRecentContractsQueryFails()
var correlationId = CorrelationIdHelper.New();

_mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetEstateQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new EstateModel()));
.ReturnsAsync(Result.Success(new EstateModels.EstateModel()));
_mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<RecentMerchantsModel>()));
.ReturnsAsync(Result.Success(new List<MerchantModels.RecentMerchantsModel>()));
_mockMediator.Setup(m => m.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Failure());
_mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorModel>()));
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorModels.OperatorModel>()));
_mockMediator.Setup(m => m.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorDropDownModel>()));
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorModels.OperatorDropDownModel>()));

// Act
var result = await _service.LoadEstate(correlationId, estateId);
Expand All @@ -178,15 +178,15 @@ public async Task LoadEstate_ReturnsFailure_WhenGetAssignedOperatorsQueryFails()
var correlationId = CorrelationIdHelper.New();

_mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetEstateQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new EstateModel()));
.ReturnsAsync(Result.Success(new EstateModels.EstateModel()));
_mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<RecentMerchantsModel>()));
.ReturnsAsync(Result.Success(new List<MerchantModels.RecentMerchantsModel>()));
_mockMediator.Setup(m => m.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<RecentContractModel>()));
.ReturnsAsync(Result.Success(new List<ContractModels.RecentContractModel>()));
_mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Failure());
_mockMediator.Setup(m => m.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorDropDownModel>()));
.ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorModels.OperatorDropDownModel>()));

// Act
var result = await _service.LoadEstate(correlationId, estateId);
Expand All @@ -203,13 +203,13 @@ public async Task LoadEstate_ReturnsFailure_WhenGetOperatorsForDropDownQueryFail
var correlationId = CorrelationIdHelper.New();

_mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetEstateQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new EstateModel()));
.ReturnsAsync(Result.Success(new EstateModels.EstateModel()));
_mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<RecentMerchantsModel>()));
.ReturnsAsync(Result.Success(new List<MerchantModels.RecentMerchantsModel>()));
_mockMediator.Setup(m => m.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<RecentContractModel>()));
.ReturnsAsync(Result.Success(new List<ContractModels.RecentContractModel>()));
_mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success(new List<OperatorModel>()));
.ReturnsAsync(Result.Success(new List<OperatorModels.OperatorModel>()));
_mockMediator.Setup(m => m.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Failure());

Expand Down
Loading