Skip to content

Refactor contract UI to use ContractUIService abstraction #744

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

Refactor contract UI to use ContractUIService abstraction #744

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
2 changes: 2 additions & 0 deletions EstateManagementUI.BlazorServer.Tests/Pages/BaseTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ protected BaseTest() {
this.Services.AddSingleton(this._mockPermissionStore.Object);
this.Services.AddSingleton(this.EstateUIService.Object);
this.Services.AddSingleton(this.OperatorUIService.Object);
this.Services.AddSingleton(this.ContractUIService.Object);


// Add required permission components that render their children
Expand All @@ -55,6 +56,7 @@ protected BaseTest() {
protected readonly FakeNavigationManager _fakeNavigationManager;
protected readonly Mock<IEstateUIService> EstateUIService = new Mock<IEstateUIService>();
protected readonly Mock<IOperatorUIService> OperatorUIService = new Mock<IOperatorUIService>();
protected readonly Mock<IContractUIService> ContractUIService = new Mock<IContractUIService>();
/// <summary>
/// Minimal test double for NavigationManager.
/// Register in DI as NavigationManager so components receive it in tests.
Expand Down
455 changes: 198 additions & 257 deletions EstateManagementUI.BlazorServer.Tests/Pages/Contracts/ContractsEditPageTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

101 changes: 58 additions & 43 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 @@ -5,12 +5,14 @@
using EstateManagementUI.BlazorServer.Tests.Pages.FileProcessing;
using EstateManagementUI.BusinessLogic.Models;
using EstateManagementUI.BusinessLogic.Requests;
using EstateManagementUI.BlazorServer.Models;
using MediatR;
using Microsoft.AspNetCore.Components;
using Microsoft.Extensions.DependencyInjection;
using Moq;
using Shouldly;
using SimpleResults;
using TransactionProcessor.DataTransferObjects.Responses.Contract;
using ContractsIndex = EstateManagementUI.BlazorServer.Components.Pages.Contracts.Index;

namespace EstateManagementUI.BlazorServer.Tests.Pages.Contracts;
Expand All @@ -21,19 +23,19 @@ public class ContractsIndexPageTests : BaseTest
public void ContractsIndex_RendersCorrectly()
{
// Arrange
List<ContractModel> contracts = new List<ContractModel>
List<ContractModels.ContractModel> contracts = new()
{
new ContractModel
new ContractModels.ContractModel
{
ContractId = Guid.NewGuid(),
Description = "Test Contract",
OperatorName = "Test Operator",
OperatorId = Guid.NewGuid(),
Products = new List<ContractProductModel>()
Products = new List<ContractModels.ContractProductModel>()
}
};

_mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetContractsQuery>(), default))
this.ContractUIService.Setup(c => c.GetContracts(It.IsAny<CorrelationId>(), It.IsAny<Guid>()))
.ReturnsAsync(Result.Success(contracts));

// Act
Expand All @@ -47,10 +49,10 @@ public void ContractsIndex_RendersCorrectly()
public void ContractsIndex_WithNoContracts_ShowsEmptyState()
{
// Arrange
List<ContractModel> emptyList = new List<ContractModel>();
_mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetContractsQuery>(), default))
List<ContractModels.ContractModel> emptyList = new();
this.ContractUIService.Setup(c => c.GetContracts(It.IsAny<CorrelationId>(), It.IsAny<Guid>()))
.ReturnsAsync(Result.Success(emptyList));

// Act
IRenderedComponent<ContractsIndex> cut = RenderComponent<ContractsIndex>();

Expand All @@ -62,29 +64,29 @@ public void ContractsIndex_WithNoContracts_ShowsEmptyState()
public void ContractsIndex_WithContracts_DisplaysContractList()
{
// Arrange
List<ContractModel> contracts = new List<ContractModel>
List<ContractModels.ContractModel> contracts = new()
{
new ContractModel
new ContractModels.ContractModel
{
ContractId = Guid.NewGuid(),
Description = "Contract 1",
OperatorName = "Operator A",
OperatorId = Guid.NewGuid(),
Products = new List<ContractProductModel>()
Products = new List<ContractModels.ContractProductModel>()
},
new ContractModel
new ContractModels.ContractModel
{
ContractId = Guid.NewGuid(),
Description = "Contract 2",
OperatorName = "Operator B",
OperatorId = Guid.NewGuid(),
Products = new List<ContractProductModel>()
Products = new List<ContractModels.ContractProductModel>()
}
};
_mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetContractsQuery>(), default))

this.ContractUIService.Setup(c => c.GetContracts(It.IsAny<CorrelationId>(), It.IsAny<Guid>()))
.ReturnsAsync(Result.Success(contracts));

// Act
IRenderedComponent<ContractsIndex> cut = RenderComponent<ContractsIndex>();

