Merge branch 'main' into Fix/docker-for-mac-fix-suggestion

Author: SamAinsworth-NHS

.azuredevops/pipelines/cd-infrastructure-sandbox-core.yaml

@@ -24,7 +24,7 @@ parameters:
     # PreProd pipeline which needs to retag images to move them from the Dev ACR to the Prod ACR
     displayName: 'Re-tag Images'
     type: boolean
-    default: true
+    default: false
 
   - name: dockerImageReTagFrom
     # Only required until commit hashes are passed in by calling pipeline
@@ -92,15 +92,7 @@ stages:
 - ${{ each testType in parameters.testTypes }}:
     - stage: ${{ testType }}_stage
       displayName: Run ${{ testType }} Tests
-      ${{ if eq(testType, 'regression_api') }}:
-        dependsOn: smoke_e2e_stage
-      ${{ if eq(testType, 'regression_e2e_epic1') }}:
-        dependsOn: regression_api_stage
-      ${{ if eq(testType, 'regression_e2e_epic2') }}:
-        dependsOn: regression_e2e_epic1_stage
-      ${{ if eq(testType, 'regression_e2e_epic3') }}:
-        dependsOn: regression_e2e_epic2_stage
-      condition: succeededOrFailed()
+      condition: always()
       jobs:
         - job: ${{ testType }}_job
           pool:

.github/workflows/stage-4-deploy.yaml

@@ -61,7 +61,7 @@ jobs:
       - name: Call deployment pipeline
         run: |
           # Define common variables
-          organisation='https://dev.azure.com/nhse-dtos/'
+          organisation='https://dev.azure.com/nhse-dtos'
           project_name='dtos-cohort-manager'
 
           # Define which tests to run based on the environment
@@ -86,4 +86,6 @@ jobs:
             --parameters $parameters \
             --output tsv --query id)
 
-          scripts/bash/wait_ado_pipeline.sh "$RUN_ID" https://dev.azure.com/nhse-dtos "${project_name}" 900
+          echo "Click here to view the ADO pipeline: ${organisation}/${project_name}/_build/results?buildId=${RUN_ID}"
+
+          scripts/bash/wait_ado_pipeline.sh "$RUN_ID" "${organisation}" "${project_name}" 1800

application/CohortManager/compose.core.yaml

@@ -289,6 +289,7 @@ services:
         - NemsDefaultEventTypes0=pds-record-change-1
         - NemsBypassServerCertificateValidation=true
         - DtOsDatabaseConnectionString=Server=db,1433;Database=${DB_NAME};User Id=SA;Password=${PASSWORD};TrustServerCertificate=True
+        - IsStubbed=true
       ports:
         - "9081:9081"
 

application/CohortManager/src/Functions/DemographicServices/ManageNemsSubscription/Program.cs

@@ -22,10 +22,15 @@
 
 X509Certificate2 nemsCertificate;
 
-
-// Load NEMS certificate up-front and inject into DI
-
-nemsCertificate = await nemsConfig.LoadNemsCertificateAsync(logger);
+if (nemsConfig.IsStubbed)
+{
+    logger.LogInformation("ManageNemsSubscription is running in stubbed mode; skipping certificate load.");
+    nemsCertificate = new X509Certificate2();
+}
+else
+{
+    nemsCertificate = await nemsConfig.LoadNemsCertificateAsync(logger);
+}
 
 
 host.ConfigureFunctionsWebApplication();

application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/MockedPDSData/patient-not-found.json

@@ -0,0 +1,19 @@
+{
+  "issue": [
+    {
+      "code": "not-found",
+      "details": {
+        "coding": [
+          {
+            "code": "RESOURCE_NOT_FOUND",
+            "display": "Resource not found",
+            "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode",
+            "version": "1"
+          }
+        ]
+      },
+      "severity": "information"
+    }
+  ],
+  "resourceType": "OperationOutcome"
+}

application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographic.cs

@@ -76,9 +76,16 @@ public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymou
             string jsonResponse = "";
 
             jsonResponse = await _httpClientFunction.GetResponseText(response);
+
+            if (response.StatusCode == HttpStatusCode.NotFound)
+            {
+                await _pdsProcessor.ProcessPdsNotFoundResponse(response, nhsNumber, sourceFileName);
+                return _createResponse.CreateHttpResponse(HttpStatusCode.NotFound, req, "PDS returned a 404 please database for details");
+            }
+
             var pdsDemographic = _fhirPatientDemographicMapper.ParseFhirJson(jsonResponse);
 
