Feature/dp 821 buyer approval tabs pagination

Frontend/CO.CDP.OrganisationApp.Tests/Pages/Shared/PaginationPartialModelTest.cs

@@ -0,0 +1,74 @@
+using CO.CDP.OrganisationApp.Pages.Shared;
+using FluentAssertions;
+using System.ComponentModel.DataAnnotations;
+
+public class PaginationPartialModelTests
+{
+    [Fact]
+    public void TotalPages_CalculatesCorrectly_WhenDivisible()
+    {
+        var model = new PaginationPartialModel
+        {
+            TotalItems = 100,
+            PageSize = 10,
+            CurrentPage = 1,
+            Url = "/test"
+        };
+
+        var totalPages = model.TotalPages;
+
+        totalPages.Should().Be(10);
+    }
+
+    [Fact]
+    public void TotalPages_CalculatesCorrectly_WhenNotDivisible()
+    {
+        var model = new PaginationPartialModel
+        {
+            TotalItems = 101,
+            PageSize = 10,
+            CurrentPage = 1,
+            Url = "/test"
+        };
+
+        var totalPages = model.TotalPages;
+
+        totalPages.Should().Be(11);
+    }
+
+    [Fact]
+    public void GetPageUrl_ReturnsCorrectUrl()
+    {
+        var model = new PaginationPartialModel
+        {
+            TotalItems = 100,
+            PageSize = 10,
+            CurrentPage = 1,
+            Url = "/test"
+        };
+
+        var pageUrl = model.GetPageUrl(2);
+
+        pageUrl.Should().Be("/test?pageNumber=2&pageSize=10");
+    }
+
+    [Fact]
+    public void Model_WithAllRequiredProperties_ShouldPassValidation()
+    {
+        var model = new PaginationPartialModel
+        {
+            CurrentPage = 1,
+            TotalItems = 100,
+            PageSize = 10,
+            Url = "/test"
+        };
+
+        var validationResults = new List<ValidationResult>();
+        var validationContext = new ValidationContext(model);
+
+        var isValid = Validator.TryValidateObject(model, validationContext, validationResults, true);
+
+        isValid.Should().BeTrue();
+        validationResults.Should().BeEmpty();
+    }
+}

Frontend/CO.CDP.OrganisationApp.Tests/Pages/Support/OrganisationsTest.cs

