Merge branch 'main' into Fix/DTOSS-10655-Fixing-date-formating

SamRobinson75684 · web-flow · commit e9d49a8cfff8 · 2025-08-20T13:54:55.000+01:00
diff --git a/.github/workflows/cicd-1-pull-request.yaml b/.github/workflows/cicd-1-pull-request.yaml
@@ -150,7 +150,7 @@ jobs:
   deploy-stage:
     if: github.ref == 'refs/heads/main' && github.event.action == 'closed' && contains(github.event.pull_request.labels.*.name, 'deploy')
     name: Deploy pr-${{ github.event.pull_request.number }} for commit ${{ github.event.pull_request.head.sha }}
-    needs: [acceptance-stage]
+    needs: [metadata, build-image-stage]
     permissions:
       id-token: write
       contents: read
diff --git a/.github/workflows/cicd-2-publish.yaml b/.github/workflows/cicd-2-publish.yaml
@@ -1,11 +1,5 @@
 name: "CI/CD publish"
 
-on:
-  pull_request:
-    types: [closed]
-    branches:
-      - main
-
 jobs:
   metadata:
     name: "Set CI/CD metadata"
diff --git a/.github/workflows/stage-3-build-images.yaml b/.github/workflows/stage-3-build-images.yaml
@@ -1,10 +1,6 @@
 name: Docker Image CI
 
 on:
-  push:
-    branches:
-      - main
-
   workflow_call:
     inputs:
       environment_tag:
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,8 @@
 *.suo
 *.user
 
+*host.json
+
 # Visual Studio 2015/2017 cache/options directory
 .vs/
 
@@ -115,3 +117,4 @@ application/CohortManager/src/Functions/*.json
 # Explicitly include test JSON files
 !**/playwright-tests/src/tests/e2e/testFiles/**/*.json
 
+
diff --git a/application/CohortManager/src/Functions/ParticipantManagementServices/UpdateBlockedFlag/BlockParticipantHandler.cs b/application/CohortManager/src/Functions/ParticipantManagementServices/UpdateBlockedFlag/BlockParticipantHandler.cs
@@ -236,15 +236,16 @@ private async Task<PdsDemographic> GetPDSParticipant(long nhsNumber)
     private static bool ValidateRecordsMatch(ParticipantDemographic participant, BlockParticipantDto dto)
     {
 
-        if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd",new CultureInfo("en-GB"),DateTimeStyles.None, out var dtoDateOfBirth ))
+        if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd", new CultureInfo("en-GB"), DateTimeStyles.None, out var dtoDateOfBirth))
         {
             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, "yyyyMMdd", new CultureInfo("en-GB"), DateTimeStyles.None, out var parsedDob))
         {
             return false;
         }
+
         return string.Equals(participant.FamilyName, dto.FamilyName, StringComparison.InvariantCultureIgnoreCase)
             && participant.NhsNumber == dto.NhsNumber
             && parsedDob == dtoDateOfBirth;
