DP-556 - OrganisationType implemented (#714)

* DP-556 - OrganisationType (or rather OperationType) implemented
* DP-556 - Fixed return type to IList; Basic test coverage added
* DP-556 - OperationTypes test fixed
* DP-566 - Enum values fixed
* DP-566 - Tests parallel execution fixed
* DP-556 - Bad merge remains removed

Frontend/CO.CDP.OrganisationApp.Tests/Pages/Supplier/SupplierBasicInformationTest.cs

@@ -37,7 +37,7 @@ public async Task OnGet_SetSupplierInformation()
         _model.SupplierInformation.Should().Be(supplierInfo);
         _model.SupplierInformation?.OperationTypes.Should().NotBeNull();
         _model.SupplierInformation?.OperationTypes.Should().BeOfType<List<OperationType>>();
-        _model.SupplierInformation?.OperationTypes.Should().Contain(OperationType.SmallorMediumSized);
+        _model.SupplierInformation?.OperationTypes.Should().Contain(OperationType.SmallOrMediumSized);
         _model.SupplierInformation?.OperationTypes.Should().Contain(OperationType.NonGovernmental);
     }
 

Frontend/CO.CDP.OrganisationApp.Tests/Pages/Supplier/SupplierDetailsFactory.cs

@@ -17,7 +17,7 @@ public static SupplierInformation CreateSupplierInformationClientModel(
         return new SupplierInformation(
             organisationName: "FakeOrg",
             supplierType: SupplierType.Organisation,
-            operationTypes: new List<OperationType>() { OperationType.SmallorMediumSized, OperationType.NonGovernmental },
+            operationTypes: new List<OperationType>() { OperationType.SmallOrMediumSized, OperationType.NonGovernmental },
             completedRegAddress: true,
             completedPostalAddress: completedPostalAddress,
             completedVat: true,

Frontend/CO.CDP.OrganisationApp.Tests/Pages/Supplier/SupplierOperationQuestionTest.cs

@@ -57,7 +57,7 @@ public async Task OnPost_ValidModelState_ReturnsRedirectToSupplierBasicInformati
     {
         var id = Guid.NewGuid();
         _model.Id = id;
-        _model.SelectedOperationTypes = new List<OperationType> { OperationType.SmallorMediumSized };
+        _model.SelectedOperationTypes = new List<OperationType> { OperationType.SmallOrMediumSized };
 
         _organisationClientMock.Setup(client => client.GetOrganisationAsync(id))
             .ReturnsAsync(SupplierDetailsFactory.GivenOrganisationClientModel(id));
@@ -89,7 +89,7 @@ public void ValidateModel_WithNoneAndOtherOperationTypes_ShouldReturnValidationE
             SelectedOperationTypes = new List<OperationType>
             {
                 OperationType.None,
-                OperationType.SmallorMediumSized
+                OperationType.SmallOrMediumSized
             }
         };
 

Frontend/CO.CDP.OrganisationApp/Constants/OperationTypes.cs

@@ -9,7 +9,7 @@ public static string Description(this OperationType operationType)
     {
         return operationType switch
         {
-            OperationType.SmallorMediumSized => "As a small or medium-sized enterprise",
+            OperationType.SmallOrMediumSized => "As a small or medium-sized enterprise",
             OperationType.NonGovernmental => "As a non-governmental organisation that is value-driven and which principally reinvests its surpluses to further social, environmental or cultural objectives",
             OperationType.SupportedEmploymentProvider => "As a supported employment provider",
             OperationType.PublicService => "As a public service mutual",
@@ -22,7 +22,7 @@ public static string ShortDescription(this OperationType operationType)
     {
         return operationType switch
         {
-            OperationType.SmallorMediumSized => "Small or medium-sized enterprise",
+            OperationType.SmallOrMediumSized => "Small or medium-sized enterprise",
             OperationType.NonGovernmental => "Non-governmental organisation ",
             OperationType.SupportedEmploymentProvider => "Supported employment provider",
             OperationType.PublicService => "Public service mutual",

Frontend/CO.CDP.OrganisationApp/Pages/Supplier/SupplierOperationQuestion.cshtml

@@ -40,9 +40,9 @@
                <div class="govuk-checkboxes" data-module="govuk-checkboxes">
                   <div class="govuk-checkboxes__item">
                      <input class="govuk-checkboxes__input" id="chkSmallOrMediumAized"
-                     name="SelectedOperationTypes" type="checkbox" value="@OperationType.SmallorMediumSized" @IsSelected(OperationType.SmallorMediumSized) />
+                     name="SelectedOperationTypes" type="checkbox" value="@OperationType.SmallOrMediumSized" @IsSelected(OperationType.SmallOrMediumSized) />
                      <label class="govuk-label govuk-checkboxes__label" for="chkSmallOrMediumAized">
-                     @OperationType.SmallorMediumSized.Description()
+                     @OperationType.SmallOrMediumSized.Description()
                      </label>
                   </div>
                   <details class="govuk-details" data-module="govuk-details">

Services/CO.CDP.DataSharing.WebApi.Tests/EntityFactory.cs

@@ -134,6 +134,13 @@ internal static List<ConnectedEntity> GetMockAdditionalEntities()
         return mockEntities;
     }
 
+    internal static IList<OperationType> GetOperationTypes()
+    {
+        var mockOperationType = new List<OperationType> { OperationType.SmallOrMediumSized };
+
+        return mockOperationType;
+    }
+
     public static Organisation GivenOrganisation(
         Guid? guid = null,
         Tenant? tenant = null,

Services/CO.CDP.DataSharing.WebApi.Tests/UseCase/GetSharedDataUseCaseTest.cs

@@ -88,13 +88,17 @@ public async Task ItReturnsMappedSupplierInformationWhenSharedConsentIsFound()
 
         var mockAssociatedPersons = EntityFactory.GetMockAssociatedPersons();
         var mockAdditionalEntities = EntityFactory.GetMockAdditionalEntities();
+        var mockOperationTypes = EntityFactory.GetOperationTypes();
 
         _organisationRepository.Setup(repo => repo.GetConnectedIndividualTrusts(organisationId))
                                .ReturnsAsync(mockAssociatedPersons);
 
         _organisationRepository.Setup(repo => repo.GetConnectedOrganisations(organisationId))
                                .ReturnsAsync(mockAdditionalEntities);
 
+        _organisationRepository.Setup(repo => repo.GetOperationTypes(organisationId))
+                               .ReturnsAsync(mockOperationTypes);
+
         return (shareCode, organisationId, organisationGuid, formId);
     }
 
@@ -172,6 +176,10 @@ private void AssertRoles(IEnumerable<PartyRole>? roles)
     private void AssertDetails(Details? details)
     {
         details.Should().NotBeNull();
+        details?.Scale.Should().Be("small");
+        details?.Vcse.Should().Be(false);
+        details?.ShelteredWorkshop.Should().Be(false);
+        details?.PublicServiceMissionOrganization.Should().Be(false);
     }
 
     private void AssertSupplierInformationData(SupplierInformationData? supplierInformationData)

Services/CO.CDP.DataSharing.WebApi/Model/Details.cs

@@ -3,6 +3,10 @@ namespace CO.CDP.DataSharing.WebApi.Model;
 public class Details
 {
     public LegalForm? LegalForm { get; set; }
+    public string? Scale { get; set; }
+    public bool Vcse { get; set; }
+    public bool ShelteredWorkshop { get; set; }
+    public bool PublicServiceMissionOrganization { get; set; }
 }
 
 public record LegalForm

Services/CO.CDP.DataSharing.WebApi/UseCase/GetSharedDataUseCase.cs

@@ -42,10 +42,15 @@ public class GetSharedDataUseCase(
     private async Task<Details> GetDetails(SharedConsent sharedConsent)
     {
         var legalForm = await organisationRepository.GetLegalForm(sharedConsent.OrganisationId);
+        var operationTypes = await organisationRepository.GetOperationTypes(sharedConsent.OrganisationId);
 
         return new Details
         {
-            LegalForm = legalForm != null ? mapper.Map<LegalForm>(legalForm) : null
+            LegalForm = legalForm != null ? mapper.Map<LegalForm>(legalForm) : null,
+            Scale = operationTypes.Contains(OperationType.SmallOrMediumSized) ? "small" : "large",
+            Vcse = operationTypes.Contains(OperationType.NonGovernmental),
+            ShelteredWorkshop = operationTypes.Contains(OperationType.SupportedEmploymentProvider),
+            PublicServiceMissionOrganization = operationTypes.Contains(OperationType.PublicService)
         };
     }
 

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

@@ -375,6 +375,43 @@ public async Task GetConnectedOrganisations_WhenNoConnectedEntitiesExist_Returns
         result.Should().BeEmpty();
     }
 
+    [Fact]
+    public async Task GetOperationTypes_WhenNoOperationTypeExists_ReturnsNull()
+    {
+        using var repository = OrganisationRepository();
+
+        var organisation = GivenOrganisation();
+        organisation.SupplierInfo = GivenSupplierInformation();
+        organisation.SupplierInfo.OperationTypes = [];
+
+        using var context = postgreSql.OrganisationInformationContext();
+        await context.Organisations.AddAsync(organisation);
+        await context.SaveChangesAsync();
+
+        var result = await repository.GetOperationTypes(organisation.Id);
+
+        result.Should().BeEmpty();
+    }
+
+    [Fact]
+    public async Task GetOperationTypes_WhenOperationTypeExists_ReturnsEmptyList()
+    {
+        using var repository = OrganisationRepository();
+
+        var organisation = GivenOrganisation();
+        organisation.SupplierInfo = GivenSupplierInformation();
+        organisation.SupplierInfo.OperationTypes = [OperationType.SmallOrMediumSized];
+
+        using var context = postgreSql.OrganisationInformationContext();
+        await context.Organisations.AddAsync(organisation);
+        await context.SaveChangesAsync();
+
+        var result = await repository.GetOperationTypes(organisation.Id);
+
+        result.Should().NotBeNull();
+        result.Should().Contain(OperationType.SmallOrMediumSized);
+    }
+
     private IOrganisationRepository OrganisationRepository()
     {
         return new DatabaseOrganisationRepository(postgreSql.OrganisationInformationContext());

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

@@ -118,6 +118,16 @@ public async Task<IList<ConnectedEntity>> GetConnectedOrganisations(int organisa
         return organisation?.SupplierInfo?.LegalForm;
     }
 
+    public async Task<IList<OperationType>> GetOperationTypes(int organisationId)
+    {
+        var organisation = await context.Organisations
+            .Where(x => x.Id == organisationId)
+            .Include(x => x.SupplierInfo)
+            .FirstOrDefaultAsync();
+
+        return organisation?.SupplierInfo?.OperationTypes ?? [];
+    }
+
     public void Save(Organisation organisation)
     {
         try

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

@@ -31,4 +31,6 @@ public class DuplicateOrganisationException(string message, Exception? cause = n
     public Task<IList<ConnectedEntity>> GetConnectedOrganisations(int organisationId);
 
     public Task<Organisation.LegalForm?> GetLegalForm(int organisationId);
+
+    public Task<IList<OperationType>> GetOperationTypes(int organisationId);
 }

Services/CO.CDP.OrganisationInformation/OperationType.cs

@@ -5,7 +5,7 @@ namespace CO.CDP.OrganisationInformation;
 [JsonConverter(typeof(JsonStringEnumConverter))]
 public enum OperationType
 {
-    SmallorMediumSized = 1,
+    SmallOrMediumSized,
     NonGovernmental,
     SupportedEmploymentProvider,
     PublicService,