@@ -1,155 +1,114 @@
 using CO.CDP.Organisation.WebApiClient;
 using CO.CDP.OrganisationApp.Pages.Support;
 using FluentAssertions;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using Moq;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace CO.CDP.OrganisationApp.Tests.Pages.Support;
 
 public class OrganisationsModelTests
 {
-    private readonly Mock<IOrganisationClient> _organisationClientMock;
-    private readonly Mock<ISession> _sessionMock;
+    private readonly Mock<IOrganisationClient> _mockOrganisationClient;
+    private readonly Mock<ISession> _mockSession;
     private readonly OrganisationsModel _organisationsModel;
 
     public OrganisationsModelTests()
     {
-        _organisationClientMock = new Mock<IOrganisationClient>();
-        _sessionMock = new Mock<ISession>();
-        _organisationsModel = new OrganisationsModel(_organisationClientMock.Object, _sessionMock.Object);
+        _mockOrganisationClient = new Mock<IOrganisationClient>();
+        _mockSession = new Mock<ISession>();
+        _organisationsModel = new OrganisationsModel(_mockOrganisationClient.Object, _mockSession.Object);
     }
 
     [Fact]
-    public async Task OnGet_ValidType_SetsTitleAndOrganisations_ReturnsPageResult()
+    public async Task OnGet_SetsPropertiesCorrectly_ForBuyerType()
     {
-        var type = "buyer";
-        var orgs = new List<OrganisationExtended>
-        {
-            new OrganisationExtended(
-                additionalIdentifiers: new List<Identifier>
-                {
-                    new Identifier(
-                        id: "12345678",
-                        legalName: "Mock Legal Name 1",
-                        scheme: "GB-COH",
-                        uri: new Uri("http://example.com/1")
-                    )
-                },
-                addresses: new List<Address>
-                {
-                    new Address(
-                        country: "GB",
-                        countryName: "United Kingdom",
-                        locality: "Mock Town",
-                        postalCode: "MK1 1AB",
-                        region: "Mockshire",
-                        streetAddress: "123 Mock St",
-                        type: AddressType.Postal
-                    )
-                },
-                contactPoint: new ContactPoint(
-                    name: "John Doe",
-                    email: "[email protected]",
-                    telephone: "+441234567890",
-                    url: new Uri("http://example.com/contact")
-                ),
-                details: null,
-                id: Guid.NewGuid(),
-                identifier: new Identifier(
-                    id: "12345678",
-                    legalName: "Mock Legal Name 1",
-                    scheme: "GB-COH",
-                    uri: new Uri("http://example.com/1")
-                ),
-                name: "Mock Organisation 1",
-                type: OrganisationType.Organisation,
-                roles: new List<PartyRole> { PartyRole.Buyer, PartyRole.Supplier }
-            ),
-            new OrganisationExtended(
-                additionalIdentifiers: new List<Identifier>
-                {
-                    new Identifier(
-                        id: "87654321",
-                        legalName: "Mock Legal Name 2",
-                        scheme: "GB-COH",
-                        uri: new Uri("http://example.com/2")
-                    )
-                },
-                addresses: new List<Address>
-                {
-                    new Address(
-                        country: "GB",
-                        countryName: "United Kingdom",
-                        locality: "Testville",
-                        postalCode: "TS2 2XY",
-                        region: "Testshire",
-                        streetAddress: "456 Test Lane",
-                        type: AddressType.Postal
-                    )
-                },
-                contactPoint: new ContactPoint(
-                    name: "Jane Doe",
-                    email: "[email protected]",
-                    telephone: "+441234567892",
-                    url: new Uri("http://example.com/contact2")
-                ),
-                details: null,
-                id: Guid.NewGuid(),
-                identifier: new Identifier(
-                    id: "87654321",
-                    legalName: "Mock Legal Name 2",
-                    scheme: "GB-COH",
-                    uri: new Uri("http://example.com/2")
-                ),
-                name: "Mock Organisation 2",
-                type: OrganisationType.Organisation,
-                roles: new List<PartyRole> { PartyRole.Buyer }
-            )
-        };
-
-        _organisationClientMock.Setup(client => client.GetAllOrganisationsAsync(type, 1000, 0))
-            .ReturnsAsync(orgs);
+        string type = "buyer";
+        int pageNumber = 1;
+        int totalOrganisations = 25;
+        var organisations = new List<OrganisationExtended>();
+        _mockOrganisationClient.Setup(client => client.GetAllOrganisationsAsync(type, 10, 0)).ReturnsAsync(organisations);
+        _mockOrganisationClient.Setup(client => client.GetOrganisationsTotalCountAsync(type)).ReturnsAsync(totalOrganisations);
 
-        var result = await _organisationsModel.OnGet(type);
+        var result = await _organisationsModel.OnGet(type, pageNumber);
 
-        _organisationsModel.Type.Should().Be(type);
-        _organisationsModel.Title.Should().Be("Buyer organisations");
-        _organisationsModel.Organisations.Should().HaveCount(2);
         result.Should().BeOfType<PageResult>();
-
-        _organisationClientMock.Verify(client => client.GetAllOrganisationsAsync(type, 1000, 0), Times.Once);
+        _organisationsModel.Title.Should().Be("Buyer organisations");
+        _organisationsModel.PageSize.Should().Be(10);
+        _organisationsModel.CurrentPage.Should().Be(pageNumber);
+        _organisationsModel.TotalPages.Should().Be(3);
+        _organisationsModel.PageUrl.Should().Be("/support/organisations/buyer");
     }
 
     [Fact]
-    public async Task OnGet_EmptyOrganisations_ReturnsPageResultWithEmptyList()
+    public async Task OnGet_SetsPropertiesCorrectly_ForSupplierType()
     {
-        var type = "buyer";
-        var orgs = new List<OrganisationExtended>();
+        string type = "supplier";
+        int pageNumber = 2;
+        int totalOrganisations = 35;
+        var organisations = new List<OrganisationExtended>();
+        _mockOrganisationClient.Setup(client => client.GetAllOrganisationsAsync(type, 10, 10)).ReturnsAsync(organisations);
+        _mockOrganisationClient.Setup(client => client.GetOrganisationsTotalCountAsync(type)).ReturnsAsync(totalOrganisations);
 
-        _organisationClientMock.Setup(client => client.GetAllOrganisationsAsync(type, 1000, 0))
-            .ReturnsAsync(orgs);
+        var result = await _organisationsModel.OnGet(type, pageNumber);
 
-        var result = await _organisationsModel.OnGet(type);
-
-        _organisationsModel.Type.Should().Be(type);
-        _organisationsModel.Title.Should().Be("Buyer organisations");
-        _organisationsModel.Organisations.Should().BeEmpty();
         result.Should().BeOfType<PageResult>();
-
-        _organisationClientMock.Verify(client => client.GetAllOrganisationsAsync(type, 1000, 0), Times.Once);
+        _organisationsModel.Title.Should().Be("Supplier organisations");
+        _organisationsModel.PageSize.Should().Be(10);
+        _organisationsModel.CurrentPage.Should().Be(pageNumber);
+        _organisationsModel.TotalPages.Should().Be(4);
+        _organisationsModel.PageUrl.Should().Be("/support/organisations/supplier");
     }
 
     [Fact]
-    public async Task OnGet_ClientThrowsException_PropagatesException()
+    public void CombineIdentifiers_ReturnsCorrectList()
     {
-        var type = "supplier";
-        _organisationClientMock.Setup(client => client.GetAllOrganisationsAsync(type, 1000, 0))
-            .ThrowsAsync(new Exception("API error"));
+        var identifier = new Identifier(
+            id: "12345678",
+            legalName: "Mock Legal Name 1",
+            scheme: "GB-COH",
+            uri: new Uri("http://example.com/1")
+        );
+
+        var additionalIdentifiers = new List<Identifier>
+        {
+            new Identifier(
+                id: "12345678",
+                legalName: "Mock Legal Name 1",
+                scheme: "GB-COH",
+                uri: new Uri("http://example.com/1")
+            ),
+            new Identifier(
+                id: "12345678",
+                legalName: "Mock Legal Name 1",
+                scheme: "GB-COH",
+                uri: new Uri("http://example.com/1")
+            )
+        };
+
+        var result = OrganisationsModel.CombineIdentifiers(identifier, additionalIdentifiers);
+
+        result.Should().HaveCount(3);
+        result.Should().Contain(identifier);
+        result.Should().Contain(additionalIdentifiers[0]);
+        result.Should().Contain(additionalIdentifiers[1]);
+    }
 
-        Func<Task> act = async () => await _organisationsModel.OnGet(type);
+    [Fact]
+    public void CombineIdentifiers_HandlesNullIdentifier()
+    {
+        var additionalIdentifiers = new List<Identifier>
+        {
+            new Identifier(
+                id: "12345678",
+                legalName: "Mock Legal Name 1",
+                scheme: "GB-COH",
+                uri: new Uri("http://example.com/1")
+            )
+        };
 
-        await act.Should().ThrowAsync<Exception>().WithMessage("API error");
+        var result = OrganisationsModel.CombineIdentifiers(null, additionalIdentifiers);
 
-        _organisationClientMock.Verify(client => client.GetAllOrganisationsAsync(type, 1000, 0), Times.Once);
+        result.Should().HaveCount(1);
+        result[0].Id.Should().Be("12345678");
     }
-}
+}

Frontend/CO.CDP.OrganisationApp/Pages/Shared/PaginationPartialModel.cs

@@ -0,0 +1,24 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace CO.CDP.OrganisationApp.Pages.Shared
+{
+    public class PaginationPartialModel
+    {
+        [Required]
+        public required int CurrentPage { get; set; }
+
+        [Required]
+        public required int TotalItems { get; set; }
+
+        [Required]
+        public required int PageSize { get; set; }
+
+        [Required]
+        public required string Url { get; set; }
+
+        public int TotalPages => (int)Math.Ceiling((double)TotalItems / PageSize);
+
+        public Func<int, string> GetPageUrl => (page) =>
+            $"{Url}?pageNumber={page}&pageSize={PageSize}";
+    }
+}