config fix

Author: Namitha-Prabhu

config/suppliers/letter-variant/client1-campaign7.json

@@ -28,7 +28,9 @@
   "description": "Economy, colour printing",
   "id": "client1-campaign7",
   "name": "Client1 - Campaign 7",
-  "packSpecificationIds": [],
+  "packSpecificationIds": [
+    "notify-c5-colour"
+  ],
   "priority": 50,
   "status": "INT",
   "type": "STANDARD",

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

@@ -6,6 +6,8 @@ import {
   getAllocationLog,
   getAllocationLogForDomainId,
   getVariantsForAllocation,
+  getVolumeGroupData,
+  updateLetterVariantConfig,
   updateVolumeGroupData,
 } from "tests/helpers/allocation-helper";
 import { createPreparedV1Event } from "tests/helpers/event-fixtures";
@@ -99,6 +101,10 @@ test.describe("Allocator Rejected Allocation Tests", () => {
         pageCount,
       });
 
+      if (letterVariantMapping === 7) {
+        await updateLetterVariantConfig(letterVariant, [""]);
+      }
+
       const response = await sendSnsEvent(preparedEvent);
       expect(response.MessageId).toBeTruthy();
 
@@ -134,9 +140,10 @@ test.describe("Allocator Rejected Allocation Tests", () => {
           break;
         }
         case 3: {
-          expect(lettersInDb.reasonText).toBe(
-            `No pack specification found for id `,
+          expect(lettersInDb.reasonText).toContain(
+            `No pack specification found for id`,
           );
+          await updateLetterVariantConfig(letterVariant, ["notify-c5-colour"]); // update back to valid config for other tests
           break;
         }
         default: {
@@ -146,36 +153,43 @@ test.describe("Allocator Rejected Allocation Tests", () => {
     });
   }
 
-  const volumeGroupInactiveTestCases: VolumeGroupInactiveTestCase[] = [
+  for (const { fieldToUpdate, testName, volumeGroupId } of [
     {
       testName:
         "Verify that letters are rejected when volumeGroup is not active",
       volumeGroupId: "volumeGroup-test2",
       fieldToUpdate: "startDate",
-      daysInFuture: 1,
     },
     {
       testName:
         "Verify that letters are rejected when volumeGroup is no longer active",
       volumeGroupId: "volumeGroup-test2",
       fieldToUpdate: "endDate",
-      daysInFuture: -1,
     },
-  ];
-
-  for (const {
-    daysInFuture,
-    fieldToUpdate,
-    testName,
-    volumeGroupId,
-  } of volumeGroupInactiveTestCases) {
+  ]) {
     test(testName, async () => {
       const domainId = `${fieldToUpdate}-${randomUUID()}`;
       const letterVariant = getVariantsForAllocation(8);
       logger.info(`Testing volumeGroup with futureDate: ${domainId}`);
 
-      // set volume group date to future date
-      await updateVolumeGroupData(volumeGroupId, daysInFuture, fieldToUpdate);
+      const { originalEndDate, originalStartDate } =
+        await getVolumeGroupData(volumeGroupId);
+
+      const [futureStartDate] = new Date(Date.now() + 24 * 60 * 60 * 1000)
+        .toISOString()
+        .split("T"); // move start date to future
+      const [pastEndDate] = new Date(Date.now() - 24 * 60 * 60 * 1000)
+        .toISOString()
+        .split("T"); // move end date to past
+
+      const targetUpdateDate =
+        fieldToUpdate === "startDate" ? futureStartDate : pastEndDate;
+
+      await updateVolumeGroupData(
+        volumeGroupId,
+        targetUpdateDate,
+        fieldToUpdate,
+      );
 
       const preparedEvent = createPreparedV1Event({
         domainId,
@@ -199,8 +213,11 @@ test.describe("Allocator Rejected Allocation Tests", () => {
       expect(lettersInDb.reasonText).toContain(
         `Volume group with id ${volumeGroupId} is not active`,
       );
-      // update back to current date
-      await updateVolumeGroupData(volumeGroupId, 0, fieldToUpdate);
+      await updateVolumeGroupData(
+        volumeGroupId,
+        fieldToUpdate === "startDate" ? originalStartDate : originalEndDate,
+        fieldToUpdate,
+      );
     });
   }
 });

tests/helpers/allocation-helper.ts

@@ -123,7 +123,6 @@ export type VolumeGroupInactiveTestCase = {
   testName: string;
   volumeGroupId: string;
   fieldToUpdate: VolumeGroupDateField;
-  daysInFuture: number;
 };
 
 const getSupplierConfigTableName = (): string =>
@@ -388,17 +387,9 @@ export async function updateSupplierOverallAllocation(
 
 export async function updateVolumeGroupData(
   volumeGroupId: string,
-  daysInFuture: number,
-  fieldName: "startDate" | "endDate" = "startDate",
+  targetDate: string,
+  fieldName: string,
 ) {
-  const days = Math.abs(daysInFuture);
-  const dayOffset = fieldName === "endDate" ? -days : days;
-  const targetDate = new Date(Date.now() + dayOffset * 24 * 60 * 60 * 1000)
-    .toISOString()
-    .split("T")[0];
-
-  logger.info(`targetDate for volume group update is ${targetDate}`);
-
   const key = {
     pk: "ENTITY#volume-group",
     sk: `ID#${volumeGroupId}`,
@@ -421,6 +412,32 @@ export async function updateVolumeGroupData(
   );
 }
 
+export async function getVolumeGroupData(volumeGroupId: string): Promise<{
+  originalStartDate: string;
+  originalEndDate: string;
+}> {
+  const { Item } = await docClient.send(
+    new GetCommand({
+      TableName: getSupplierConfigTableName(),
+      Key: {
+        pk: "ENTITY#volume-group",
+        sk: `ID#${volumeGroupId}`,
+      },
+    }),
+  );
+
+  if (!Item) {
+    throw new Error(
+      `Volume group data was not found in supplier config table for id ${volumeGroupId}`,
+    );
+  }
+
+  return {
+    originalEndDate: Item.endDate,
+    originalStartDate: Item.startDate,
+  };
+}
+
 export async function updateSupplierAllocation(
   supplierId: string,
   volumeGroupId: string,
@@ -449,3 +466,30 @@ export async function updateSupplierAllocation(
     }),
   );
 }
+
+export async function updateLetterVariantConfig(
+  letterVariantId: string,
+  packSpecificationIds: string[],
+) {
+  const now = new Date().toISOString();
+  const key = {
+    pk: "ENTITY#letter-variant",
+    sk: `ID#${letterVariantId}`,
+  };
+  await docClient.send(
+    new UpdateCommand({
+      TableName: getSupplierConfigTableName(),
+      Key: key,
+      UpdateExpression: `
+          SET
+            packSpecificationIds = :packSpecificationIds,
+            updatedAt = :now
+        `,
+      ExpressionAttributeValues: {
+        ":packSpecificationIds": packSpecificationIds,
+        ":now": now,
+      },
+      ConditionExpression: "attribute_exists(pk) AND attribute_exists(sk)",
+    }),
+  );
+}