dp-836 create consortium using create organisation endpoint (#1018)

* dp-836 create consortium using create organisation endpoint * Fixed unit test * PR update * remove warning
cabinetoffice · Dec 6, 2024 · 8da7808 · 8da7808
1 parent 3d86871
commit 8da7808
Show file tree

Hide file tree

Showing 70 changed files with 2,306 additions and 152 deletions.
diff --git a/....CDP.OrganisationApp.Tests/Pages/Organisation/OrganisationRegisterSupplierAsBuyerTests.cs b/....CDP.OrganisationApp.Tests/Pages/Organisation/OrganisationRegisterSupplierAsBuyerTests.cs
@@ -30,7 +30,7 @@ public async Task ShouldRedirectToSupplierToBuyerOrganisationType_WhenOrganisati
 
         var initialState = new SupplierToBuyerDetails
         {
-            OrganisationType = OrganisationType.Supplier
+            OrganisationType = Constants.OrganisationType.Supplier
         };
         tempDataServiceMock
             .Setup(t => t.PeekOrDefault<SupplierToBuyerDetails>(It.IsAny<string>()))
@@ -39,7 +39,7 @@ public async Task ShouldRedirectToSupplierToBuyerOrganisationType_WhenOrganisati
         var result = await _model.OnGet(orgGuid);
 
         tempDataServiceMock.Verify(t => t.Put(It.IsAny<string>(), It.Is<SupplierToBuyerDetails>(state =>
-            state.OrganisationType == OrganisationType.Supplier
+            state.OrganisationType == Constants.OrganisationType.Supplier
         )), Times.Once);
 
         var redirectResult = result.Should().BeOfType<RedirectToPageResult>().Subject;
@@ -78,7 +78,7 @@ public async Task ShouldUpdateStateCorrectly_WhenOrganisationIsTenderer()
         await _model.OnGet(orgGuid);
 
         tempDataServiceMock.Verify(t => t.Put(It.IsAny<string>(), It.Is<SupplierToBuyerDetails>(state =>
-            state.OrganisationType == OrganisationType.Supplier
+            state.OrganisationType == Constants.OrganisationType.Supplier
         )), Times.Once);
     }
 

