rebase with main again

Author: Vlasis-Perdikidis

.github/workflows/stage-1-commit.yaml

@@ -76,7 +76,7 @@ jobs:
     needs: detect-terraform-changes
     if: needs.detect-terraform-changes.outputs.terraform_changed == 'true'
     permissions:
-        contents: write
+      contents: write
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v5
@@ -317,7 +317,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ inputs.nodejs_version }}
-          registry-url: 'https://npm.pkg.github.com'
+          registry-url: "https://npm.pkg.github.com"
 
       - name: check if local version differs from latest published version
         id: check-version

infrastructure/terraform/components/api/variables.tf

@@ -166,4 +166,5 @@ variable "core_environment" {
   type        = string
   description = "Environment of Core"
   default     = "prod"
+
 }

lambdas/upsert-letter/package.json

@@ -7,7 +7,7 @@
     "@nhsdigital/nhs-notify-event-schemas-letter-rendering-v1": "npm:@nhsdigital/nhs-notify-event-schemas-letter-rendering@^1.1.5",
     "@nhsdigital/nhs-notify-event-schemas-supplier-api": "^1.0.5",
     "@types/aws-lambda": "^8.10.148",
-    "aws-lambda": "^1.0.6",
+    "aws-lambda": "^1.0.7",
     "esbuild": "^0.27.2",
     "pino": "^9.7.0",
     "zod": "^4.1.11"

lambdas/upsert-letter/src/handler/upsert-handler.ts

@@ -5,7 +5,7 @@ import {
   SQSHandler,
   SQSRecord,
 } from "aws-lambda";
-import { InsertLetter, Letter, UpdateLetter } from "@internal/datastore";
+import { InsertLetter, UpdateLetter } from "@internal/datastore";
 import {
   $LetterRequestPreparedEvent,
   LetterRequestPreparedEvent,
@@ -26,7 +26,7 @@ type PreparedEvents = LetterRequestPreparedEventV2 | LetterRequestPreparedEvent;
 type UpsertOperation = {
   name: "Insert" | "Update";
   schemas: z.ZodSchema[];
-  handler: (request: unknown, deps: Deps) => Promise<Letter>;
+  handler: (request: unknown, deps: Deps) => Promise<void>;
 };
 
 // small envelope that must exist in all inputs
@@ -37,7 +37,7 @@ function getOperationFromType(type: string): UpsertOperation {
     return {
       name: "Insert",
       schemas: [$LetterRequestPreparedEventV2, $LetterRequestPreparedEvent],
-      handler: async (request, deps): Promise<Letter> => {
+      handler: async (request, deps) => {
         const preparedRequest = request as PreparedEvents;
         const supplierSpec: SupplierSpec = resolveSupplierForVariant(
           preparedRequest.data.letterVariantId,
@@ -47,19 +47,19 @@ function getOperationFromType(type: string): UpsertOperation {
           preparedRequest,
           supplierSpec.supplierId,
           supplierSpec.specId,
-          supplierSpec.specId, // use specId for now
+          supplierSpec.specId, //use specId for now
         );
-        return deps.letterRepo.putLetter(letterToInsert);
+        await deps.letterRepo.putLetter(letterToInsert);
       },
     };
   if (type.startsWith("uk.nhs.notify.supplier-api.letter"))
     return {
       name: "Update",
       schemas: [$LetterEvent],
-      handler: async (request, deps): Promise<Letter> => {
+      handler: async (request, deps) => {
         const supplierEvent = request as LetterEvent;
         const letterToUpdate: UpdateLetter = mapToUpdateLetter(supplierEvent);
-        return deps.letterRepo.updateLetterStatus(letterToUpdate);
+        await deps.letterRepo.updateLetterStatus(letterToUpdate);
       },
     };
   throw new Error(`Unknown operation from type=${type}`);
@@ -86,7 +86,7 @@ function mapToInsertLetter(
     subject: upsertRequest.subject,
     createdAt: now,
     updatedAt: now,
-    billingRef,
+    billingRef: billingRef,
   };
 }
 
@@ -108,7 +108,6 @@ function resolveSupplierForVariant(
 }
 
 function parseSNSNotification(record: SQSRecord) {
-  console.log("record in parseSNSNotificatino:", record);
   const notification = JSON.parse(record.body) as Partial<SNSMessage>;
   if (
     notification.Type !== "Notification" ||
@@ -137,8 +136,7 @@ async function runUpsert(
   for (const schema of operation.schemas) {
     const r = schema.safeParse(letterEvent);
     if (r.success) {
-      const letterSchemaParseResponse = await operation.handler(r.data, deps);
-      console.log("operation handler response:", letterSchemaParseResponse);
+      await operation.handler(r.data, deps);
       return;
     }
   }
@@ -151,11 +149,9 @@ export default function createUpsertLetterHandler(deps: Deps): SQSHandler {
     const batchItemFailures: SQSBatchItemFailure[] = [];
 
     const tasks = event.Records.map(async (record) => {
-      console.log("record in createUpsertLetterHandler:", record);
       try {
         const message: string = parseSNSNotification(record);
 
-        console.log("message after parsing:", message);
         const letterEvent: unknown = JSON.parse(message);
 
         const type = getType(letterEvent);