Merge branch 'main' into test/DTOSS-10056-vhr-flag-tests

MWClayson-NHS · web-flow · commit ab8f37a332fc · 2025-09-03T12:03:42.000+01:00
diff --git a/.azuredevops/pipelines/post-deployment-tests-dev.yaml b/.azuredevops/pipelines/post-deployment-tests-dev.yaml
@@ -4,7 +4,7 @@ trigger: none
 pr: none
 
 schedules:
-  - cron: "15 7 * * 1-5" # Every weekday (Mon-Fri) at 07:15 UTC i.e 8:15 BST
+  - cron: "00 5 * * 1-5" # Every weekday (Mon-Fri) at 05:00 UTC i.e 06:00 BST
     displayName: Weekdays run
     branches:
       include:
@@ -16,7 +16,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: d6d6e3e99459d9d71a83fa5affa900a6c339a3b5
+      ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_dev.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_dev.yaml
@@ -8,7 +8,7 @@ pool:
   name: private-pool-dev-uks
 
 schedules:
-  - cron: "0 7 * * *" # Run at 7:00 AM UTC
+  - cron: "45 4 * * *" # Run at 04:45 AM UTC
     displayName: 'Scale_Peak'
     branches:
       include:
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: d6d6e3e99459d9d71a83fa5affa900a6c339a3b5
+      ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_int.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_int.yaml
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: d6d6e3e99459d9d71a83fa5affa900a6c339a3b5
+      ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_nft.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_nft.yaml
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: d6d6e3e99459d9d71a83fa5affa900a6c339a3b5
+      ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_preprod.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_preprod.yaml
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: d6d6e3e99459d9d71a83fa5affa900a6c339a3b5
+      ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
       endpoint: NHSDigital
 
 parameters:
diff --git a/.github/workflows/cicd-1-pull-request.yaml b/.github/workflows/cicd-1-pull-request.yaml
@@ -156,7 +156,7 @@ jobs:
       contents: read
     uses: ./.github/workflows/stage-4-deploy.yaml
     with:
-      environments: "[\"sandbox\"]"
+      environments: "[\"development\"]"
       commit_sha: ${{ github.sha }}
     secrets: inherit
   validate-title-stage:
diff --git a/.github/workflows/stage-4-deploy.yaml b/.github/workflows/stage-4-deploy.yaml
@@ -66,12 +66,12 @@ jobs:
 
           # Define which tests to run based on the environment
           declare -A test_types=(
-            ["dev"]="smoke_e2e,regression_api,regression_e2e_epic1,regression_e2e_epic2,regression_e2e_epic3"
-            ["nft"]="smoke_e2e,regression_api,regression_e2e_epic1,regression_e2e_epic2,regression_e2e_epic3"
-            ["int"]=""
+            ["development"]="smoke_e2e"
+            ["nft"]=""
+            ["integration"]=""
             ["sandbox"]="smoke_e2e,regression_api"
-            ["pre"]=""
-            ["prod"]=""
+            ["preprod"]=""
+            ["production"]=""
           )
 
           git_short_sha=$(git rev-parse --short ${{inputs.commit_sha}})
diff --git a/application/CohortManager/src/Web/app/data/mockExceptions.json b/application/CohortManager/src/Web/app/data/mockExceptions.json
@@ -613,7 +613,7 @@
       "NhsNumber": "2847593061",
       "DateCreated": "2025-05-14T12:35:16.73",
       "DateResolved": "9999-12-31T00:00:00",
-      "RuleId": 36,
+      "RuleId": 45,
       "RuleDescription": "GP practice code does not exist in the BSS cohort organisation table",
       "Category": 5,
       "ScreeningName": "Breast Screening",
@@ -640,6 +640,70 @@
       "ServiceNowCreatedDate": "",
       "RecordUpdatedDate": "2025-05-16T09:18:54.41"
     },