-            if (response.StatusCode == HttpStatusCode.NotFound || pdsDemographic.ConfidentialityCode == "R")
+            if (pdsDemographic.ConfidentialityCode == "R")
             {
                 await _pdsProcessor.ProcessPdsNotFoundResponse(response, nhsNumber, sourceFileName);
                 return _createResponse.CreateHttpResponse(HttpStatusCode.NotFound, req, "PDS returned a 404 please database for details");

application/CohortManager/src/Functions/ParticipantManagementServices/UpdateBlockedFlag/BlockParticipantHandler.cs

@@ -154,10 +154,14 @@ private async Task<BlockParticipantResult> BlockNewParticipant(BlockParticipantD
     {
         var pdsParticipant = await GetPDSParticipant(blockParticipantRequest.NhsNumber);
 
-        if (pdsParticipant == null || !ValidateRecordsMatch(pdsParticipant, blockParticipantRequest))
+        if (pdsParticipant == null )
         {
             return new BlockParticipantResult(false, "Participant details do not match a records in Cohort Manager or PDS");
         }
+        if (!ValidateRecordsMatch(pdsParticipant, blockParticipantRequest))
+        {
+            return new BlockParticipantResult(false, "Participant record exists with Nhs number but did not match the request");
+        }
 
         var participantManagementRecord = new ParticipantManagement
         {
@@ -259,7 +263,7 @@ private static bool ValidateRecordsMatch(PdsDemographic participant, BlockPartic
             throw new FormatException("Date of Birth not in the correct format");
         }
 
-        if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyyMMdd", new CultureInfo("en-GB"), DateTimeStyles.None, out var parsedDob))
+        if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyy-MM-dd", new CultureInfo("en-GB"), DateTimeStyles.None, out var parsedDob))
         {
             return false;
         }

application/CohortManager/src/Functions/Shared/Common/PdsHttpClientMock.cs

@@ -42,20 +42,22 @@ public override async Task<HttpResponseMessage> SendPdsGet(string url, string be
 
         if (patient == null)
         {
-            return HttpStubUtilities.CreateFakeHttpResponse(url, "NotFound", HttpStatusCode.NotFound);
+            var notFoundResponseBody = await File.ReadAllTextAsync("MockedPDSData/patient-not-found.json");
+            return HttpStubUtilities.CreateFakeHttpResponse(url, notFoundResponseBody, HttpStatusCode.NotFound);
         }
         return HttpStubUtilities.CreateFakeHttpResponse(url, patient);
 
 
 
     }
 
-    private static async Task<string?> GetPatientMockObject(string? nhsNumber = null)
+    private async Task<string?> GetPatientMockObject(string? nhsNumber = null)
     {
 
         string path = nhsNumber is null ? "MockedPDSData/complete-patient.json" : $"MockedPDSData/complete-patient-{nhsNumber}.json";
         if (!File.Exists(path))
         {
+            _logger.LogWarning("Mocked PDS Data file couldn't be found");
             return null;
         }
         return await File.ReadAllTextAsync(path);

application/CohortManager/src/Functions/Shared/Common/Utilities/HTTPStubUtilities.cs

@@ -20,7 +20,7 @@ public static HttpResponseMessage CreateFakeHttpResponse(string url, string cont
         }
         HttpResponseData.Headers.Location = location;
         HttpResponseData.Content = new StringContent(content);
-        HttpResponseData.StatusCode = HttpStatusCode.OK;
+        HttpResponseData.StatusCode = httpStatusCode;
         return HttpResponseData;
     }
 

application/CohortManager/src/Web/app/terms-and-conditions/page.tsx

@@ -45,18 +45,19 @@ export default async function Page() {
             <p>
               Your access to participant and exception data will be used solely
               to support the use case of raising exceptions to National Back
-              Office (NBO). Data viewed in the UI will not be further forwarded
+              Office (NBO), Cohorting as a Service (CaaS) and Breast Screening
+              Select (BSS). Data viewed in the UI will not be further forwarded
               to users or systems outside of the cohort manager platform, and
-              NBO.
+              NBO, CaaS and BSS.
             </p>
             <p>
               Data displayed in the UI is only retained for the duration of an
               active exception handling case. Once the exception is resolved,
               there is no need to retain it in cohort manager.
             </p>
             <p>
-              You acknowledge that your access may also be audited to ensure you
-              adhere to these conditions.
+              You acknowledge that your access may also be audited, by CIS2, to
+              ensure you adhere to these conditions.
             </p>
           </div>
         </div>