Gate the post-dated lambda behind a feature flag in updatePrescriptionStatus. Enable in in dev, qa, and int, but leave it off in ref and prod

Author: wildjames

.github/workflows/ci.yml

@@ -86,6 +86,7 @@ jobs:
       ENABLE_BACKUP: "True"
       ENABLE_NOTIFICATIONS_INTERNAL: true
       ENABLE_NOTIFICATIONS_EXTERNAL: false
+      ENABLE_POST_DATED_NOTIFICATIONS: true
       ENABLED_SYSTEMS: "Internal Test System"
       BLOCKED_SITE_ODS_CODES: "B3J1Z"
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
@@ -126,6 +127,7 @@ jobs:
       ENABLE_BACKUP: "False"
       ENABLE_NOTIFICATIONS_INTERNAL: false
       ENABLE_NOTIFICATIONS_EXTERNAL: false
+      ENABLE_POST_DATED_NOTIFICATIONS: true
       ENABLED_SYSTEMS: "Internal Test System"
       BLOCKED_SITE_ODS_CODES: "B3J1Z"
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
@@ -163,6 +165,7 @@ jobs:
       ENABLE_BACKUP: "False"
       ENABLE_NOTIFICATIONS_INTERNAL: false
       ENABLE_NOTIFICATIONS_EXTERNAL: false
+      ENABLE_POST_DATED_NOTIFICATIONS: true
       ENABLED_SYSTEMS: "Internal Test System"
       BLOCKED_SITE_ODS_CODES: "B3J1Z"
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"

.github/workflows/pull_request.yml

@@ -119,6 +119,7 @@ jobs:
       ENABLE_BACKUP: "False"
       ENABLE_NOTIFICATIONS_INTERNAL: true
       ENABLE_NOTIFICATIONS_EXTERNAL: false
+      ENABLE_POST_DATED_NOTIFICATIONS: true
       ENABLED_SYSTEMS: "Internal Test System"
       BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"

.github/workflows/release.yml

@@ -84,6 +84,7 @@ jobs:
       ENABLE_BACKUP: "True"
       ENABLE_NOTIFICATIONS_INTERNAL: false
       ENABLE_NOTIFICATIONS_EXTERNAL: false
+      ENABLE_POST_DATED_NOTIFICATIONS: true
       ENABLED_SYSTEMS: "Internal Test System"
       BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
@@ -223,6 +224,7 @@ jobs:
       ENABLE_BACKUP: "False"
       ENABLE_NOTIFICATIONS_INTERNAL: false
       ENABLE_NOTIFICATIONS_EXTERNAL: false
+      ENABLE_POST_DATED_NOTIFICATIONS: true
       ENABLED_SYSTEMS: "Internal Test System, Apotec Ltd - Apotec CRM - Production, CrxPatientApp, nhsPrescriptionApp, Titan PSU Prod"
       BLOCKED_SITE_ODS_CODES: "B3J1Z"
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
@@ -266,6 +268,7 @@ jobs:
       ENABLE_BACKUP: "True"
       ENABLE_NOTIFICATIONS_INTERNAL: true
       ENABLE_NOTIFICATIONS_EXTERNAL: true
+      ENABLE_POST_DATED_NOTIFICATIONS: true
       ENABLED_SYSTEMS: "Internal Test System" # Workaround empty string handling
       BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"

.github/workflows/run_release_code_and_api.yml

@@ -84,6 +84,10 @@ on:
         required: false
         type: boolean
         default: false
+      ENABLE_POST_DATED_NOTIFICATIONS:
+        required: false
+        type: boolean
+        default: false
       ENABLED_SYSTEMS:
         required: true
         type: string

SAMtemplates/functions/main.yaml

@@ -61,6 +61,10 @@ Parameters:
   EnableNotificationsInternalParam:
     Type: AWS::SSM::Parameter::Name<String>
 
+  EnablePostDatedNotifications:
+    Type: AWS::SSM::Parameter::Name<String>
+    Default: "false"
+
   RequireApplicationName:
     Type: String
     Default: false
@@ -126,6 +130,7 @@ Resources:
           TABLE_NAME: !Ref PrescriptionStatusUpdatesTableName
           NHS_NOTIFY_PRESCRIPTIONS_SQS_QUEUE_URL: !Ref NHSNotifyPrescriptionsSQSQueueUrl
           POST_DATED_PRESCRIPTIONS_SQS_QUEUE_URL: !Ref PostDatedNotificationsSQSQueueUrl
