dp-943 Update the tenant/lookup endpoint to return the organisation type

Frontend/CO.CDP.OrganisationApp.Tests/AuthorizationTests.cs

@@ -32,6 +32,7 @@ private HttpClient BuildHttpClient(List<string> userOrganisationScopes, List<str
         var organisation = new UserOrganisation(
                                     id: OrganisationId,
                                     name: "Org name",
+                                    type: Tenant.WebApiClient.OrganisationType.Organisation,
                                     roles:
                                     [
                                         Tenant.WebApiClient.PartyRole.Supplier,

Frontend/CO.CDP.OrganisationApp.Tests/LocalizationTests.cs

@@ -35,7 +35,7 @@ private HttpClient BuildHttpClient()
 
         session
             .Setup(s => s.Get<RegistrationDetails>(Session.RegistrationDetailsKey))
-            .Returns(new RegistrationDetails() { OrganisationType = OrganisationType.Supplier, OrganisationScheme = "Whatever" });
+            .Returns(new RegistrationDetails() { OrganisationType = Constants.OrganisationType.Supplier, OrganisationScheme = "Whatever" });
 
         var antiforgery = new Mock<IAntiforgery>();
 
@@ -60,7 +60,8 @@ private HttpClient BuildHttpClient()
                 services.AddSingleton(antiforgery.Object);
                 services.AddSingleton(tenantClient.Object);
                 services.AddTransient<IAuthenticationSchemeProvider, FakeSchemeProvider>();
-                services.Configure<OpenIdConnectOptions>(OpenIdConnectDefaults.AuthenticationScheme, options => {
+                services.Configure<OpenIdConnectOptions>(OpenIdConnectDefaults.AuthenticationScheme, options =>
+                {
                     options.ClientId = "123";
                     options.Authority = "https://whatever";
                 });
@@ -189,6 +190,7 @@ public async Task OrganisationNamePage_DisplaysErrorMessageCorrectly_WhenLanguag
                     new UserOrganisation(
                         id: Guid.NewGuid(),
                         name: "Acme Ltd",
+                        type: Tenant.WebApiClient.OrganisationType.Organisation,
                         roles: [PartyRole.Tenderer],
                         pendingRoles: [],
                         scopes: ["ADMIN"],

Frontend/CO.CDP.OrganisationApp.Tests/UserInfoServiceTest.cs

@@ -3,6 +3,7 @@
 using FluentAssertions;
 using Microsoft.AspNetCore.Http;
 using Moq;
+using OrganisationType = CO.CDP.Tenant.WebApiClient.OrganisationType;
 
 namespace CO.CDP.OrganisationApp.Tests;
 
@@ -242,11 +243,13 @@ private static UserOrganisation GivenUserOrganisation(
         string? name = null,
         ICollection<string>? scopes = null,
         ICollection<PartyRole>? roles = null,
-        ICollection<PartyRole>? pendingRoles = null)
+        ICollection<PartyRole>? pendingRoles = null,
+        OrganisationType type = OrganisationType.Organisation)
     {
         return new UserOrganisation(
             id: id ?? Guid.NewGuid(),
             name: name,
+            type: type,
             pendingRoles: pendingRoles,
             roles: roles,
             scopes: scopes,

Services/CO.CDP.Organisation.Authority.Tests/TokenServiceTest.cs

@@ -257,6 +257,7 @@ private TenantLookup GetTenantLookup(int numberOfTenant = 1, int numberOfOrgsPer
                     {
                         Id = Guid.NewGuid(),
                         Name = $"Test Org{x}{y}",
+                        Type = OrganisationInformation.OrganisationType.Organisation,
                         Roles = [OrganisationInformation.PartyRole.Buyer],
                         PendingRoles = [],
                         Scopes = ["Admin"]

Services/CO.CDP.OrganisationInformation.Persistence.Tests/DatabasePersonTenantLookupTest.cs

@@ -81,6 +81,7 @@ public async Task ItFindsThePersonWithAllTheirTenants()
                         {
                             Id = acmeCoOrganisation.Guid,
                             Name = acmeCoOrganisation.Name,
+                            Type = acmeCoOrganisation.Type,
                             Roles = acmeCoOrganisation.Roles,
                             PendingRoles = acmeCoOrganisation.PendingRoles,
                             Scopes = adminPersonScopes
@@ -113,6 +114,7 @@ public async Task ItFindsThePersonWithAllTheirTenants()
                         {
                             Id = widgetCoOrganisation.Guid,
                             Name = widgetCoOrganisation.Name,
+                            Type = widgetCoOrganisation.Type,
                             Roles = widgetCoOrganisation.Roles,
                             PendingRoles = widgetCoOrganisation.PendingRoles,
                             Scopes = userPersonScopes
@@ -159,6 +161,7 @@ public async Task ItFindsThePersonWithAllTheirTenants()
                         {
                             Id = acmeCoOrganisation.Guid,
                             Name = acmeCoOrganisation.Name,
+                            Type = acmeCoOrganisation.Type,
                             Roles = acmeCoOrganisation.Roles,
                             PendingRoles = acmeCoOrganisation.PendingRoles,
                             Scopes = []

Services/CO.CDP.OrganisationInformation.Persistence/DatabaseTenantRepository.cs

@@ -51,6 +51,7 @@ public void Save(Tenant tenant)
                          {
                              Id = o.Guid,
                              Name = o.Name,
+                             Type = o.Type,
                              Roles = o.Roles,
                              PendingRoles = o.PendingRoles,
                              // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract

Services/CO.CDP.OrganisationInformation.Persistence/TenantLookup.cs

@@ -25,6 +25,7 @@ public class Organisation
     {
         public required Guid Id { get; init; }
         public required string Name { get; init; }
+        public required OrganisationType Type { get; init; }
         public required List<PartyRole> Roles { get; init; }
         public required List<PartyRole> PendingRoles { get; init; }
         public required List<string> Scopes { get; init; }

Services/CO.CDP.OrganisationInformation/TenantLookup.cs

@@ -41,6 +41,8 @@ public record UserOrganisation
     /// <example>"Acme Group Ltd"</example>
     public required string Name { get; init; }
 
+    public required OrganisationType Type { get; init; }
+
     public required List<PartyRole> Roles { get; init; }
 
     public required List<PartyRole> PendingRoles { get; init; }

Services/CO.CDP.Tenant.WebApi.Tests/Api/TenantLookupTest.cs

@@ -97,6 +97,7 @@ private static TenantLookup GivenTenantLookup()
                         {
                             Id = Guid.Parse("dfd0c5d3-0740-4be4-aa42-e42ec9c00bad"),
                             Name = "Acme Ltd",
+                            Type = OrganisationType.Organisation,
                             Roles = [PartyRole.Tenderer],
                             PendingRoles = [],
                             Scopes = ["ADMIN"],

Services/CO.CDP.Tenant.WebApi.Tests/UseCase/LookupTenantUseCaseTest.cs

@@ -54,6 +54,7 @@ public async Task Execute_IfTenantIsFound_ReturnsTenant()
                         {
                             Id = Guid.Parse("dfd0c5d3-0740-4be4-aa42-e42ec9c00bad"),
                             Name = "Acme Ltd",
+                            Type= OrganisationType.Organisation,
                             Roles = [PartyRole.Tenderer],
                             PendingRoles = [PartyRole.Buyer],
                             Scopes = ["ADMIN"]
@@ -89,6 +90,7 @@ public async Task Execute_IfTenantIsFound_ReturnsTenant()
                         {
                             Id = Guid.Parse("dfd0c5d3-0740-4be4-aa42-e42ec9c00bad"),
                             Name = "Acme Ltd",
+                            Type = OrganisationType.Organisation,
                             Roles = [PartyRole.Tenderer],
                             PendingRoles = [PartyRole.Buyer],
                             Scopes = ["ADMIN"],