Merge branch 'main' into feature/CCM-13610-letterRequestEventPerformance_thirdBranch

Author: Vlasis-Perdikidis

infrastructure/terraform/components/api/README.md

@@ -17,7 +17,6 @@ No requirements.
 | <a name="input_core_environment"></a> [core\_environment](#input\_core\_environment) | Environment of Core | `string` | `"prod"` | no |
 | <a name="input_default_tags"></a> [default\_tags](#input\_default\_tags) | A map of default tags to apply to all taggable resources within the component | `map(string)` | `{}` | no |
 | <a name="input_disable_gateway_execute_endpoint"></a> [disable\_gateway\_execute\_endpoint](#input\_disable\_gateway\_execute\_endpoint) | Disable the execution endpoint for the API Gateway | `bool` | `true` | no |
-| <a name="input_enable_backups"></a> [enable\_backups](#input\_enable\_backups) | Enable backups | `bool` | `false` | no |
 | <a name="input_environment"></a> [environment](#input\_environment) | The name of the tfscaffold environment | `string` | n/a | yes |
 | <a name="input_eventpub_control_plane_bus_arn"></a> [eventpub\_control\_plane\_bus\_arn](#input\_eventpub\_control\_plane\_bus\_arn) | ARN of the EventBridge control plane bus for eventpub | `string` | `""` | no |
 | <a name="input_eventpub_data_plane_bus_arn"></a> [eventpub\_data\_plane\_bus\_arn](#input\_eventpub\_data\_plane\_bus\_arn) | ARN of the EventBridge data plane bus for eventpub | `string` | `""` | no |

infrastructure/terraform/components/api/ddb_table_letters.tf

@@ -41,5 +41,10 @@ resource "aws_dynamodb_table" "letters" {
     enabled = true
   }
 
-  tags = var.default_tags
+  tags = merge(
+    local.default_tags,
+    {
+      NHSE-Enable-Dynamo-Backup-Acct = "True"
+    }
+  )
 }

infrastructure/terraform/components/api/ddb_table_mi.tf

@@ -24,5 +24,10 @@ resource "aws_dynamodb_table" "mi" {
     enabled = true
   }
 
-  tags = var.default_tags
+  tags = merge(
+    local.default_tags,
+    {
+      NHSE-Enable-Dynamo-Backup-Acct = "True"
+    }
+  )
 }

infrastructure/terraform/components/api/ddb_table_suppliers.tf

@@ -30,5 +30,10 @@ resource "aws_dynamodb_table" "suppliers" {
     enabled = true
   }
 
-  tags = var.default_tags
+  tags = merge(
+    local.default_tags,
+    {
+      NHSE-Enable-Dynamo-Backup-Acct = "True"
+    }
+  )
 }

infrastructure/terraform/components/api/modules_eventsub.tf

@@ -22,6 +22,5 @@ module "eventsub" {
   sns_success_logging_sample_percent = 0
 
   event_cache_expiry_days = 30
-  enable_event_cache      = true
   shared_infra_account_id = var.shared_infra_account_id
 }

infrastructure/terraform/components/api/variables.tf

@@ -63,12 +63,6 @@ variable "commit_id" {
   default     = "HEAD"
 }
 
-variable "enable_backups" {
-  type        = bool
-  description = "Enable backups"
-  default     = false
-}
-
 variable "force_destroy" {
   type        = bool
   description = "Flag to force deletion of S3 buckets"

infrastructure/terraform/modules/eventsub/module_s3bucket_event_cache.tf

@@ -49,6 +49,7 @@ module "s3bucket_event_cache" {
 
   default_tags = {
     Name = "Event Cache Storage"
+    NHSE-Enable-S3-Backup-Acct = "True"
   }
 }
 

internal/datastore/src/__test__/letter-repository.test.ts

@@ -494,6 +494,7 @@ describe("LetterRepository", () => {
     await checkLetterStatus("supplier1", "letter59", "PENDING");
   });
 
+  // eslint-disable-next-line jest/expect-expect
   test("should skip array gaps", async () => {
     const letters = [];
     letters[0] = createLetter("supplier1", "letter1");
@@ -516,4 +517,71 @@ describe("LetterRepository", () => {
       ]),
     ).rejects.toThrow("Cannot do operations on a non-existent table");
   });
+
+  test("should paginate through multiple pages when fetching letters by supplier", async () => {
+    const mockSend = jest
+      .fn()
+      // first call returns 30 items with a LastEvaluatedKey
+      .mockResolvedValueOnce({
+        Items: Array.from({ length: 30 }, (_, i) => ({
+          id: `letter${(i + 1).toString().padStart(3, "0")}`,
+          status: "PENDING",
+          specificationId: "specification1",
+          groupId: "group1",
+        })),
+        LastEvaluatedKey: { id: "letter030", supplierId: "supplier1" },
+      })
+      // second call returns remaining 20 items without LastEvaluatedKey
+      .mockResolvedValueOnce({
+        Items: Array.from({ length: 20 }, (_, i) => ({
+          id: `letter${(i + 31).toString().padStart(3, "0")}`,
+          status: "PENDING",
+          specificationId: "specification1",
+          groupId: "group1",
+        })),
+        LastEvaluatedKey: undefined,
+      });
+
+    const mockDdbClient = { send: mockSend } as any;
+    const repo = new LetterRepository(mockDdbClient, logger, db.config);
+
+    // request 50 letters - should require 2 DynamoDB queries due to mocked pagination
+    const letters = await repo.getLettersBySupplier("supplier1", "PENDING", 50);
+
+    // verify all 50 letters were returned
+    expect(letters).toHaveLength(50);
+
+    // verify two send calls were made (2 pages)
+    expect(mockSend).toHaveBeenCalledTimes(2);
+
+    // verify the second call included the ExclusiveStartKey from first response
+    const secondCallInput = mockSend.mock.calls[1][0].input;
+    expect(secondCallInput.ExclusiveStartKey).toEqual({
+      id: "letter030",
+      supplierId: "supplier1",
+    });
+  });
+
+  test("should respect limit when fewer items available than requested", async () => {
+    // create only 10 letters
+    for (let i = 1; i <= 10; i++) {
+      await letterRepository.putLetter(
+        createLetter(
+          "supplier1",
+          `letter${i.toString().padStart(2, "0")}`,
+          "PENDING",
+        ),
+      );
+    }
+
+    // request 50 letters but only 10 exist
+    const letters = await letterRepository.getLettersBySupplier(
+      "supplier1",
+      "PENDING",
+      50,
+    );
+
+    expect(letters).toHaveLength(10);
+    expect(letters.every((l) => l.status === "PENDING")).toBe(true);
+  });
 });

internal/datastore/src/letter-repository.ts

@@ -230,23 +230,39 @@ export class LetterRepository {
     status: string,
     limit: number,
   ): Promise<LetterBase[]> {
+    const items: Record<string, any>[] = [];
+    let ExclusiveStartKey: Record<string, any> | undefined;
     const supplierStatus = `${supplierId}#${status}`;
-    const result = await this.ddbClient.send(
-      new QueryCommand({
-        TableName: this.config.lettersTableName,
-        IndexName: "supplierStatus-index",
-        KeyConditionExpression: "supplierStatus = :supplierStatus",
-        Limit: limit,
-        ExpressionAttributeNames: {
-          "#status": "status", // reserved keyword
-        },
-        ExpressionAttributeValues: {
-          ":supplierStatus": supplierStatus,
-        },
-        ProjectionExpression:
-          "id, #status, specificationId, groupId, reasonCode, reasonText",
-      }),
-    );
-    return z.array(LetterSchemaBase).parse(result.Items ?? []);
+    let res;
+
+    do {
+      const remaining = limit - items.length;
+
+      res = await this.ddbClient.send(
+        new QueryCommand({
+          TableName: this.config.lettersTableName,
+          IndexName: "supplierStatus-index",
+          KeyConditionExpression: "supplierStatus = :supplierStatus",
+          ExpressionAttributeNames: {
+            "#status": "status", // reserved keyword
+          },
+          ExpressionAttributeValues: {
+            ":supplierStatus": supplierStatus,
+          },
+          ProjectionExpression:
+            "id, #status, specificationId, groupId, reasonCode, reasonText",
+          Limit: remaining, // limit is a per-page cap
+          ExclusiveStartKey,
+        }),
+      );
+
+      if (res.Items?.length) {
+        items.push(...res.Items);
+      }
+
+      ExclusiveStartKey = res.LastEvaluatedKey;
+    } while (res.LastEvaluatedKey && items.length < limit);
+
+    return z.array(LetterSchemaBase).parse(items);
   }
 }

lambdas/letter-updates-transformer/src/mappers/__tests__/letter-mapper.test.ts

@@ -27,7 +27,7 @@ describe("letter-mapper", () => {
       `https://notify.nhs.uk/cloudevents/schemas/supplier-api/letter.PRINTED.${event.dataschemaversion}.schema.json`,
     );
     expect(event.dataschemaversion).toMatch(/1\.\d+\.\d+/);
-    expect(event.subject).toBe("letter-origin/supplier-api/letter/id1");
+    expect(event.subject).toBe("letter-origin/letter-rendering/letter/id1");
     expect(event.time).toBe("2025-11-24T15:55:18.000Z");
     expect(event.recordedtime).toBe("2025-11-24T15:55:18.000Z");
     expect(event.data).toEqual({
@@ -40,7 +40,7 @@ describe("letter-mapper", () => {
       reasonCode: "R02",
       reasonText: "Reason text",
       origin: {
-        domain: "supplier-api",
+        domain: "letter-rendering",
         source: "letter-rendering/source/test",
         subject: "letter-rendering/source/letter/letter-id",
         event: event.id,