fix failing unit tests

Author: Vlasis-Perdikidis

lambdas/api-handler/src/handlers/post-letters.ts

@@ -1,5 +1,4 @@
 import { APIGatewayProxyHandler } from "aws-lambda";
-import { Metrics$ } from "@aws-sdk/client-s3";
 import { MetricsLogger, Unit, metricScope } from "aws-embedded-metrics";
 import type { Deps } from "../config/deps";
 import { ApiErrorDetail } from "../contracts/errors";
@@ -98,10 +97,9 @@ export default function createPostLettersHandler(
 
         const statusesMapping = new Map<string, number>();
         await enqueueLetterUpdateRequests(
-          mapToUpdateCommands(postLettersRequest, supplierId),
+          mapToUpdateCommands(postLettersRequest, supplierId, statusesMapping),
           commonIds.value.correlationId,
           deps,
-          statusesMapping,
         );
 
         await emitMetics(metrics, supplierId, statusesMapping);

lambdas/api-handler/src/handlers/post-mi.ts

@@ -1,4 +1,5 @@
 import { APIGatewayProxyHandler } from "aws-lambda";
+import { MetricsLogger, metricScope } from "aws-embedded-metrics";
 import postMIOperation from "../services/mi-operations";
 import { ApiErrorDetail } from "../contracts/errors";
 import ValidationError from "../errors/validation-error";
@@ -8,8 +9,7 @@ import { extractCommonIds } from "../utils/common-ids";
 import { PostMIRequest, PostMIRequestSchema } from "../contracts/mi";
 import { mapToMI } from "../mappers/mi-mapper";
 import { Deps } from "../config/deps";
-import { metricScope, MetricsLogger } from "aws-embedded-metrics";
-import { emitForSingleSupplier, MetricStatus } from "../utils/metrics";
+import { MetricStatus, emitForSingleSupplier } from "../utils/metrics";
 
 export default function createPostMIHandler(
   deps: Deps,

lambdas/api-handler/src/mappers/__tests__/letter-mapper.test.ts

@@ -3,14 +3,55 @@ import {
   mapToGetLetterResponse,
   mapToGetLettersResponse,
   mapToPatchLetterResponse,
+  mapToUpdateCommands,
 } from "../letter-mapper";
 import {
   GetLetterResponse,
   GetLettersResponse,
   PatchLetterResponse,
+  PostLettersRequest,
 } from "../../contracts/letters";
 
 describe("letter-mapper", () => {
+  it("maps PostLetterRequest to UpdateLetterCommands", () => {
+    const request: PostLettersRequest = {
+      data: [
+        {
+          id: "id1",
+          type: "Letter",
+          attributes: {
+            status: "REJECTED",
+            reasonCode: "123",
+            reasonText: "Reason text",
+          },
+        },
+        { id: "id2", type: "Letter", attributes: { status: "ACCEPTED" } },
+        { id: "id3", type: "Letter", attributes: { status: "DELIVERED" } },
+      ],
+    };
+    const supplierId = "testSupplierId";
+    const updateLetterCommands = mapToUpdateCommands(request, supplierId);
+    expect(updateLetterCommands).toEqual([
+      {
+        id: "id1",
+        reasonCode: "123",
+        reasonText: "Reason text",
+        supplierId: "testSupplierId",
+        status: "REJECTED",
+      },
+      {
+        id: "id2",
+        supplierId: "testSupplierId",
+        status: "ACCEPTED",
+      },
+      {
+        id: "id3",
+        supplierId: "testSupplierId",
+        status: "DELIVERED",
+      },
+    ]);
+  });
+
   it("maps an internal Letter to a PatchLetterResponse", () => {
     const date = new Date().toISOString();
     const letter: Letter = {

lambdas/api-handler/src/mappers/letter-mapper.ts

@@ -58,14 +58,24 @@ export function mapToUpdateCommand(
 export function mapToUpdateCommands(
   request: PostLettersRequest,
   supplierId: string,
+  statusesMapping?: Map<string, number>,
 ): UpdateLetterCommand[] {
-  return request.data.map((letterToUpdate: PostLettersRequestResource) => ({
-    id: letterToUpdate.id,
-    supplierId,
-    status: LetterStatus.parse(letterToUpdate.attributes.status),
-    reasonCode: letterToUpdate.attributes.reasonCode,
-    reasonText: letterToUpdate.attributes.reasonText,
-  }));
+  return request.data.map((letterToUpdate: PostLettersRequestResource) => {
+    const letterCommand = {
+      id: letterToUpdate.id,
+      supplierId,
+      status: LetterStatus.parse(letterToUpdate.attributes.status),
+      reasonCode: letterToUpdate.attributes.reasonCode,
+      reasonText: letterToUpdate.attributes.reasonText,
+    };
+    if (statusesMapping) {
+      statusesMapping.set(
+        letterCommand.status,
+        (statusesMapping.get(letterCommand.status) || 0) + 1,
+      );
+    }
+    return letterCommand;
+  });
 }
 
 // ---------------------------------------------

lambdas/api-handler/src/services/letter-operations.ts

@@ -95,7 +95,6 @@ export async function enqueueLetterUpdateRequests(
   updateLetterCommands: UpdateLetterCommand[],
   correlationId: string,
   deps: Deps,
-  statusesMapping?: Map<string, number>,
 ) {
   const BATCH_SIZE = 10; // SQS SendMessageBatch max
   const CONCURRENCY = 5; // number of parallel batch API calls
@@ -109,21 +108,13 @@ export async function enqueueLetterUpdateRequests(
 
     await Promise.all(
       window.map(async (batch, batchIdx) => {
-        const entries = batch.map((request, idx) => {
-          if (statusesMapping) {
-            statusesMapping.set(
-              request.status,
-              (statusesMapping.get(request.status) || 0) + 1,
-            );
-          }
-          return {
-            Id: `${i + batchIdx}-${idx}`, // unique per batch entry
-            MessageBody: JSON.stringify(request),
-            MessageAttributes: {
-              CorrelationId: { DataType: "String", StringValue: correlationId },
-            },
-          };
-        });
+        const entries = batch.map((request, idx) => ({
+          Id: `${i + batchIdx}-${idx}`, // unique per batch entry
+          MessageBody: JSON.stringify(request),
+          MessageAttributes: {
+            CorrelationId: { DataType: "String", StringValue: correlationId },
+          },
+        }));
 
         const cmd = new SendMessageBatchCommand({
           QueueUrl: deps.env.QUEUE_URL,

lambdas/api-handler/src/utils/metrics.ts

@@ -16,7 +16,7 @@ export function emitForSingleSupplier(
   metrics.putMetric(message, count, Unit.Count);
 }
 
-export declare enum MetricStatus {
+export enum MetricStatus {
   Success = "success",
   Failure = "failure",
 }