diff --git a/...OrganisationApp.Tests/Pages/Organisation/SupplierToBuyerOrganisationDetailsSummaryTest.cs b/...OrganisationApp.Tests/Pages/Organisation/SupplierToBuyerOrganisationDetailsSummaryTest.cs
@@ -47,7 +47,7 @@ public void OnGet_ShouldReturnPage_WhenStateIsValid()
     {
         var supplierToBuyerDetails = new SupplierToBuyerDetails
         {
-            OrganisationType = OrganisationType.Supplier,
+            OrganisationType = Constants.OrganisationType.Supplier,
             BuyerOrganisationType = "CentralGovernment",
             BuyerOrganisationOtherValue = null,
             Devolved = true,

diff --git a/...nd/CO.CDP.OrganisationApp.Tests/Pages/Registration/OrganisationDetailsSummaryModelTest.cs b/...nd/CO.CDP.OrganisationApp.Tests/Pages/Registration/OrganisationDetailsSummaryModelTest.cs
@@ -214,7 +214,7 @@ private RegistrationDetails DummyRegistrationDetails()
             OrganisationName = "TestOrg",
             OrganisationScheme = "TestType",
             OrganisationEmailAddress = "[email protected]",
-            OrganisationType = OrganisationType.Supplier,
+            OrganisationType = Constants.OrganisationType.Supplier,
         };
 
         return registrationDetails;

diff --git a/Frontend/CO.CDP.OrganisationApp/Pages/ContactUs.cshtml.cs b/Frontend/CO.CDP.OrganisationApp/Pages/ContactUs.cshtml.cs
@@ -1,14 +1,13 @@
 using CO.CDP.Localization;
-using CO.CDP.Organisation.WebApiClient;
 using CO.CDP.Mvc.Validation;
+using CO.CDP.Organisation.WebApiClient;
 using CO.CDP.OrganisationApp.Constants;
 using CO.CDP.OrganisationApp.Models;
 using CO.CDP.OrganisationApp.WebApiClients;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using CO.CDP.OrganisationApp.Models;
 
 namespace CO.CDP.OrganisationApp.Pages;
 

diff --git a/...d/CO.CDP.OrganisationApp/Pages/Organisation/OrganisationRegisterSupplierAsBuyer.cshtml.cs b/...d/CO.CDP.OrganisationApp/Pages/Organisation/OrganisationRegisterSupplierAsBuyer.cshtml.cs
@@ -24,7 +24,7 @@ public async Task<IActionResult> OnGet(Guid id)
         if (!orgInfo.Roles.Contains(PartyRole.Buyer))
         {
             var state = tempDataService.PeekOrDefault<SupplierToBuyerDetails>(SupplierToBuyerStateKey);
-            state.OrganisationType = orgInfo.IsTenderer() ? OrganisationType.Supplier : OrganisationType.Buyer;
+            state.OrganisationType = orgInfo.IsTenderer() ? Constants.OrganisationType.Supplier : Constants.OrganisationType.Buyer;
 
             tempDataService.Put(SupplierToBuyerStateKey, state);
 

diff --git a/Frontend/CO.CDP.OrganisationApp/Pages/Registration/OrganisationDetailsSummary.cshtml.cs b/Frontend/CO.CDP.OrganisationApp/Pages/Registration/OrganisationDetailsSummary.cshtml.cs
@@ -94,6 +94,7 @@ public async Task<IActionResult> OnPost()
                 legalName: details.OrganisationName,
                 scheme: details.OrganisationScheme),
             name: details.OrganisationName,
+            type: OrganisationWebApiClient.OrganisationType.Organisation,
             roles: [details.OrganisationType!.Value.AsPartyRole()],
             personId: user.PersonId.Value
         );

diff --git a/Frontend/CO.CDP.OrganisationApp/Pages/Registration/OrganisationType.cshtml b/Frontend/CO.CDP.OrganisationApp/Pages/Registration/OrganisationType.cshtml
@@ -16,7 +16,7 @@
         Model.RedirectToSummary = true;
     }
 
-    string IsSelected(OrganisationType radioValue)
+    string IsSelected(Constants.OrganisationType radioValue)
     {
         return Model.OrganisationType == radioValue ? "checked='checked'" : string.Empty;
     }
@@ -54,8 +54,8 @@
                         <div class="govuk-radios" data-module="govuk-radios">
                             <div class="govuk-radios__item">
                                 <input class="govuk-radios__input" id="buyer" name="OrganisationType"
-                                       type="radio" value="@OrganisationType.Buyer"
-                                       aria-describedby="buyer-hint" @IsSelected(OrganisationType.Buyer)>
+                                   type="radio" value="@Constants.OrganisationType.Buyer"
+                                   aria-describedby="buyer-hint" @IsSelected(Constants.OrganisationType.Buyer)>
                                 <label class="govuk-label govuk-radios__label" for="buyer">
                                     @StaticTextResource.OrganisationRegistration_OrganisationType_Buyer
                                 </label>
@@ -66,8 +66,8 @@
 
                             <div class="govuk-radios__item">
                                 <input class="govuk-radios__input" id="supplier" name="OrganisationType"
-                                       type="radio" value="@OrganisationType.Supplier"
-                                       aria-describedby="supplier-hint" @IsSelected(OrganisationType.Supplier)>
+                                   type="radio" value="@Constants.OrganisationType.Supplier"
+                                   aria-describedby="supplier-hint" @IsSelected(Constants.OrganisationType.Supplier)>
                                 <label class="govuk-label govuk-radios__label" for="supplier">
                                     @StaticTextResource.OrganisationRegistration_OrganisationType_Supplier
                                 </label>

