implement the ID checking in parallel, with env flag to toggle between id and name checkign

Author: wildjames

SAMtemplates/functions/main.yaml

@@ -46,6 +46,9 @@ Parameters:
   EnabledSystemsParam:
     Type: AWS::SSM::Parameter::Name<String>
 
+  EnabledSupplierProductIDsParam:
+    Type: AWS::SSM::Parameter::Name<String>
+
   BlockedSiteODSCodesParam:
     Type: AWS::SSM::Parameter::Name<String>
 
@@ -132,8 +135,13 @@ Resources:
           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
+          # Remove this once we've confirmed that product ID based filtering is working as expected and we
+          # no longer need the ability to switch back to the old filtering method
+          USE_PRODUCT_ID_FOR_NOTIFICATIONS_FILTERING: false
           ENABLED_SYSTEMS_PARAM: !Ref EnabledSystemsParam
+          #
+          ENABLED_PRODUCT_IDS_PARAM: !Ref EnabledSupplierProductIDsParam
+          ENABLED_SITE_ODS_CODES_PARAM: !Ref EnabledSiteODSCodesParam
           BLOCKED_SITE_ODS_CODES_PARAM: !Ref BlockedSiteODSCodesParam
           ENABLE_NOTIFICATIONS_PARAM: !Ref EnableNotificationsInternalParam
           LOG_LEVEL: !Ref LogLevel

SAMtemplates/main_template.yaml

@@ -254,6 +254,7 @@ Resources:
         SQSSaltSecret: !GetAtt Secrets.Outputs.SQSSaltSecret
         EnabledSiteODSCodesParam: !GetAtt Parameters.Outputs.EnabledSiteODSCodesParameterName
         EnabledSystemsParam: !GetAtt Parameters.Outputs.EnabledSystemsParameterName
+        EnabledSupplierProductIDsParam: !GetAtt Parameters.Outputs.EnabledSupplierProductIDsParameterName
         BlockedSiteODSCodesParam: !GetAtt Parameters.Outputs.BlockedSiteODSCodesParameterName
         NotifyRoutingPlanIDParam: !GetAtt Parameters.Outputs.NotifyRoutingPlanIDParameterName
         NotifyAPIBaseURLParam: !GetAtt Parameters.Outputs.NotifyAPIBaseURLParameterName

SAMtemplates/parameters/main.yaml

@@ -28,6 +28,10 @@ Parameters:
     Type: String
     Default: " "
 
+  EnabledSupplierProductIDsValue:
+    Type: String
+    Default: " "
+
   BlockedSiteODSCodesValue:
     Type: String
     Default: " "
@@ -39,7 +43,7 @@ Parameters:
   NotifyAPIBaseURLValue:
     Type: String
     Default: " "
-  
+
   TestPresciptionsParamValue1:
     Type: String
 
@@ -69,6 +73,14 @@ Resources:
       Type: String
       Value: !Ref EnabledSystemsValue
 
+  EnabledSupplierProductIDsParameter:
+    Type: AWS::SSM::Parameter
+    Properties:
+      Name: !Sub ${StackName}-PSUNotifyEnabledSupplierProductIDs
+      Description: "List of supplier product IDs for which notifications are enabled"
+      Type: String
+      Value: !Ref EnabledSupplierProductIDsValue
+
   BlockedSiteODSCodesParameter:
     Type: AWS::SSM::Parameter
     Properties:
@@ -155,6 +167,7 @@ Resources:
             Resource:
               - !Sub arn:aws:ssm:${AWS::Region}:${AWS::AccountId}:parameter/${StackName}-PSUNotifyEnabledSiteODSCodes
               - !Sub arn:aws:ssm:${AWS::Region}:${AWS::AccountId}:parameter/${StackName}-PSUNotifyEnabledSystems
+              - !Sub arn:aws:ssm:${AWS::Region}:${AWS::AccountId}:parameter/${StackName}-PSUNotifyEnabledSupplierProductIDs
               - !Sub arn:aws:ssm:${AWS::Region}:${AWS::AccountId}:parameter/${StackName}-PSUNotifyBlockedSiteODSCodes
               - !Sub arn:aws:ssm:${AWS::Region}:${AWS::AccountId}:parameter/${StackName}-PSUNotifyRoutingPlanID
               - !Sub arn:aws:ssm:${AWS::Region}:${AWS::AccountId}:parameter/${StackName}-PSUNotifyApiBaseUrl
@@ -179,6 +192,12 @@ Outputs:
     Export:
       Name: !Sub ${StackName}-PSUNotifyEnabledSystemsParam
 
+  EnabledSupplierProductIDsParameterName:
+    Description: "Name of the SSM parameter holding enabled supplier product IDs"
+    Value: !Ref EnabledSupplierProductIDsParameter
+    Export:
+      Name: !Sub ${StackName}-PSUNotifyEnabledSupplierProductIDsParam
+
   BlockedSiteODSCodesParameterName:
     Description: "Name of the SSM parameter holding blocked site ODS codes"
     Value: !Ref BlockedSiteODSCodesParameter

packages/nhsNotifyLambda/tests/testHelpers.ts