+    "2035": {
+      "ExceptionId": 2035,
+      "NhsNumber": "2847593072",
+      "DateCreated": "2025-05-14T12:35:16.73",
+      "DateResolved": "9999-12-31T00:00:00",
+      "RuleId": 49,
+      "RuleDescription": "Interpreter Required information is not valid",
+      "Category": 5,
+      "ScreeningName": "Breast Screening",
+      "ExceptionDate": "2025-05-12T00:00:00",
+      "CohortName": "",
+      "Fatal": 1,
+      "ExceptionDetails": {
+        "GivenName": "Maya",
+        "FamilyName": "Patel",
+        "DateOfBirth": "19921103",
+        "ParticipantAddressLine1": "74 Riverbank Close",
+        "ParticipantAddressLine2": "Flat 12",
+        "ParticipantAddressLine3": "Kings Heath",
+        "ParticipantAddressLine4": "Birmingham",
+        "ParticipantAddressLine5": "UK",
+        "ParticipantPostCode": "B14 7QP",
+        "TelephoneNumberHome": "07412345678",
+        "EmailAddressHome": "maya.patel@example.com",
+        "PrimaryCareProvider": "E50231",
+        "Gender": 2,
+        "SupersededByNhsNumber": ""
+      },
+      "ServiceNowId": "",
+      "ServiceNowCreatedDate": "",
+      "RecordUpdatedDate": "2025-05-16T09:18:54.41"
+    },
+    "2036": {
+      "ExceptionId": 2036,
+      "NhsNumber": "2847599972",
+      "DateCreated": "2025-05-14T12:35:16.73",
+      "DateResolved": "9999-12-31T00:00:00",
+      "RuleId": 53,
+      "RuleDescription": "Participant has re-registered and PDS has been updated with new GP practice code but has not yet received a new current posting.",
+      "Category": 5,
+      "ScreeningName": "Breast Screening",
+      "ExceptionDate": "2025-05-12T00:00:00",
+      "CohortName": "",
+      "Fatal": 1,
+      "ExceptionDetails": {
+        "GivenName": "Noah",
+        "FamilyName": "Ahmed",
+        "DateOfBirth": "19890921",
+        "ParticipantAddressLine1": "29 Hawthorn Close",
+        "ParticipantAddressLine2": "House 3",
+        "ParticipantAddressLine3": "Didsbury",
+        "ParticipantAddressLine4": "Manchester",
+        "ParticipantAddressLine5": "UK",
+        "ParticipantPostCode": "M20 4BQ",
+        "TelephoneNumberHome": "07987654321",
+        "EmailAddressHome": "noah.ahmed@example.com",
+        "PrimaryCareProvider": "E74120",
+        "Gender": 1,
+        "SupersededByNhsNumber": ""
+      },
+      "ServiceNowId": "",
+      "ServiceNowCreatedDate": "",
+      "RecordUpdatedDate": "2025-05-16T09:18:54.41"
+    },
     "4001": {
       "ExceptionId": 4001,
       "NhsNumber": "3333333333",
diff --git a/application/CohortManager/src/Web/app/lib/ruleMapping.test.ts b/application/CohortManager/src/Web/app/lib/ruleMapping.test.ts
@@ -4,7 +4,7 @@ describe("ruleMapping", () => {
   describe("ruleIdMappings", () => {
     it("should contain all expected rule IDs", () => {
       const expectedRuleIds = [
-        3, 8, 10, 17, 18, 21, 22, 30, 35, 36, 39, 40, 54, 66, 69, 71,
+        3, 8, 10, 17, 18, 21, 22, 30, 35, 39, 40, 54, 66, 69, 71,
       ];
       const actualRuleIds = Object.keys(ruleIdMappings).map(Number);
 
diff --git a/application/CohortManager/src/Web/app/lib/ruleMapping.ts b/application/CohortManager/src/Web/app/lib/ruleMapping.ts
@@ -61,12 +61,6 @@ export const ruleIdMappings: Record<number, RuleMapping> = {
       "Verify that the changes are correct, and that the NHS number is not involved in a confusion case.",
     reportingId: "CMR38",
   },
-  36: {
-    ruleDescription: "GP practice code does not exist.",
-    moreDetails: "Raise with Breast Screening Select (BSS).",
-    reportingId: "CMR45",
-    portalFormTitle: "Raise with Breast Screening Select (BSS)",
-  },
   39: {
     ruleDescription: "Missing surname.",
     moreDetails: "Enter the patient's surname.",
@@ -77,6 +71,24 @@ export const ruleIdMappings: Record<number, RuleMapping> = {
     moreDetails: "Enter the patient's forename.",
     reportingId: "CMR16",
   },
+  45: {
+    ruleDescription: "GP practice code does not exist",
+    moreDetails: "Raise with Breast Screening Select (BSS)",
+    reportingId: "CMR45",
+    portalFormTitle: "Raise with Breast Screening Select (BSS)",
+  },
+  49: {
+    ruleDescription: "Interpreter required information is not valid",
+    moreDetails:
+      "The interpreter required details must be entered as numbers 0 or 1. Check if an interpreter is needed for the participant: enter 0 if an interpreter is not required. Enter 1 if an interpreter is required",
+    reportingId: "CMR49",
+  },
+  53: {
+    ruleDescription: "Current posting awaiting update",
+    moreDetails:
+      "The patient’s GP practice code has been updated, but the current posting is yet to be updated",
+    reportingId: "CMR53",
+  },
   54: {
     ruleDescription:
       "A dummy GP practice code could not be generated. An English postcode must be entered.",
diff --git a/infrastructure/tf-core/environments/nft.tfvars b/infrastructure/tf-core/environments/nft.tfvars
@@ -1163,6 +1163,7 @@ linux_web_app = {
           AUTH_TRUST_HOST      = "true"
           NEXTAUTH_URL         = "https://cohort-nft.non-live.screening.nhs.uk/api/auth"
           SERVICE_NAME         = "Cohort Manager"
+          APP_ENV              = "development"
         }
         from_key_vault = {
           # env_var_name           = "key_vault_secret_name"
diff --git a/tests/playwright-tests/package.json b/tests/playwright-tests/package.json
@@ -14,6 +14,7 @@
     "test:regression_e2e_epic4c": "cross-env TEST_TYPE=RegressionEpic4c npx playwright test --project=dev --config=src/config/playwright.config.ts --grep=@epic4c-",
     "test:regression_e2e_epic4c:dtoss_8483": "cross-env TEST_TYPE=RegressionEpic4c npx playwright test --project=dev --config=src/config/playwright.config.ts --grep=@DTOSS-8483-",
     "test:regression_e2e_epic4d": "cross-env TEST_TYPE=RegressionEpic4d npx playwright test --project=dev --config=src/config/playwright.config.ts --grep=@epic4d-",
+    "test:regression_e2e_epic4b": "cross-env TEST_TYPE=RegressionEpic4d npx playwright test --project=dev --config=src/config/playwright.config.ts --grep=@epic4b-",
     "test": "cross-env TEST_TYPE=SMOKE npx playwright test --project=dev --config=src/config/playwright.config.ts --grep=\"@smoke @e2e\"",
     "test:validation-exceptions": "cross-env TEST_TYPE=VALIDATION npx playwright test tests/api/bsselect/validationExceptions/ --project=dev --config=src/config/playwright.config.ts",
     "test:service_now": "npx playwright test --project=dev --config=src/config/playwright.config.ts --grep=\"@service_now\"",
diff --git a/tests/playwright-tests/src/tests/e2e/epic4b-block-participant-tests/epic-4b-7718-block-paricipant-testsuite.spec.ts b/tests/playwright-tests/src/tests/e2e/epic4b-block-participant-tests/epic-4b-7718-block-paricipant-testsuite.spec.ts
@@ -0,0 +1,100 @@
+import { expect, test } from '../../fixtures/test-fixtures';
+import { createParquetFromJson } from '../../../parquet/parquet-multiplier';
+import { getApiTestData, processFileViaStorage, validateSqlDatabaseFromAPI, cleanupDatabaseFromAPI } from '../../steps/steps';
+import { getRecordsFromParticipantManagementService} from '../../../api/distributionService/bsSelectService';
+import { TestHooks } from '../../hooks/test-hooks';
+import { APIRequestContext, TestInfo } from '@playwright/test';
+import { config } from '../../../config/env';
+import { getRecordsFromExceptionService } from '../../../api/dataService/exceptionService';
+import { sendHttpGet, sendHttpPOSTCall } from '../../../api/core/sendHTTPRequest';
+
+annotation: [{
+  type: 'Requirement',
+  description: 'Tests - https://nhsd-jira.digital.nhs.uk/browse/DTOSS-7667'
+}]
+
+test.describe('@regression @e2e @epic4b-block-tests @smoke Tests', async () => {
+  TestHooks.setupAllTestHooks();
+
+  test('@DTOSS-7667-01 - AC1 - Verify participant does not have a subscription in our database when they are blocked', async ({ request }: { request: APIRequestContext }, testInfo: TestInfo) => {
+    // Arrange: Get test data
+    const [addValidations, inputParticipantRecord, nhsNumbers, testFilesPath] = await getApiTestData(testInfo.title, 'ADD_BLOCKED');
+    const nhsNumber = nhsNumbers[0];
+    await cleanupDatabaseFromAPI(request, [nhsNumber]);
+
+
+    const parquetFile = await createParquetFromJson(nhsNumbers, inputParticipantRecord, testFilesPath);
+
+    await test.step(`When I ADD participant is processed via storage ready to be blocked by the block function`, async () => {
+      await processFileViaStorage(parquetFile);
+    });
+    
+    let nhsNumberFromPds = 0;
+    let familyName = "";
+    let dateOfBirth = "";
+
+    await test.step(`Then participant should be in the participant management table`, async () => {
+      
+        await validateSqlDatabaseFromAPI(request, addValidations);
+    });
+    
+
+    // Call the block participant function
+    await test.step(`Go to PDS and get the participant data for the blocking of a participant that already exists in the database`, async () => {
+        // Call the block participant function
+        let url = `${config.createPDSDemographic}${config.createPDSDemographicPath}?nhsNumber=${nhsNumbers[0]}`;
+
+        let response = await sendHttpGet(url)
+        expect(response.status).toBe(200)
+
+        let json = await response.json();
+        nhsNumberFromPds = json["NhsNumber"];
+        familyName = json["FamilyName"]
+        dateOfBirth = json["DateOfBirth"];
+
+        expect(nhsNumberFromPds).toBeDefined()
+    });
+
+    const blockPayload = {
+      NhsNumber: Number(nhsNumberFromPds),
+      FamilyName: familyName,
+      DateOfBirth: dateOfBirth
+    };
+
+    await test.step(`running step to make sure that item can be subscribed to in nems`, async () => {
+      let subscribeToNemsResponse = await sendHttpPOSTCall(`${config.SubToNems}${config.SubToNemsPath}?nhsNumber=${nhsNumbers[0]}`, "");
+      
+      expect(subscribeToNemsResponse.status).toBe(200);
+    });
+
+    await test.step(`Send block to existing participant and make sure they are blocked`, async () => {
+      
+      let url = `${config.endpointBsSelectUpdateBlockFlag}${config.routeBsSelectBlockParticipant}`;
+      let body = JSON.stringify(blockPayload);
+      let response = await sendHttpPOSTCall(url, body);
+      expect(response.status).toBe(200);
+    });
+
+
+     await test.step(`the participant has been blocked`, async () => {
+      let blocked = false;
+      for(let i =0; i<10; i++) {
+          const resp = await getRecordsFromParticipantManagementService(request);
+          if (resp?.data?.[0]?.BlockedFlag === 1) {
+            blocked = true;
+            break;
+          }
+          console.log(`Waiting for participant to be blocked...(${i}/10)`);
+          await new Promise(res => setTimeout(res, 2000));
+        }
+        expect(blocked).toBe(true);
+    });
+
+    await test.step(`When the participant is in the blocked list they are not subscribed to nems for PDS updates`, async () => {
+        var checkNemsSubscriptionStatusURL = `${config.SubToNems}${config.CheckNemsSubPath}?nhsNumber=${nhsNumbers[0]}` ;
+        let nemsResponse = await sendHttpGet(checkNemsSubscriptionStatusURL);
+
+        expect(nemsResponse.status).toBe(404);
+    });
+  });
+});
diff --git a/tests/playwright-tests/src/tests/e2e/epic4b-block-participant-tests/epic4b-7719-block-paricipant-tessuite.spec.ts b/tests/playwright-tests/src/tests/e2e/epic4b-block-participant-tests/epic4b-7719-block-paricipant-tessuite.spec.ts