diff --git a/Libraries/CO.CDP.Authentication.Tests/ApiKeyValidatorTest.cs b/Libraries/CO.CDP.Authentication.Tests/ApiKeyValidatorTest.cs
@@ -49,7 +49,10 @@ public async Task Validate_ValidApiKeyWithOrganisation_ReturnsTrue()
                 Name = "FTS",
                 Key = ValidApiKey,
                 OrganisationId = 42,
-                Organisation = new Organisation { Guid = orgId, Name = "", Tenant = new Tenant { Guid = Guid.NewGuid(), Name = "" } },
+                Organisation = new Organisation {
+                    Guid = orgId, Name = "",
+                    Type = OrganisationInformation.OrganisationType.Organisation,
+                    Tenant = new Tenant { Guid = Guid.NewGuid(), Name = "" } },
                 Scopes = ["ADMIN"] });
 
         var (valid, organisation, scopes) = await _validator.Validate(ValidApiKey);

diff --git a/Libraries/CO.CDP.Organisation.WebApiClient.Tests/OrganisationClientIntegrationTest.cs b/Libraries/CO.CDP.Organisation.WebApiClient.Tests/OrganisationClientIntegrationTest.cs
@@ -74,6 +74,7 @@ public async Task ItTalksToTheOrganisationApi()
             contactPoint: contactPoint,
             identifier: identifier,
             name: "New Organisation",
+            type: OrganisationType.Organisation,
             roles: roles
         );
 

