test: regression-test-failures-fix (#1623)

* updated-test-to-handle-retry

* regression-test-failures-fix

Author: ekpedemejames

tests/playwright-tests/src/tests/e2e/epic4c-add-participant-tests/epic4c-10011-10012-testsuite.spec.ts

@@ -36,7 +36,7 @@ test.describe.serial('@DTOSS-3881-01 @e2e @epic4c- Cohort Manger subscribed the
           break;
         }
         console.log(`Waiting for succesful data receival from serviceNow... (${i + 1}/10)`);
-        await new Promise(res => setTimeout(res, 2000));
+        await new Promise(res => setTimeout(res, 5000));
       }
       if (!success) {
         throw new Error('Cohort Manager receive data was unsuccessful after 10 retries (20 seconds).');
@@ -54,7 +54,7 @@ test.describe.serial('@DTOSS-3881-01 @e2e @epic4c- Cohort Manger subscribed the
           break;
         }
         console.log(`Waiting for participant response data to be available... (${i + 1}/10)`);
-        await new Promise(res => setTimeout(res, 2000));
+        await new Promise(res => setTimeout(res, 5000));
       }
       if (!success) {
         throw new Error('Participant response data was not available after 10 retries (20 seconds).');
@@ -67,22 +67,32 @@ test.describe.serial('@DTOSS-3881-01 @e2e @epic4c- Cohort Manger subscribed the
     await test.step('And NHSNumber, ScreeningId, ReferralFlag is written to Participant Management table', async () => {
       let response;
       let success = false;
+      let found = false;
+
+      const isMatchingRow = (row: { NHSNumber: number; ScreeningId: number; ReferralFlag: number }): boolean =>
+        row.NHSNumber === 9997160908 && row.ScreeningId === 1 && row.ReferralFlag === 1;
 
       for (let i = 0; i < 10; i++) {
         response = await getRecordsFromParticipantManagementDataService(request);
+
         if (response.status === 200) {
           success = true;
-          break;
+          found = response.data.some(isMatchingRow);
+          if (found) {
+            const match = response.data.find(isMatchingRow);
+            console.log(`Found matching Number: ${match.NHSNumber}`);
+            break;
+          }
         }
         console.log(`Waiting for participant response data to be available... (${i + 1}/10)`);
-        await new Promise(res => setTimeout(res, 2000));
+        await new Promise(res => setTimeout(res, 5000));
       }
       if (!success) {
-        throw new Error('Participant response data was not available after 10 retries (20 seconds).');
+        throw new Error('Participant response data was not available after 10 retries (50 seconds).');
+      }
+      if (!found) {
+        throw new Error('Matching participant record was not found after 10 retries (50 seconds).');
       }
-      expect(response?.data?.[0]?.NHSNumber).toBe(9997160908);
-      expect(response?.data?.[0]?.ScreeningId).toBe(1);
-      expect(response?.data?.[0]?.ReferralFlag).toBe(1);
     });
 
     await test.step('DTOSS-10012 DTOSS-10012 verify NemsSubscription_Id in NEMS_SUBSCRIPTION table', async () => {
@@ -96,7 +106,7 @@ test.describe.serial('@DTOSS-3881-01 @e2e @epic4c- Cohort Manger subscribed the
           break;
         }
         console.log(`Waiting for NemsSubscription_Id data to be available... (${i + 1}/10)`);
-        await new Promise(res => setTimeout(res, 2000));
+        await new Promise(res => setTimeout(res, 5000));
       }
       if (!success || !response) {
         throw new Error('NemsSubscription_Id response data was not available after 10 retries (20 seconds).');

tests/playwright-tests/src/tests/e2e/testFiles/@DTOSS-5111-01/ADD1_1B8F53_-_CAAS_BREAST_SCREENING_COHORT.json

@@ -2,15 +2,28 @@
   "validations": [
     {
       "validations": {
-        "apiEndpoint": "api/ExceptionManagementDataService",
-        "NhsNumber": "9990185433",
-        "RuleId": 94,
-        "RuleDescription": "Invalid eligibility flag."
+        "apiEndpoint": "api/CohortDistributionDataService",
+        "NHSNumber": 9990185433,
+        "GivenName": "Darrel",
+        "FamilyName": "Regans"
       },
       "meta": {
         "testJiraId": "@DTOSS-5111-01",
         "requirementJiraId": "DTOSS-4909",
-        "additionalTags": "@regression @e2e @epic2-med-priority Tests Verify that an exception raised  when adding participant with eligibility is false"
+        "additionalTags": "@regression @e2e @epic2-med-priority Tests Verify that No exception is raised when adding participant with eligibility is false"
+      }
+    },
+   {
+      "validations": {
+        "apiEndpoint": "api/ParticipantManagementDataService",
+        "NHSNumber": 9990185433,
+        "RecordType": "ADD",
+        "EligibilityFlag": 0
+      },
+      "meta": {
+        "testJiraId": "@DTOSS-5111-01",
+        "requirementJiraId": "DTOSS-4909",
+        "additionalTags": "@regression @e2e @epic2-med-priority Tests Verify eligibility is 0"
       }
     }
   ],

tests/playwright-tests/src/tests/e2e/testFiles/@DTOSS-5399-01/ADD1_1B8F53_-_CAAS_BREAST_SCREENING_COHORT.json

@@ -11,19 +11,6 @@
         "requirementJiraId": "DTOSS-2757",
         "additionalTags": "@regression @e2e @epic2-med-priority Validate eligibility flag is always set to null for ADD participant records"
       }
-    },
-    {
-    "validations": {
-        "apiEndpoint": "api/ExceptionManagementDataService",
-        "NhsNumber": "9996216462",
-        "RuleId": 94,
-        "RuleDescription": "Invalid eligibility flag."
-      },
-      "meta": {
-        "testJiraId": "@DTOSS-5399-01",
-        "requirementJiraId": "DTOSS-2757",
-        "additionalTags": "@regression @e2e @epic2-med-priority Validate eligibility flag is always set to null exception for ADD participant records"
-      }
     }
   ],
   "inputParticipantRecord": [