+          ENABLE_POST_DATED_NOTIFICATIONS: !Ref EnablePostDatedNotifications
           SQS_SALT: !Ref SQSSaltSecret
           ENABLED_SITE_ODS_CODES_PARAM: !Ref EnabledSiteODSCodesParam
           ENABLED_SYSTEMS_PARAM: !Ref EnabledSystemsParam

SAMtemplates/main_template.yaml

@@ -122,6 +122,10 @@ Parameters:
     Type: String
     Default: " "
 
+  EnablePostDatedNotifications:
+    Type: String
+    Default: "false"
+
   NotifyRoutingPlanIDValue:
     Type: String
     Default: " "
@@ -232,6 +236,7 @@ Resources:
         PrescriptionNotificationStatesTableName: !GetAtt Tables.Outputs.PrescriptionNotificationStatesTableName
         NHSNotifyPrescriptionsSQSQueueUrl: !GetAtt Messaging.Outputs.NHSNotifyPrescriptionsSQSQueueUrl
         PostDatedNotificationsSQSQueueUrl: !GetAtt Messaging.Outputs.PostDatedNotificationsSQSQueueUrl
+        EnablePostDatedNotifications: !Ref EnablePostDatedNotifications
         SQSSaltSecret: !GetAtt Secrets.Outputs.SQSSaltSecret
         EnabledSiteODSCodesParam: !GetAtt Parameters.Outputs.EnabledSiteODSCodesParameterName
         EnabledSystemsParam: !GetAtt Parameters.Outputs.EnabledSystemsParameterName

packages/updatePrescriptionStatus/src/utils/sqsClient.ts

@@ -14,6 +14,9 @@ import {
 
 import {checkSiteOrSystemIsNotifyEnabled} from "../validation/notificationSiteAndSystemFilters"
 
+// eslint-disable-next-line max-len
+const ENABLE_POST_DATED_NOTIFICATIONS = (process.env.ENABLE_POST_DATED_NOTIFICATIONS || "false").toLowerCase() === "true"
+
 const sqsUrl: string | undefined = process.env.NHS_NOTIFY_PRESCRIPTIONS_SQS_QUEUE_URL
 const postDatedSqsUrl: string | undefined = process.env.POST_DATED_PRESCRIPTIONS_SQS_QUEUE_URL
 
@@ -255,20 +258,27 @@ export async function pushPrescriptionToNotificationSQS(
     })
     .map(({current}) => current)
 
-  // Build two arrays, one of all post dated, and one of all non-post-dated
-  const postDatedItems = changedStatus.filter(item => item.PostDatedLastModifiedSetAt)
-  const nonPostDatedItems = changedStatus.filter(item => !item.PostDatedLastModifiedSetAt)
+  let sqsPromises: Promise<Array<string>>
+  if (ENABLE_POST_DATED_NOTIFICATIONS) {
+    logger.info("Post-dated notifications are enabled, separating post-dated and non-post-dated items")
+    // Build two arrays, one of all post dated, and one of all non-post-dated
+    const postDatedItems = changedStatus.filter(item => item.PostDatedLastModifiedSetAt)
+    const nonPostDatedItems = changedStatus.filter(item => !item.PostDatedLastModifiedSetAt)
 
-  const postDatedMessageIds = sendItemsToSQS(postDatedItems, postDatedSqsUrl, requestId, logger)
-  const nonPostDatedMessageIds = sendItemsToSQS(nonPostDatedItems, sqsUrl, requestId, logger)
+    const postDatedMessageIds = sendItemsToSQS(postDatedItems, postDatedSqsUrl, requestId, logger)
+    const nonPostDatedMessageIds = sendItemsToSQS(nonPostDatedItems, sqsUrl, requestId, logger)
+    sqsPromises = Promise.all([postDatedMessageIds, nonPostDatedMessageIds]).then(results => results.flat())
+  } else {
+    logger.info("Post-dated notifications are disabled, sending all items to the standard notifications queue")
+    sqsPromises = sendItemsToSQS(changedStatus, sqsUrl, requestId, logger)
+  }
 
   logger.info(
     "The following patients will have prescription update app notifications requested",
     {nhsNumbers: changedStatus.map(e => e.PatientNHSNumber)}
   )
 
-  return Promise.all([postDatedMessageIds, nonPostDatedMessageIds])
-    .then(results => results.flat())
+  return sqsPromises
 }
 
 /**