feat(cb2-14236): update batch plate failure in handler for sync test …

…result info (#162)
dvsa · Nov 1, 2024 · ec306fd · ec306fd
1 parent 0d6535e
commit ec306fd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 41 deletions.
diff --git a/src/handler/sync-test-result-info.ts b/src/handler/sync-test-result-info.ts
@@ -1,7 +1,7 @@
 import { EUVehicleCategory } from '@dvsa/cvs-type-definitions/types/v3/tech-record/enums/euVehicleCategory.enum.js';
-import { SQSBatchResponse, SQSEvent, SQSRecord } from 'aws-lambda';
+import { SQSBatchResponse, SQSEvent } from 'aws-lambda';
 import 'dotenv/config';
-import { TestResult, TestType } from '../models/testResult';
+import { TestResult } from '../models/testResult';
 import { processRecord } from '../processors/processSQSRecord';
 import { syncTestResultInfo } from '../processors/processSyncTestResultInfo';
 import logger from '../util/logger';
@@ -13,49 +13,35 @@ export const handler = async (event: SQSEvent): Promise<SQSBatchResponse> => {
     batchItemFailures: [],
   };
 
-  const promisesArray: Promise<object | undefined>[] = [];
-  try {
-    event.Records.forEach((record: SQSRecord) => {
+  // eslint-disable-next-line no-restricted-syntax
+  for (const record of event.Records) {
+    try {
       logger.debug('payload received from queue:', record);
       const test = processRecord(record) as TestResult;
       logger.debug('processed record:', test ?? 'no test');
 
-      let promiseUpdateStatus: Promise<object | undefined> | undefined;
-
       if (test) {
-        test.testTypes.forEach((testType: TestType) => {
-          if (promiseUpdateStatus === undefined) {
-            promiseUpdateStatus = syncTestResultInfo(
-              test.systemNumber,
-              test.testStatus,
-              testType.testResult ?? '',
-              testType.testTypeId,
-              test.createdById,
-              test.createdByName,
-              test.euVehicleCategory as EUVehicleCategory || undefined,
-            );
-            promisesArray.push(promiseUpdateStatus);
-          }
-        });
-      }
-    });
-
-    const results = await Promise.allSettled(promisesArray);
-
-    results.forEach((r, i) => {
-      if (r.status === 'rejected' || !r.value) {
-        response.batchItemFailures.push({
-          // eslint-disable-next-line security/detect-object-injection
-          itemIdentifier: event.Records[i].messageId,
-        });
+        // eslint-disable-next-line no-restricted-syntax
+        for (const testType of test.testTypes) {
+          // eslint-disable-next-line no-await-in-loop
+          await syncTestResultInfo(
+            test.systemNumber,
+            test.testStatus,
+            testType.testResult ?? '',
+            testType.testTypeId,
+            test.createdById,
+            test.createdByName,
+            test.euVehicleCategory as EUVehicleCategory || undefined,
+          );
+        }
       }
-    });
-
-    logger.info('resolved promises:', results);
-    return response;
-  } catch (error) {
-    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-    logger.error(`an error occurred in the promises ${error}`);
-    throw error;
+    } catch (error) {
+      logger.error(`an error occurred while processing record ${record.messageId}: ${error instanceof Error
+        ? error.message
+        : JSON.stringify(error)}`);
+      response.batchItemFailures.push({ itemIdentifier: record.messageId });
+    }
   }
+
+  return response;
 };
diff --git a/tests/unit/handler/sync-test-result-info.unit.test.ts b/tests/unit/handler/sync-test-result-info.unit.test.ts
@@ -18,7 +18,7 @@ describe('syncTestResultInfo handler', () => {
     jest.resetModules();
   });
   describe('Error handling', () => {
-    it('should now throw error if promise is rejected, but report on that failure', async () => {
+    it('should now throw error if problem with syncTestResulInfo method', async () => {
       mockProcessRecord.mockReturnValue(parsedRecord);
       mockSyncTestResultInfo.mockImplementation(() => Promise.reject(new Error('test error')));
       const failures = (await handler(queueEvent)).batchItemFailures;