Merge branch 'aea-6063-trigger-post-dated-prescriptions' into aea-0000-add-notifications-reporting-lambda

Author: wildjames

.trivyignore.yaml

@@ -2,4 +2,8 @@ vulnerabilities:
   - id: CVE-2026-25128
     statement: fast-xml-parser vulnerability accepted as risk - dependency of aws-sdk/client-dynamodb
     expired_at: 2026-03-01
-  
+  - id: CVE-2026-25547
+    paths:
+      - "package-lock.json"
+    statement: downstream dependency of @isaacs/brace-expansion
+    expired_at: 2026-06-01

SAMtemplates/functions/main.yaml

@@ -596,8 +596,6 @@ Resources:
           LOG_LEVEL: !Ref LogLevel
           NHS_NOTIFY_PRESCRIPTIONS_SQS_QUEUE_URL: !Ref NHSNotifyPrescriptionsSQSQueueUrl
           POST_DATED_PRESCRIPTIONS_SQS_QUEUE_URL: !Ref PostDatedNotificationsSQSQueueUrl
-          POST_DATED_OVERRIDE: false
-          POST_DATED_OVERRIDE_VALUE: false # By default, override never matures post dated prescriptions
           TABLE_NAME: !Ref PrescriptionStatusUpdatesTableName
       Events:
         ScheduleEvent:

packages/common/commonTypes/src/index.ts

@@ -28,21 +28,6 @@ export interface NotifyDataItem {
   PrescriptionID: string // Needed to query NPPTS
 }
 
-/**
- * The structure of a single SQS message in a batch send.
- * I couldn't find this type exported from the SDK, and the Message type that IS exported is for receiving data,
- * not sending it.
- *
- * So, I've just done it myself. These are the core attrtibutes we use.
- */
-export interface SQSBatchMessage {
-  Id: string
-  MessageBody: string
-  MessageDeduplicationId: string
-  MessageGroupId: string
-  MessageAttributes: {[key: string]: {DataType: string; StringValue: string}}
-}
-
 /**
  * The fields stored in the Notifications table potentially updated by the Notify callback.
  */

packages/postDatedLambda/docs/mature_prescription_check.md