@@ -253,12 +254,12 @@ private static bool ValidateRecordsMatch(ParticipantDemographic participant, Blo
     private static bool ValidateRecordsMatch(PdsDemographic participant, BlockParticipantDto dto)
     {
 
-        if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd",new CultureInfo("en-GB"),DateTimeStyles.None, out var dtoDateOfBirth ))
+        if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd", new CultureInfo("en-GB"), DateTimeStyles.None, out var dtoDateOfBirth))
         {
             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, "yyyyMMdd", new CultureInfo("en-GB"), DateTimeStyles.None, out var parsedDob))
         {
             return false;
         }
diff --git a/application/CohortManager/src/Functions/Shared/Common/PdsHttpClientMock.cs b/application/CohortManager/src/Functions/Shared/Common/PdsHttpClientMock.cs
@@ -54,7 +54,7 @@ public override async Task<HttpResponseMessage> SendPdsGet(string url, string be
     {
 
         string path = nhsNumber is null ? "MockedPDSData/complete-patient.json" : $"MockedPDSData/complete-patient-{nhsNumber}.json";
-        if(!File.Exists(path))
+        if (!File.Exists(path))
         {
             return null;
         }
diff --git a/tests/playwright-tests/src/api/core/sendHTTPRequest.ts b/tests/playwright-tests/src/api/core/sendHTTPRequest.ts
@@ -0,0 +1,26 @@
+export const sendHttpPOSTCall = 
+  async (
+  url: string,
+  body: string
+): Promise<Response> => 
+{
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: body 
+  });
+
+  return response;     
+}
+
+export const sendHttpGet = 
+  async (
+    url: string
+): Promise<Response> => 
+{
+  const response = await fetch(url);
+  return response;
+}
+
diff --git a/tests/playwright-tests/src/api/distributionService/bsSelectService.ts b/tests/playwright-tests/src/api/distributionService/bsSelectService.ts
@@ -55,6 +55,7 @@ export const BlockParticipant = (
   return apiClient.postWithQuery(request, endpoint, payload);
 };
 
+
 export const UnblockParticipant = (
   request: APIRequestContext,
   payload: {
diff --git a/tests/playwright-tests/src/config/env.ts b/tests/playwright-tests/src/config/env.ts
@@ -21,6 +21,8 @@ const endpointBsSelectGetValidationExceptions = process.env.ENDPOINT_BS_SELECT_G
 const endpointSerNowReceiveParticipant = process.env.ENDPOINT_SERVICE_NOW_MESSAGE_HANDLER ?? '';
 const invalidEndpointSerNow = process.env.INVALID_ENDPOINT_SERVICE_NOW_MESSAGE_HANDLER ?? '';
 const participantPayloadPath = process.env.PARTICIPANT_PAYLOAD_PATH ?? '';
+const createPDSDemographicEnv = process.env.ENDPOINT_PDS_DEMOGRAPHIC ?? '';
+const subToNemsEndPoint = process.env.ENDPOINT_SUB_TO_NEMS ?? ''
 
 export const config = {
   baseURL,
@@ -36,7 +38,10 @@ export const config = {
   endpointBsSelectUpdateBlockFlag: endpointBsSelectUpdateBlockFlag,
   endpointBsSelectGetValidationExceptions: endpointBsSelectGetValidationExceptions,
   endpointSerNowReceiveParticipant: endpointSerNowReceiveParticipant,
+  createPDSDemographic: createPDSDemographicEnv,
   invalidEndpointSerNow: invalidEndpointSerNow,
+  SubToNems: subToNemsEndPoint,
+  SubToNemsPath: 'api/Subscribe',
   routeBsSelectRetrieveCohortDistributionData: 'api/RetrieveCohortDistributionData',
   routeBsSelectRetrieveCohortRequestAudit: 'api/RetrieveCohortRequestAudit',
   routeBsSelectDeleteParticipant: 'api/DeleteParticipant',
@@ -49,6 +54,7 @@ export const config = {
   participantManagementService: 'ParticipantManagementDataService',
   exceptionManagementService: 'ExceptionManagementDataService',
   participantDemographicDataService: 'ParticipantDemographicDataService',
+  createPDSDemographicPath: 'api/RetrievePdsDemographic',
   participantPayloadPath: 'src/tests/api/testFiles',
   e2eTestFilesPath: 'e2e/testFiles',
   apiTestFilesPath: 'api/testFiles',
diff --git a/tests/playwright-tests/src/tests/api/testFiles/@DTOSS-7667-01/ADD_BLOCKED_7667.json b/tests/playwright-tests/src/tests/api/testFiles/@DTOSS-7667-01/ADD_BLOCKED_7667.json
@@ -0,0 +1,55 @@
+{
+  "validations": [
+    {
+      "validations": {
+        "apiEndpoint": "api/CohortDistributionDataService",
+        "NHSNumber": 9998380197
+      }
+    }
+  ],
+  "inputParticipantRecord": [
+    {
+      "record_type": "ADD",
+      "change_time_stamp": null,
+      "serial_change_number": 1,
+      "nhs_number": 9998380197,
+      "superseded_by_nhs_number": null,
+      "primary_care_provider": "A81623",
+      "primary_care_effective_from_date": "20240101",
+      "current_posting": "LA",
+      "current_posting_effective_from_date": "20240101",
+      "name_prefix": "BRO",
+      "given_name": "smith",
+      "other_given_name": "OtherGivenName 1",
+      "family_name": "smith",
+      "previous_family_name": "PreviousFamilyName 1",
+      "date_of_birth": "20101022",
+      "gender": 2,
+      "address_line_1": "1 Test Street",
+      "address_line_2": "Test Area",
+      "address_line_3": "TestAddress",
+      "address_line_4": "Chelmsford",
+      "address_line_5": "United Kingdom",
+      "postcode": "LS1 1AA",
+      "paf_key": "Z3S4Q5X9",
+      "address_effective_from_date": "20240101",
+      "reason_for_removal": "ORR",
+      "reason_for_removal_effective_from_date": null,
+      "date_of_death": null,
+      "death_status": null,
+      "home_telephone_number": "01619999999",
+      "home_telephone_effective_from_date": "20240101",
+      "mobile_telephone_number": "07888888888",
+      "mobile_telephone_effective_from_date": "20240101",
+      "email_address": "blockedadd@example.com",
+      "email_address_effective_from_date": "20240101",
+      "preferred_language": "en",
+      "is_interpreter_required": false,
+      "invalid_flag": false,
+      "eligibility": true
+    }
+  ],
+  "nhsNumbers": [
+    "9998380197"
+  ]
+}
diff --git a/tests/playwright-tests/src/tests/e2e/epic4b-block-participant-tests/epic4b-7667-block-paricipant-tessuite.spec.ts b/tests/playwright-tests/src/tests/e2e/epic4b-block-participant-tests/epic4b-7667-block-paricipant-tessuite.spec.ts
@@ -0,0 +1,131 @@
+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 is deleted from CohortDistributionDataService', 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(`send the participant again and expect the participant has not been added and it has not been validated and there is a error in the database that shows that participant is blocked `, async () => {
+
+      const parquetFile = await createParquetFromJson(nhsNumbers, inputParticipantRecord, testFilesPath);
+      
+      await processFileViaStorage(parquetFile);
+
+      let validationExceptions;
+      for(let i =0; i<10; i++)
+      {
+          const responseFromExceptions = await getRecordsFromExceptionService(request);
+          if(responseFromExceptions.data !== null)
+          {
+            validationExceptions = responseFromExceptions.data
+            break;
+          }
+          console.log(`waiting for exception for participant blocked to be added to exception table...({${i}/10)`);
+          await new Promise(res => setTimeout(res, 2000));
+      }
+
+      let getUrl = `${config.endpointParticipantManagementDataService}api/${config.participantManagementService}`;
+      var response = await sendHttpGet(getUrl);
+
+      
+
+      let cohortDistributionServiceUrl = `${config.endpointCohortDistributionDataService}api/${config.cohortDistributionService}`
+
+      var response = await sendHttpGet(cohortDistributionServiceUrl);
+      var jsonResponse = await response.json();
+
+      expect(response.status).toBe(200)
+      expect(jsonResponse.length).toBe(1);
+      expect(validationExceptions.length).toBe(1);
+      expect(validationExceptions[0].RuleDescription).toBe("Participant is blocked");
+    });
+  });
+});
diff --git a/tests/playwright-tests/src/tests/e2e/testFiles/@DTOSS-7667-01/ADD_BLOCKED_7667.json b/tests/playwright-tests/src/tests/e2e/testFiles/@DTOSS-7667-01/ADD_BLOCKED_7667.json
@@ -0,0 +1,55 @@
+{
+  "validations": [
+    {
+      "validations": {
+        "apiEndpoint": "api/CohortDistributionDataService",
+        "NHSNumber": 9998380197
+      }
+    }
+  ],
+  "inputParticipantRecord": [
+    {
+      "record_type": "ADD",
+      "change_time_stamp": null,
+      "serial_change_number": 1,
+      "nhs_number": 9998380197,
+      "superseded_by_nhs_number": null,
+      "primary_care_provider": "A81623",
+      "primary_care_effective_from_date": "20240101",
+      "current_posting": "LA",
+      "current_posting_effective_from_date": "20240101",
+      "name_prefix": "BRO",
+      "given_name": "smith",
+      "other_given_name": "OtherGivenName 1",
+      "family_name": "smith",
+      "previous_family_name": "PreviousFamilyName 1",
+      "date_of_birth": "20101022",
+      "gender": 2,
+      "address_line_1": "1 Test Street",
+      "address_line_2": "Test Area",
+      "address_line_3": "TestAddress",
+      "address_line_4": "Chelmsford",
+      "address_line_5": "United Kingdom",
+      "postcode": "LS1 1AA",
+      "paf_key": "Z3S4Q5X9",
+      "address_effective_from_date": "20240101",
+      "reason_for_removal": null,
+      "reason_for_removal_effective_from_date": null,
+      "date_of_death": null,
+      "death_status": null,
+      "home_telephone_number": "01619999999",
+      "home_telephone_effective_from_date": "20240101",
+      "mobile_telephone_number": "07888888888",
+      "mobile_telephone_effective_from_date": "20240101",
+      "email_address": "blockedadd@example.com",
+      "email_address_effective_from_date": "20240101",
+      "preferred_language": "en",
+      "is_interpreter_required": false,
+      "invalid_flag": false,
+      "eligibility": true
+    }
+  ],
+  "nhsNumbers": [
+    "9998380197"
+  ]
+}