diff --git a/Services/CO.CDP.DataSharing.WebApi.Tests/DataSharingFactory.cs b/Services/CO.CDP.DataSharing.WebApi.Tests/DataSharingFactory.cs
@@ -44,6 +44,7 @@ public static Organisation CreateOrganisation(
             Id = 1,
             Guid = Guid.NewGuid(),
             Name = "Test Organisation",
+            Type = OrganisationInformation.OrganisationType.Organisation,
             Tenant = new Tenant { Guid = Guid.NewGuid(), Name = "TestTenant" },
             Addresses = new List<OrganisationAddress>
             {
@@ -141,7 +142,7 @@ public static BasicInformation CreateMockBasicInformation()
             VatNumber = "VAT123456",
             WebsiteAddress = "http://example.com",
             EmailAddress = "[email protected]",
-            OrganisationType = OrganisationType.Supplier,
+            OrganisationType = Model.OrganisationType.Supplier,
             LegalForm = new BasicLegalForm
             {
                 RegisteredLegalForm = "Private Limited",

diff --git a/Services/CO.CDP.DataSharing.WebApi.Tests/EntityFactory.cs b/Services/CO.CDP.DataSharing.WebApi.Tests/EntityFactory.cs
@@ -237,6 +237,7 @@ public static Organisation GivenOrganisation(
         {
             Guid = theGuid,
             Name = theName,
+            Type = OrganisationInformation.OrganisationType.Organisation,
             Tenant = tenant ?? GivenTenant(name: theName),
 
             Identifiers = identifiers ??

diff --git a/Services/CO.CDP.DataSharing.WebApi/DataService/DataService.cs b/Services/CO.CDP.DataSharing.WebApi/DataService/DataService.cs
@@ -172,8 +172,8 @@ public static BasicInformation MapToBasicInformation(Organisation organisation)
             : null;
 
         var organisationType = organisation.Roles.Contains(PartyRole.Tenderer)
-            ? OrganisationType.Supplier
-            : OrganisationType.Buyer;
+            ? Model.OrganisationType.Supplier
+            : Model.OrganisationType.Buyer;
 
         return new BasicInformation
         {

diff --git a/Services/CO.CDP.DataSharing.WebApi/Program.cs b/Services/CO.CDP.DataSharing.WebApi/Program.cs
@@ -14,6 +14,7 @@
 using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.EntityFrameworkCore;
+using Npgsql;
 using System.Globalization;
 using System.Reflection;
 
@@ -41,14 +42,18 @@
     options.RequestCultureProviders.Insert(0, new AcceptLanguageHeaderRequestCultureProvider());
 });
 
-builder.Services.AddHealthChecks()
-    .AddNpgSql(ConnectionStringHelper.GetConnectionString(builder.Configuration, "OrganisationInformationDatabase"));
-
 builder.Services.AddTransient(typeof(LocalizedPropertyResolver<,>));
 builder.Services.AddAutoMapper(typeof(DataSharingProfile));
 
-builder.Services.AddDbContext<OrganisationInformationContext>(o =>
-    o.UseNpgsql(ConnectionStringHelper.GetConnectionString(builder.Configuration, "OrganisationInformationDatabase")));
+var connectionString = ConnectionStringHelper.GetConnectionString(builder.Configuration, "OrganisationInformationDatabase");
+builder.Services.AddHealthChecks().AddNpgSql(connectionString);
+builder.Services.AddSingleton(new NpgsqlDataSourceBuilder(connectionString).MapEnums().Build());
+builder.Services.AddDbContext<OrganisationInformationContext>((sp, options) =>
+{
+    var dataSource = sp.GetRequiredService<NpgsqlDataSource>();
+    options.UseNpgsql(dataSource);
+});
+
 builder.Services.AddScoped<IDataService, DataService>();
 builder.Services.AddScoped<IPdfGenerator, PdfGenerator>();
 builder.Services.AddScoped<IClaimService, ClaimService>();

diff --git a/Services/CO.CDP.Forms.WebApi/Program.cs b/Services/CO.CDP.Forms.WebApi/Program.cs
@@ -13,6 +13,7 @@
 using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.EntityFrameworkCore;
+using Npgsql;
 using System.Globalization;
 using System.Reflection;
 
@@ -40,16 +41,20 @@
     options.RequestCultureProviders.Insert(0, new AcceptLanguageHeaderRequestCultureProvider());
 });
 
-builder.Services.AddHealthChecks()
-    .AddNpgSql(ConnectionStringHelper.GetConnectionString(builder.Configuration, "OrganisationInformationDatabase"));
-
 builder.Services.AddTransient(typeof(LocalizedPropertyResolver<,>));
 builder.Services.AddAutoMapper(typeof(WebApiToPersistenceProfile));
 
 builder.Services.AddProblemDetails();
 
-builder.Services.AddDbContext<OrganisationInformationContext>(o =>
-    o.UseNpgsql(ConnectionStringHelper.GetConnectionString(builder.Configuration, "OrganisationInformationDatabase")));
+var connectionString = ConnectionStringHelper.GetConnectionString(builder.Configuration, "OrganisationInformationDatabase");
+builder.Services.AddHealthChecks().AddNpgSql(connectionString);
+builder.Services.AddSingleton(new NpgsqlDataSourceBuilder(connectionString).MapEnums().Build());
+builder.Services.AddDbContext<OrganisationInformationContext>((sp, options) =>
+{
+    var dataSource = sp.GetRequiredService<NpgsqlDataSource>();
+    options.UseNpgsql(dataSource);
+});
+
 builder.Services.AddScoped<IFormRepository, DatabaseFormRepository>();
 builder.Services.AddScoped<IOrganisationRepository, DatabaseOrganisationRepository>();
 builder.Services.AddScoped<IPersonRepository, DatabasePersonRepository>();

diff --git a/Services/CO.CDP.Organisation.Authority/Program.cs b/Services/CO.CDP.Organisation.Authority/Program.cs
@@ -7,20 +7,26 @@
 using CO.CDP.Organisation.Authority.AutoMapper;
 using CO.CDP.OrganisationInformation.Persistence;
 using Microsoft.EntityFrameworkCore;
+using Npgsql;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.ConfigureForwardedHeaders();
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen(o => { o.DocumentApi(builder.Configuration); });
-builder.Services.AddHealthChecks()
-    .AddNpgSql(ConnectionStringHelper.GetConnectionString(builder.Configuration, "OrganisationInformationDatabase"));
 builder.Services.AddProblemDetails();
 
 builder.Services.AddAutoMapper(typeof(WebApiToPersistenceProfile));
 
-builder.Services.AddDbContext<OrganisationInformationContext>(o =>
-    o.UseNpgsql(ConnectionStringHelper.GetConnectionString(builder.Configuration, "OrganisationInformationDatabase")));
+var connectionString = ConnectionStringHelper.GetConnectionString(builder.Configuration, "OrganisationInformationDatabase");
+builder.Services.AddHealthChecks().AddNpgSql(connectionString);
+builder.Services.AddSingleton(new NpgsqlDataSourceBuilder(connectionString).MapEnums().Build());
+builder.Services.AddDbContext<OrganisationInformationContext>((sp, options) =>
+{
+    var dataSource = sp.GetRequiredService<NpgsqlDataSource>();
+    options.UseNpgsql(dataSource);
+});
+
 builder.Services.AddScoped<IPersonRepository, DatabasePersonRepository>();
 builder.Services.AddScoped<ITenantRepository, DatabaseTenantRepository>();
 builder.Services.AddScoped<IAuthorityRepository, DatabaseAuthorityRepository>();

diff --git a/Services/CO.CDP.Organisation.WebApi.Tests/Api/OrganisationEndpointsTests.cs b/Services/CO.CDP.Organisation.WebApi.Tests/Api/OrganisationEndpointsTests.cs
@@ -325,6 +325,7 @@ private static RegisterOrganisation GivenRegisterOrganisationCommand()
         {
             Name = "TheOrganisation",
             PersonId = Guid.NewGuid(),
+            Type = OrganisationType.Organisation,
             Identifier = new OrganisationIdentifier
             {
                 Scheme = "ISO9001",

diff --git a/Services/CO.CDP.Organisation.WebApi.Tests/AutoMapper/ReviewStatusResolverTests.cs b/Services/CO.CDP.Organisation.WebApi.Tests/AutoMapper/ReviewStatusResolverTests.cs
@@ -55,6 +55,7 @@ private static OrganisationInformation.Persistence.Organisation GivenOrganisatio
             Guid = Guid.NewGuid(),
             Tenant = new OrganisationInformation.Persistence.Tenant { Guid = new Guid(), Name = "Tenant" },
             Name = "Org name",
+            Type = OrganisationType.Organisation,
             PendingRoles = (pendingRoles != null) ? pendingRoles : [],
             ReviewedBy = (reviewedBy != null) ? reviewedBy : null
         };

diff --git a/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/AssignIdentifierUseCaseTest.cs b/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/AssignIdentifierUseCaseTest.cs
@@ -416,6 +416,7 @@ private Persistence.Organisation GivenOrganisationExist(
         var organisation = new Persistence.Organisation
         {
             Name = "Acme Ltd",
+            Type = OrganisationInformation.OrganisationType.Organisation,
             Guid = organisationId,
             Identifiers = identifiers ?? [],
             Addresses = [],

diff --git a/...ices/CO.CDP.Organisation.WebApi.Tests/UseCase/CreateOrganisationJoinRequestUseCaseTest.cs b/...ices/CO.CDP.Organisation.WebApi.Tests/UseCase/CreateOrganisationJoinRequestUseCaseTest.cs
@@ -37,6 +37,7 @@ public CreateOrganisationJoinRequestUseCaseTests()
             Id = 1,
             Guid = new Guid(),
             Name = "Test organisation",
+            Type = OrganisationType.Organisation,
             Tenant = null!
         };
 

diff --git a/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/DeleteConnectedEntityUseCaseTest.cs b/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/DeleteConnectedEntityUseCaseTest.cs
@@ -70,7 +70,13 @@ await act.Should().ThrowAsync<UnknownConnectedEntityException>()
 
     private Persistence.Organisation Organisation()
     {
-        return new Persistence.Organisation { Guid = _organisationId, Name = "Test", Tenant = It.IsAny<Tenant>() };
+        return new Persistence.Organisation
+        {
+            Guid = _organisationId,
+            Name = "Test",
+            Type = OrganisationInformation.OrganisationType.Organisation,
+            Tenant = It.IsAny<Tenant>()
+        };
     }
 
     private Persistence.ConnectedEntity ConnectedEntity(Persistence.Organisation organisation)

diff --git a/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetAuthenticationKeyUseCaseTest.cs b/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetAuthenticationKeyUseCaseTest.cs
@@ -46,6 +46,7 @@ private static OrganisationInformation.Persistence.Organisation FakeOrganisation
             Guid = Orgid,
             Id = 1,
             Name = "FakeOrg",
+            Type = OrganisationInformation.OrganisationType.Organisation,
             Tenant = new Tenant
             {
                 Guid = Guid.NewGuid(),

diff --git a/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetMyOrganisationUseCaseTest.cs b/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetMyOrganisationUseCaseTest.cs
@@ -33,6 +33,7 @@ public async Task ItReturnsTheFoundOrganisation()
             Id = organisationId,
             Guid = organisationGuid,
             Name = "Test Organisation",
+            Type = OrganisationType.Organisation,
             Tenant = new Tenant
             {
                 Id = 101,

diff --git a/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetOrganisationUseCaseTest.cs b/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetOrganisationUseCaseTest.cs
@@ -32,6 +32,7 @@ public async Task ItReturnsTheFoundOrganisation()
             Id = 1,
             Guid = organisationId,
             Name = "Test Organisation",
+            Type = OrganisationType.Organisation,
             Tenant = new Tenant
             {
                 Id = 101,

diff --git a/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetOrganisationsUseCaseTest.cs b/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetOrganisationsUseCaseTest.cs
@@ -31,13 +31,15 @@ public async Task Execute_WithValidCommand_ReturnsMappedOrganisations()
             {
                 Guid = Guid.NewGuid(),
                 Name = "Organisation 2",
+                Type = OrganisationType.Organisation,
                 Tenant = null!
             }
         };
         organisations.Add(new CO.CDP.OrganisationInformation.Persistence.Organisation
         {
             Guid = Guid.NewGuid(),
             Name = "Organisation 1",
+            Type = OrganisationType.Organisation,
             Tenant = null!
         });
         var mappedOrganisations = new List<OrganisationExtended>

diff --git a/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetPersonsUseCaseTest.cs b/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetPersonsUseCaseTest.cs
@@ -62,7 +62,8 @@ public async Task Execute_OrganisationExistsAndHasPersons_ReturnsPersonModels()
             Id = 1,
             Guid = organisationGuid,
             Tenant = null!,
-            Name = null!
+            Name = null!,
+            Type = OrganisationInformation.OrganisationType.Organisation
         };
 
         var persons = new List<Person>

diff --git a/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetReviewsUseCaseTests.cs b/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetReviewsUseCaseTests.cs
@@ -61,6 +61,7 @@ private static OrganisationInformation.Persistence.Organisation GivenOrganisatio
             Id = 1,
             Guid = organisationId,
             Name = "Test Organisation",
+            Type = OrganisationInformation.OrganisationType.Organisation,
             Tenant = new Tenant {
                 Guid = new Guid(),
                 Name = "Tenant"

diff --git a/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetSupplierInformationUseCaseTest.cs b/Services/CO.CDP.Organisation.WebApi.Tests/UseCase/GetSupplierInformationUseCaseTest.cs
@@ -61,6 +61,7 @@ private static Persistence.Organisation FakeOrganisation(bool? withSupplierInfo
         {
             Guid = Guid.NewGuid(),
             Name = "FakeOrg",
+            Type = OrganisationInformation.OrganisationType.Organisation,
             Tenant = new Tenant
             {
                 Guid = Guid.NewGuid(),