Expand All @@ -99,25 +101,24 @@ public void ContractsIndex_WithContracts_DisplaysContractList()
public void ContractsIndex_DisplaysProductCount()
{
// Arrange
List<ContractModel> contracts = new List<ContractModel>
List<ContractModels.ContractModel> contracts = new()
{
new ContractModel
new ContractModels.ContractModel
{
ContractId = Guid.NewGuid(),
Description = "Test Contract",
OperatorName = "Test Operator",
OperatorId = Guid.NewGuid(),
Products = new List<ContractProductModel>
{
new ContractProductModel { ContractProductId = Guid.NewGuid(), ProductName = "Product 1", ProductType = "NotSet"},
new ContractProductModel { ContractProductId = Guid.NewGuid(), ProductName = "Product 2", ProductType = "NotSet" }
}
Products = [
new ContractModels.ContractProductModel { ContractProductId = Guid.NewGuid(), ProductName = "Product 1", ProductType = ProductType.NotSet },
new ContractModels.ContractProductModel { ContractProductId = Guid.NewGuid(), ProductName = "Product 2", ProductType = ProductType.NotSet }
]
}
};
_mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetContractsQuery>(), default))

this.ContractUIService.Setup(c => c.GetContracts(It.IsAny<CorrelationId>(), It.IsAny<Guid>()))
.ReturnsAsync(Result.Success(contracts));

// Act
IRenderedComponent<ContractsIndex> cut = RenderComponent<ContractsIndex>();

Expand All @@ -129,9 +130,9 @@ public void ContractsIndex_DisplaysProductCount()
public void ContractsIndex_HasCorrectPageTitle()
{
// Arrange
_mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetContractsQuery>(), default))
.ReturnsAsync(Result.Success(new List<ContractModel>()));
this.ContractUIService.Setup(c => c.GetContracts(It.IsAny<CorrelationId>(), It.IsAny<Guid>()))
.ReturnsAsync(Result.Success(new List<ContractModels.ContractModel>()));

// Act
IRenderedComponent<ContractsIndex> cut = RenderComponent<ContractsIndex>();

Expand All @@ -140,13 +141,27 @@ public void ContractsIndex_HasCorrectPageTitle()
pageTitle.Instance.ChildContent.ShouldNotBeNull();
}

[Fact]
public void ContractsIndex_LoadContractFails_NavigatesToError()
{
// Arrange
this.ContractUIService.Setup(c => c.GetContracts(It.IsAny<CorrelationId>(), It.IsAny<Guid>()))
.ReturnsAsync(Result.Failure());

// Act
IRenderedComponent<ContractsIndex> cut = RenderComponent<ContractsIndex>();

// Assert
_fakeNavigationManager.Uri.ShouldContain("error");
}

[Fact]
public void ContractsIndex_AddNewContractButton_NavigatesToNewContractPage()
{
// Arrange
_mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetContractsQuery>(), default))
.ReturnsAsync(Result.Success(new List<ContractModel>()));
this.ContractUIService.Setup(c => c.GetContracts(It.IsAny<CorrelationId>(), It.IsAny<Guid>()))
.ReturnsAsync(Result.Success(new List<ContractModels.ContractModel>()));

IRenderedComponent<ContractsIndex> cut = RenderComponent<ContractsIndex>();
cut.WaitForAssertion(() => cut.Markup.ShouldContain("Contract Management"), timeout: TimeSpan.FromSeconds(5));

Expand All @@ -163,21 +178,21 @@ public void ContractsIndex_ViewButton_NavigatesToContractDetails()
{
// Arrange
Guid contractId = Guid.NewGuid();
List<ContractModel> contracts = new List<ContractModel>
List<ContractModels.ContractModel> contracts = new()
{
new ContractModel
new ContractModels.ContractModel
{
ContractId = contractId,
Description = "Test Contract",
OperatorName = "Test Operator",
OperatorId = Guid.NewGuid(),
Products = new List<ContractProductModel>()
Products = new List<ContractModels.ContractProductModel>()
}
};
_mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetContractsQuery>(), default))

this.ContractUIService.Setup(c => c.GetContracts(It.IsAny<CorrelationId>(), It.IsAny<Guid>()))
.ReturnsAsync(Result.Success(contracts));

IRenderedComponent<ContractsIndex> cut = RenderComponent<ContractsIndex>();
cut.WaitForAssertion(() => cut.Markup.ShouldContain("Test Contract"), timeout: TimeSpan.FromSeconds(5));

Expand All @@ -196,21 +211,21 @@ public void ContractsIndex_EditButton_NavigatesToEditContractPage()
{
// Arrange
Guid contractId = Guid.NewGuid();
List<ContractModel> contracts = new List<ContractModel>
List<ContractModels.ContractModel> contracts = new()
{
new ContractModel
new ContractModels.ContractModel
{
ContractId = contractId,
Description = "Test Contract",
OperatorName = "Test Operator",
OperatorId = Guid.NewGuid(),
Products = new List<ContractProductModel>()
Products = new List<ContractModels.ContractProductModel>()
}
};
_mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetContractsQuery>(), default))

this.ContractUIService.Setup(c => c.GetContracts(It.IsAny<CorrelationId>(), It.IsAny<Guid>()))
.ReturnsAsync(Result.Success(contracts));

IRenderedComponent<ContractsIndex> cut = RenderComponent<ContractsIndex>();
cut.WaitForAssertion(() => cut.Markup.ShouldContain("Test Contract"), timeout: TimeSpan.FromSeconds(5));

Expand Down
Loading
Loading