@@ -4,9 +4,7 @@ The business logic's `processMessage()` function accepts the SQS message for thi
 
 ```mermaid
 flowchart TD
-    A["Start `processMessage()`"] --> C{"POST_DATED_OVERRIDE?"}
-    C -- Yes --> D["Log override + return override value"]
-    C -- No --> E{"existingRecords empty?"}
+    A["Start `processMessage()`"] --> E{"existingRecords empty?"}
     E -- Yes --> F["Log error + return IGNORE"]
     E -- No --> G["Fetch most recently submitted NPPTS record"]
     G --> H{"PostDatedLastModifiedSetAt present?"}

packages/postDatedLambda/src/businessLogic.ts

@@ -4,24 +4,6 @@ import {PSUDataItem} from "@psu-common/commonTypes"
 
 import {PostDatedSQSMessageWithExistingRecords, PostDatedProcessingResult} from "./types"
 
-// defaults to false
-const POST_DATED_OVERRIDE = process.env.POST_DATED_OVERRIDE === "true"
-
-// set from environment variable POST_DATED_OVERRIDE_VALUE
-const POST_DATED_OVERRIDE_VALUE_ENV = process.env.POST_DATED_OVERRIDE_VALUE ?? "ignore"
-let POST_DATED_OVERRIDE_VALUE: PostDatedProcessingResult
-switch (POST_DATED_OVERRIDE_VALUE_ENV.toLowerCase()) {
-  case "matured":
-    POST_DATED_OVERRIDE_VALUE = PostDatedProcessingResult.MATURED
-    break
-  case "immature":
-    POST_DATED_OVERRIDE_VALUE = PostDatedProcessingResult.IMMATURE
-    break
-  default:
-    POST_DATED_OVERRIDE_VALUE = PostDatedProcessingResult.IGNORE
-    break
-}
-
 export function getMostRecentRecord(
   existingRecords: Array<PSUDataItem>
 ): PSUDataItem {
@@ -53,12 +35,6 @@ export function processMessage(
     prescriptionData: message.prescriptionData,
     existingRecords: message.existingRecords
   })
-  if (POST_DATED_OVERRIDE) {
-    logger.info("Post-dated override is enabled, returning override value", {
-      overrideValue: POST_DATED_OVERRIDE_VALUE
-    })
-    return POST_DATED_OVERRIDE_VALUE
-  }
 
   // The existingRecords array contains all records from the DynamoDB table
   // that match this prescription's PrescriptionID
@@ -141,7 +117,7 @@ export function computeTimeUntilMaturity(
   }
 
   const lastModified = new Date(prescriptionRecord.LastModified)
-  const currentTime = new Date()
+  const currentTime = Date.now()
 
-  return (lastModified.getTime() - currentTime.getTime()) / 1000
+  return (lastModified.getTime() - currentTime) / 1000
 }

packages/postDatedLambda/src/databaseClient.ts

@@ -46,27 +46,30 @@ export async function getExistingRecordsByPrescriptionID(
   let lastEvaluatedKey
   let items: Array<PSUDataItem> = []
 
+  logger.info("Querying DynamoDB for existing prescription records", {
+    prescriptionID: normalizedPrescriptionID,
+    tableName,
+    indexName: pharmacyPrescriptionIndexName
+  })
+
   try {
-    do {
+    while (true) {
       if (lastEvaluatedKey) {
         query.ExclusiveStartKey = lastEvaluatedKey
       }
 
-      logger.info("Querying DynamoDB for existing prescription records", {
-        prescriptionID: normalizedPrescriptionID,
-        tableName,
-        indexName: pharmacyPrescriptionIndexName
-      })
-
       const result = await client.send(new QueryCommand(query))
 
       if (result.Items) {
-        const parsedItems = result.Items.map((item) => unmarshall(item) as PSUDataItem)
-        items = items.concat(parsedItems)
+        const parsedItems: Array<PSUDataItem> = result.Items.map((item) => unmarshall(item) as PSUDataItem)
+        items.push(...parsedItems)
       }
 
       lastEvaluatedKey = result.LastEvaluatedKey
-    } while (lastEvaluatedKey)
+      if (!lastEvaluatedKey) {
+        break
+      }
+    }
 
     logger.info("Retrieved existing prescription records from DynamoDB", {
       prescriptionID: normalizedPrescriptionID,

packages/postDatedLambda/src/sqs.ts

@@ -5,11 +5,12 @@ import {
   ChangeMessageVisibilityBatchCommand,
   GetQueueAttributesCommand,
   SendMessageBatchCommand,
+  SendMessageBatchRequestEntry,
   Message
 } from "@aws-sdk/client-sqs"
 import {Logger} from "@aws-lambda-powertools/logger"
 
-import {NotifyDataItem, SQSBatchMessage} from "@psu-common/commonTypes"
+import {NotifyDataItem} from "@psu-common/commonTypes"
 
 import {BatchProcessingResult, PostDatedSQSMessage} from "./types"
 
@@ -35,7 +36,7 @@ function chunkArray<T>(arr: Array<T>, size: number): Array<Array<T>> {
 function buildNotificationBatchEntries(
   messages: Array<PostDatedSQSMessage>,
   logger: Logger
-): Array<SQSBatchMessage> {
+): Array<SendMessageBatchRequestEntry> {
   return messages.map((message, idx) => {
     const {prescriptionData} = message
 
@@ -70,7 +71,7 @@ function buildNotificationBatchEntries(
 }
 
 async function sendEntriesToQueue(
-  entries: Array<SQSBatchMessage>,
+  entries: Array<SendMessageBatchRequestEntry>,
   queueUrl: string,
   logger: Logger
 ): Promise<Array<string>> {

packages/postDatedLambda/tests/testBusinessLogic.test.ts

@@ -142,18 +142,6 @@ describe("businessLogic", () => {
   })
 
   describe("processMessage", () => {
-    it("should return the override value when override mode is enabled", async () => {
-      const {processMessage} = await loadBusinessLogic({
-        POST_DATED_OVERRIDE: "true",
-        POST_DATED_OVERRIDE_VALUE: "immature"
-      })
-      const logger = new Logger({serviceName: "post-dated-tests"})
-
-      const result = processMessage(logger, createMessage())
-
-      expect(result).toBe(PostDatedProcessingResult.IMMATURE)
-    })
-
     it("should ignore messages that have no existing records", async () => {
       const {processMessage} = await loadBusinessLogic()
       const logger = new Logger({serviceName: "post-dated-tests"})

packages/updatePrescriptionStatus/src/utils/sqsClient.ts

@@ -1,15 +1,10 @@
 import {Logger} from "@aws-lambda-powertools/logger"
-import {SQSClient, SendMessageBatchCommand} from "@aws-sdk/client-sqs"
+import {SQSClient, SendMessageBatchCommand, SendMessageBatchRequestEntry} from "@aws-sdk/client-sqs"
 import {getSecret} from "@aws-lambda-powertools/parameters/secrets"
 
 import {createHmac} from "node:crypto"
 
-import {
-  NotifyDataItem,
-  PSUDataItem,
-  PSUDataItemWithPrevious,
-  SQSBatchMessage
-} from "@psu-common/commonTypes"
+import {NotifyDataItem, PSUDataItem, PSUDataItemWithPrevious} from "@psu-common/commonTypes"
 
 import {checkSiteOrSystemIsNotifyEnabled} from "../validation/notificationSiteAndSystemFilters"
 
@@ -43,7 +38,7 @@ function buildSqsBatchEntries(
   items: Array<PSUDataItem>,
   requestId: string,
   sqsSalt: string
-): Array<SQSBatchMessage> {
+): Array<SendMessageBatchRequestEntry> {
   return items.map((item, idx) => ({
     Id: idx.toString(),
     MessageBody: JSON.stringify(item as NotifyDataItem),
@@ -67,7 +62,7 @@ function buildSqsBatchEntries(
  * @returns An array of the created MessageIds
  */
 async function sendEntriesToQueue(
-  entries: Array<SQSBatchMessage>,
+  entries: Array<SendMessageBatchRequestEntry>,
   queueUrl: string,
   requestId: string,
   logger: Logger