chore: addressing comments on PR

Author: SamRobinson75684

tests/playwright-tests/src/api/RetryCore/Retry.ts

@@ -80,7 +80,7 @@ async function pollAPI(endpoint: string, apiValidation: any, request: any): Prom
     let maxTimeBetweenRequests = config.maxTimeBetweenRequests;
 
     console.info(`now trying request for ${maxNumberOfRetries} retries`);
-       while (i < maxNumberOfRetries) {
+       while (i < Number(maxNumberOfRetries)) {
             try {
                 apiResponse =  await fetchApiResponse(endpoint, request);
                 if (apiResponse.status() == 200) {
@@ -93,7 +93,7 @@ async function pollAPI(endpoint: string, apiValidation: any, request: any): Prom
             }
             i++;
 
-            console.info(`http response  completed ${i}/${maxNumberOfRetries} of number of reties`);
+            console.info(`http response completed ${i}/${maxNumberOfRetries} of number of retries`);
             await new Promise(res => setTimeout(res, maxTimeBetweenRequests));
         }
 
@@ -112,7 +112,7 @@ export async function pollApiForOKResponse(httpRequest: () => Promise<ApiRespons
     let maxTimeBetweenRequests = config.maxTimeBetweenRequests;
 
     console.info(`now trying request for ${maxNumberOfRetries} retries`);
-    while (i < maxNumberOfRetries) {
+    while (i < Number(maxNumberOfRetries)) {
         try {
             apiResponse =  await httpRequest();
             if (apiResponse.status == 200) {
@@ -125,7 +125,7 @@ export async function pollApiForOKResponse(httpRequest: () => Promise<ApiRespons
         }
         i++;
 
-        console.info(`http response  completed ${i}/${maxNumberOfRetries} of number of reties`);
+        console.info(`http response completed ${i}/${maxNumberOfRetries} of number of retries`);
         await new Promise(res => setTimeout(res, maxTimeBetweenRequests));
     }
 

tests/playwright-tests/src/api/apiHelper.ts

@@ -51,17 +51,17 @@ export async function findMatchingObject(endpoint: string, responseBody: any[],
   }
 
   matchingObjects = responseBody.filter((item: Record<string, any>) =>
-    item[nhsNumberKey] === nhsNumber ||
-    item.NhsNumber === nhsNumber ||
-    item.NHSNumber === nhsNumber
+    item[nhsNumberKey] == nhsNumber ||
+    item.NhsNumber  == nhsNumber ||
+    item.NHSNumber == nhsNumber
   );
 
   matchingObject = matchingObjects[matchingObjects.length - 1];
 
   if (endpoint.includes(config.exceptionManagementService) &&
     (apiValidation.validations.RuleId !== undefined || apiValidation.validations.RuleDescription)) {
-    let ruleIdToFind = apiValidation.validations.RuleId;
-    let ruleDescToFind = apiValidation.validations.RuleDescription;
+    const ruleIdToFind = apiValidation.validations.RuleId;
+    const ruleDescToFind = apiValidation.validations.RuleDescription;
 
     let betterMatches = matchingObjects.filter(record =>
       (ruleIdToFind === undefined || record.RuleId === ruleIdToFind) &&

tests/playwright-tests/src/config/env.ts

@@ -60,8 +60,8 @@ export const config = {
   apiTestFilesPath: 'api/testFiles',
   apiRetry: 8,
   apiWaitTime: 5000,
-  maxNumberOfRetries: 10,
-  timeBetweenRetriesInSeconds: 10, 
+  maxNumberOfRetries: process.env.MAX_NUMBER_OF_RETRIES,
+  timeBetweenRetriesInSeconds: process.env.TIME_BETWEEN_RETRIES_IN_SECONDS, 
   maxTimeBetweenRequests: 2500,
   nhsNumberKey: 'NHSNumber',
   nhsNumberKeyExceptionDemographic: 'NhsNumber',