@@ -53,6 +53,7 @@ export function constructPSUDataItem(overrides: Partial<PSUDataItem> = {}): PSUD
     TaskID: "mnopqr-ghijkl-abcdef",
     TerminalStatus: "ready to collect",
     ApplicationName: "Jim's Pills",
+    ApplicationID: "550e8400-e29b-41d4-a716-446655440000",
     ExpiryTime: 123,
     ...overrides
   }

packages/postDatedLambda/tests/testBusinessLogic.test.ts

@@ -39,6 +39,7 @@ function createPSURecord(overrides: Partial<PSUDataItem> = {}): PSUDataItem {
     TaskID: "task-123",
     TerminalStatus: "terminal",
     ApplicationName: "post-dated-tests",
+    ApplicationID: "550e8400-e29b-41d4-a716-446655440000",
     ExpiryTime: 0,
     PostDatedLastModifiedSetAt: "2026-01-01T00:00:00.000Z"
   }

packages/updatePrescriptionStatus/src/validation/notificationSiteAndSystemFilters.ts

@@ -2,6 +2,10 @@ import {PSUDataItemWithPrevious} from "@psu-common/commonTypes"
 import {initiatedSSMProvider} from "@psu-common/utilities"
 import {Logger} from "@aws-lambda-powertools/logger"
 
+const USE_PRODUCT_ID_FOR_NOTIFICATIONS_FILTERING =
+  (process.env.USE_PRODUCT_ID_FOR_NOTIFICATIONS_FILTERING || "false")
+    .toLowerCase() === "true"
+
 function str2set(value: string | undefined): Set<string> {
   const raw = value ?? ""
   return new Set(raw
@@ -13,22 +17,26 @@ function str2set(value: string | undefined): Set<string> {
 
 async function loadConfig(): Promise<{
   enabledSiteODSCodes: Set<string>,
+  enabledSystemAppNames: Set<string>,
   enabledSystemAppIds: Set<string>,
   blockedSiteODSCodes: Set<string>
 }> {
   const paramNames = {
     [process.env.ENABLED_SITE_ODS_CODES_PARAM!]: {maxAge: 5},
     [process.env.ENABLED_SYSTEMS_PARAM!]: {maxAge: 5},
+    [process.env.ENABLED_PRODUCT_IDS_PARAM!]: {maxAge: 5},
     [process.env.BLOCKED_SITE_ODS_CODES_PARAM!]: {maxAge: 5}
   }
   const all = await initiatedSSMProvider.getParametersByName(paramNames)
 
   const enabledSiteODSCodes = str2set(all[process.env.ENABLED_SITE_ODS_CODES_PARAM!] as string)
-  const enabledSystemAppIds = str2set(all[process.env.ENABLED_SYSTEMS_PARAM!] as string)
+  const enabledSystemAppNames = str2set(all[process.env.ENABLED_SYSTEMS_PARAM!] as string)
+  const enabledSystemAppIds = str2set(all[process.env.ENABLED_PRODUCT_IDS_PARAM!] as string)
   const blockedSiteODSCodes = str2set(all[process.env.BLOCKED_SITE_ODS_CODES_PARAM!] as string)
 
   return {
     enabledSiteODSCodes,
+    enabledSystemAppNames,
     enabledSystemAppIds,
     blockedSiteODSCodes
   }
@@ -48,17 +56,30 @@ export async function checkSiteOrSystemIsNotifyEnabled(
   logger?: Logger
 ): Promise<Array<PSUDataItemWithPrevious>> {
   // Get the configuration from either the cache or SSM
-  const {enabledSiteODSCodes, enabledSystemAppIds, blockedSiteODSCodes} = await loadConfig()
+  const {enabledSiteODSCodes, enabledSystemAppNames, enabledSystemAppIds, blockedSiteODSCodes} = await loadConfig()
   const unfilteredItemCount = data.length
 
   const filteredItems = data.filter((item) => {
     const appId = item.current.ApplicationID.trim().toLowerCase()
+    const appName = item.current.ApplicationName.trim().toLowerCase()
     const odsCode = item.current.PharmacyODSCode.trim().toLowerCase()
 
-    // Is this item either ODS enabled, or supplier enabled?
-    const isEnabledSystem = enabledSiteODSCodes.has(odsCode) || enabledSystemAppIds.has(appId)
-    if (!isEnabledSystem) {
-      return false
+    logger?.info(
+      "Product ID, application name, and ODS code",
+      {productId: appId, applicationName: appName, odsCode, enabledSystemAppIds}
+    )
+
+    // Is this item supplier enabled?
+    if (USE_PRODUCT_ID_FOR_NOTIFICATIONS_FILTERING) {
+      const isEnabledProduct = enabledSiteODSCodes.has(odsCode) || enabledSystemAppIds.has(appId)
+      if (!isEnabledProduct) {
+        return false
+      }
+    } else {
+      const isEnabledSystem = enabledSiteODSCodes.has(odsCode) || enabledSystemAppNames.has(appId)
+      if (!isEnabledSystem) {
+        return false
+      }
     }
 
     // Cannot have a blocked ODS code