CCM-13675: Get rid of js validators in lamdbas

Author: simonlabarere

lambdas/print-sender-lambda/src/__tests__/app/print-sender.test.ts

@@ -119,10 +119,7 @@ describe('PrintSender', () => {
 
       mockEventPublisher.sendEvents.mockImplementation(
         async (events, validator) => {
-          const isValid = validator(events[0]);
-          if (!isValid) {
-            throw new Error('Event validation failed');
-          }
+          validator(events[0], mockLogger);
           return [];
         },
       );
@@ -160,12 +157,11 @@ describe('PrintSender', () => {
       const [[events, eventValidator]] =
         mockEventPublisher.sendEvents.mock.calls;
       const event = events[0] as LetterRequestPreparedEvent;
-      const validationResult = eventValidator(event);
+      expect(() => eventValidator(event, mockLogger)).not.toThrow();
 
       expect(event.source).toBe(
         '/data-plane/digital-letters/staging-account/staging',
       );
-      expect(validationResult).toBe(true);
     });
   });
 });

lambdas/print-sender-lambda/src/app/print-sender.ts

@@ -1,4 +1,4 @@
-import { PDFAnalysed } from 'digital-letters-events';
+import { InvalidEvent, PDFAnalysed } from 'digital-letters-events';
 import { EventPublisher, Logger } from 'utils';
 import { randomUUID } from 'node:crypto';
 import {
@@ -53,7 +53,16 @@ export class PrintSender {
 
       await this.eventPublisher.sendEvents<LetterRequestPreparedEvent>(
         [letterPreparedEvent],
-        (event) => $LetterRequestPreparedEvent.safeParse(event).success,
+        (event, logger) => {
+          const parseResult = $LetterRequestPreparedEvent.safeParse(event);
+          if (!parseResult.success) {
+            logger.error({
+              err: parseResult.error,
+              description: 'Error parsing LetterRequestPreparedEvent event',
+            });
+            throw new InvalidEvent('Invalid LetterRequestPreparedEvent');
+          }
+        },
       );
     } catch (error) {
       this.logger.error({

lambdas/print-status-handler/src/apis/sqs-handler.ts

@@ -9,7 +9,10 @@ import {
   $LetterEvent,
   LetterEvent,
 } from '@nhsdigital/nhs-notify-event-schemas-supplier-api/src/events/letter-events';
-import { PrintLetterTransitioned, validatePrintLetterTransitioned } from 'digital-letters-events';
+import {
+  PrintLetterTransitioned,
+  validatePrintLetterTransitioned,
+} from 'digital-letters-events';
 import { EventPublisher, Logger } from 'utils';
 
 export interface HandlerDependencies {

src/typescript-schema-generator/src/generate-guard-functions.ts

@@ -19,7 +19,7 @@ export async function generateGuardFunctions() {
     const validatorVariableName = `event${typeName}Validator`;
 
     let guardFunction = `import ${validatorVariableName} from 'digital-letters-events/${typeName}.js'\n`;
-    guardFunction += `import { InvalidEvent, type ${typeName} } from 'digital-letters-events';`;
+    guardFunction += `import { InvalidEvent, type ${typeName} } from 'digital-letters-events';\n`;
     guardFunction += `import { Logger } from 'utils';\n\n`;
 
     guardFunction += `export function validate${typeName}(\n`;