fix flaky tests

Author: Namitha-Prabhu

internal/datastore/src/supplier-config-repository.ts

@@ -125,7 +125,6 @@ export class SupplierConfigRepository {
         },
       }),
     );
-
     return $SupplierPack.array().parse(result.Items);
   }
 

tests/component-tests/allocation-tests/allocation-target-percentage.spec.ts

@@ -2,6 +2,8 @@ import { randomUUID } from "node:crypto";
 import test, { expect } from "playwright/test";
 import {
   getAllocationLogForDomainId,
+  getLetterVariantConfigFromDb,
+  getSupplierFromSupplierPack,
   getVariantsForAllocation,
   updateSupplierAllocation,
 } from "tests/helpers/allocation-helper";
@@ -14,10 +16,13 @@ test.describe("Allocation Target Percentage Tests", () => {
   test("Verify that supplier with zero target percentage is handled correctly", async () => {
     const letterVariant = getVariantsForAllocation(8);
     const domainId = `Zero-Percentage-${randomUUID()}`;
-    const volumeGroupId = "volumeGroup-test2";
+
+    const letterVariantConfig =
+      await getLetterVariantConfigFromDb(letterVariant);
+    const volGroupId = letterVariantConfig.volumeGroupId;
 
     // update target percentage
-    await updateSupplierAllocation("supplier1", volumeGroupId, 0);
+    await updateSupplierAllocation("supplier1", volGroupId, 0);
     const preparedEvent = createPreparedV1Event({
       domainId,
       letterVariantId: letterVariant,
@@ -44,12 +49,18 @@ test.describe("Allocation Target Percentage Tests", () => {
   });
 
   test("Verify that supplier with less than 100 target percentage is handled correctly", async () => {
-    const letterVariant = getVariantsForAllocation(8);
+    const letterVariant = getVariantsForAllocation(5);
     const domainId = `Less-Than-100-Percentage-${randomUUID()}`;
-    const volumeGroupId = "volumeGroup-test2";
+
+    const letterVariantConfig =
+      await getLetterVariantConfigFromDb(letterVariant);
+    const volGroupId = letterVariantConfig.volumeGroupId;
+    const [packSpecificationId] = letterVariantConfig.packSpecificationIds;
 
     // update target percentage
-    await updateSupplierAllocation("supplier1", volumeGroupId, 50);
+    const [supplier] = await getSupplierFromSupplierPack(packSpecificationId);
+
+    await updateSupplierAllocation(supplier, volGroupId, 50);
     const preparedEvent = createPreparedV1Event({
       domainId,
       letterVariantId: letterVariant,
@@ -68,6 +79,6 @@ test.describe("Allocation Target Percentage Tests", () => {
     expect(lettersInDb.supplierId).toBe(
       allocationLog.msg?.allocationDetails?.supplierSpec?.supplierId,
     );
-    updateSupplierAllocation("supplier1", volumeGroupId, 100); // reset target percentage to avoid impact on other tests
+    await updateSupplierAllocation(supplier, volGroupId, 100); // reset target percentage to avoid impact on other tests
   });
 });

tests/component-tests/allocation-tests/letter-allocation-rejected.spec.ts

@@ -212,9 +212,18 @@ test.describe("Allocator Rejected Allocation Tests", () => {
       expect(lettersInDb.reasonText).toContain(
         `Volume group with id ${volumeGroupId} is not active`,
       );
+
+      const resolvedOriginalEndDate =
+        originalEndDate ??
+        new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)
+          .toISOString()
+          .split("T")[0];
+
       await updateVolumeGroupData(
         volumeGroupId,
-        fieldToUpdate === "startDate" ? originalStartDate : originalEndDate,
+        fieldToUpdate === "startDate"
+          ? originalStartDate
+          : resolvedOriginalEndDate,
         fieldToUpdate,
       );
     });

tests/helpers/allocation-helper.ts

@@ -3,6 +3,7 @@ import {
   DynamoDBDocumentClient,
   GetCommand,
   PutCommand,
+  QueryCommand,
   UpdateCommand,
 } from "@aws-sdk/lib-dynamodb";
 import { envName } from "tests/constants/api-constants";
@@ -91,6 +92,7 @@ type LetterVariantConfig = {
     sides: Record<string, number>;
     sheets: Record<string, number>;
   };
+  volumeGroupId: string;
 };
 
 type DailyAllocationConfig = {
@@ -484,3 +486,37 @@ export async function updateLetterVariantConfig(
     }),
   );
 }
+
+export async function getSupplierFromSupplierPack(
+  packSpecificationId: string,
+): Promise<string[]> {
+  const { Items } = await docClient.send(
+    new QueryCommand({
+      TableName: getSupplierConfigTableName(),
+      IndexName: "packSpecificationId-index",
+      KeyConditionExpression:
+        "#pk = :pk AND #packSpecificationId = :packSpecificationId",
+      FilterExpression: "#status = :status AND #approval = :approval",
+      ExpressionAttributeNames: {
+        "#pk": "pk",
+        "#packSpecificationId": "packSpecificationId",
+        "#status": "status",
+        "#approval": "approval",
+      },
+      ExpressionAttributeValues: {
+        ":pk": "ENTITY#supplier-pack",
+        ":packSpecificationId": packSpecificationId,
+        ":status": "PROD",
+        ":approval": "APPROVED",
+      },
+    }),
+  );
+
+  if (!Items || Items.length === 0) {
+    throw new Error(
+      `No suppliers found for pack specification ${packSpecificationId}`,
+    );
+  }
+
+  return Items.map((item) => String(item.supplierId));
+}