Original file line number	Diff line number	Diff line change
`@@ -236,15 +236,16 @@ private async Task<PdsDemographic> GetPDSParticipant(long nhsNumber)`
`236`	`236`	`private static bool ValidateRecordsMatch(ParticipantDemographic participant, BlockParticipantDto dto)`
`237`	`237`	`{`
`238`	`238`
`239`		`- if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd",new CultureInfo("en-GB"),DateTimeStyles.None, out var dtoDateOfBirth ))`
	`239`	`+ if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd", new CultureInfo("en-GB"), DateTimeStyles.None, out var dtoDateOfBirth))`
`240`	`240`	`{`
`241`	`241`	`throw new FormatException("Date of Birth not in the correct format");`
`242`	`242`	`}`
`243`	`243`
`244`		`- if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyyMMdd",new CultureInfo("en-GB"),DateTimeStyles.None, out var parsedDob))`
	`244`	`+ if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyyMMdd", new CultureInfo("en-GB"), DateTimeStyles.None, out var parsedDob))`
`245`	`245`	`{`
`246`	`246`	`return false;`
`247`	`247`	`}`
	`248`	`+`
`248`	`249`	`return string.Equals(participant.FamilyName, dto.FamilyName, StringComparison.InvariantCultureIgnoreCase)`
`249`	`250`	`&& participant.NhsNumber == dto.NhsNumber`
`250`	`251`	`&& parsedDob == dtoDateOfBirth;`
`@@ -253,12 +254,12 @@ private static bool ValidateRecordsMatch(ParticipantDemographic participant, Blo`
`253`	`254`	`private static bool ValidateRecordsMatch(PdsDemographic participant, BlockParticipantDto dto)`
`254`	`255`	`{`
`255`	`256`
`256`		`- if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd",new CultureInfo("en-GB"),DateTimeStyles.None, out var dtoDateOfBirth ))`
	`257`	`+ if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd", new CultureInfo("en-GB"), DateTimeStyles.None, out var dtoDateOfBirth))`
`257`	`258`	`{`
`258`	`259`	`throw new FormatException("Date of Birth not in the correct format");`
`259`	`260`	`}`
`260`	`261`
`261`		`- if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyyMMdd",new CultureInfo("en-GB"),DateTimeStyles.None, out var parsedDob))`
	`262`	`+ if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyyMMdd", new CultureInfo("en-GB"), DateTimeStyles.None, out var parsedDob))`
`262`	`263`	`{`
`263`	`264`	`return false;`
`264`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public override async Task<HttpResponseMessage> SendPdsGet(string url, string be`
`54`	`54`	`{`
`55`	`55`
`56`	`56`	`string path = nhsNumber is null ? "MockedPDSData/complete-patient.json" : $"MockedPDSData/complete-patient-{nhsNumber}.json";`
`57`		`- if(!File.Exists(path))`
	`57`	`+ if (!File.Exists(path))`
`58`	`58`	`{`
`59`	`59`	`return null;`
`60`	`60`	`}`