Rename parameter since we're not gonna use product IDs

Author: wildjames

.github/scripts/release_code.sh

@@ -69,7 +69,7 @@ sam deploy \
             EnabledSiteODSCodesValue="${ENABLED_SITE_ODS_CODES:-' '}" \
             EnablePostDatedNotifications="$ENABLE_POST_DATED_NOTIFICATIONS" \
             EnabledSystemsValue="${ENABLED_SYSTEMS:-' '}" \
-            EnabledSupplierProductIDsValue="${ENABLED_SUPPLIER_PRODUCT_IDS:-' '}" \
+            EnabledSupplierApplicationIDsValue="${ENABLED_SUPPLIER_PRODUCT_IDS:-' '}" \
             BlockedSiteODSCodesValue="${BLOCKED_SITE_ODS_CODES:-' '}" \
             NotifyRoutingPlanIDValue="$NOTIFY_ROUTING_PLAN_ID" \
             NotifyAPIBaseURLValue="$NOTIFY_API_BASE_URL" \

Makefile

@@ -48,7 +48,7 @@ sam-sync: guard-AWS_DEFAULT_PROFILE guard-stack_name compile
 			  "EnabledSystemsValue=$${ENABLED_SYSTEMS:-Internal Test System}" \
 			  "EnabledSiteODSCodesValue=$${ENABLED_SITE_ODS_CODES:-A83008,FA565}" \
 			  BlockedSiteODSCodesValue=$${BLOCKED_SITE_ODS_CODES:-XXXXX} \
-			  EnabledSupplierProductIDsValue=$${ENABLED_SUPPLIER_PRODUCT_IDS:-XXXXX} \
+			  EnabledSupplierApplicationIDsValue=$${ENABLED_SUPPLIER_PRODUCT_IDS:-XXXXX} \
 			  NotifyRoutingPlanIDValue=$${NOTIFY_ROUTING_PLAN_ID:-e57fe5cc-0567-4854-abe2-b7dd9014a50c} \
 			  NotifyAPIBaseURLValue=$${NOTIFY_API_BASE_URL:-https://int.api.service.nhs.uk} \
 			  EnableNotificationsInternal=$${ENABLE_NOTIFICATIONS_INTERNAL:-true} \
@@ -81,7 +81,7 @@ sam-deploy: guard-AWS_DEFAULT_PROFILE guard-stack_name
 			  "EnabledSystemsValue=$${ENABLED_SYSTEMS:-Internal Test System}" \
 			  "EnabledSiteODSCodesValue=$${ENABLED_SITE_ODS_CODES:-A83008,FA565}" \
 			  BlockedSiteODSCodesValue=$${BLOCKED_SITE_ODS_CODES:-XXXXX} \
-			  EnabledSupplierProductIDsValue=$${ENABLED_SUPPLIER_PRODUCT_IDS:-XXXXX} \
+			  EnabledSupplierApplicationIDsValue=$${ENABLED_SUPPLIER_PRODUCT_IDS:-XXXXX} \
 			  NotifyRoutingPlanIDValue=$${NOTIFY_ROUTING_PLAN_ID:-e57fe5cc-0567-4854-abe2-b7dd9014a50c} \
 			  NotifyAPIBaseURLValue=$${NOTIFY_API_BASE_URL:-https://int.api.service.nhs.uk} \
 			  EnableNotificationsInternal=$${ENABLE_NOTIFICATIONS_INTERNAL:-true} \

SAMtemplates/functions/main.yaml

@@ -46,7 +46,7 @@ Parameters:
   EnabledSystemsParam:
     Type: AWS::SSM::Parameter::Name<String>
 
-  EnabledSupplierProductIDsParam:
+  EnabledSupplierApplicationIDsParam:
     Type: AWS::SSM::Parameter::Name<String>
 
   BlockedSiteODSCodesParam:
@@ -140,7 +140,7 @@ Resources:
           USE_PRODUCT_ID_FOR_NOTIFICATIONS_FILTERING: false
           ENABLED_SYSTEMS_PARAM: !Ref EnabledSystemsParam
           #
-          ENABLED_PRODUCT_IDS_PARAM: !Ref EnabledSupplierProductIDsParam
+          ENABLED_PRODUCT_IDS_PARAM: !Ref EnabledSupplierApplicationIDsParam
           ENABLED_SITE_ODS_CODES_PARAM: !Ref EnabledSiteODSCodesParam
           BLOCKED_SITE_ODS_CODES_PARAM: !Ref BlockedSiteODSCodesParam
           ENABLE_NOTIFICATIONS_PARAM: !Ref EnableNotificationsInternalParam

SAMtemplates/main_template.yaml

@@ -129,7 +129,7 @@ Parameters:
     Type: String
     Default: " "
 
-  EnabledSupplierProductIDsValue:
+  EnabledSupplierApplicationIDsValue:
     Type: String
     Default: " "
 
@@ -192,7 +192,7 @@ Resources:
         EnableNotificationsExternalValue: !Ref EnableNotificationsExternal
         EnabledSiteODSCodesValue: !Ref EnabledSiteODSCodesValue
         EnabledSystemsValue: !Ref EnabledSystemsValue
-        EnabledSupplierProductIDsValue: !Ref EnabledSupplierProductIDsValue
+        EnabledSupplierApplicationIDsValue: !Ref EnabledSupplierApplicationIDsValue
         BlockedSiteODSCodesValue: !Ref BlockedSiteODSCodesValue
         NotifyRoutingPlanIDValue: !Ref NotifyRoutingPlanIDValue
         NotifyAPIBaseURLValue: !Ref NotifyAPIBaseURLValue
@@ -259,7 +259,7 @@ Resources:
         SQSSaltSecret: !GetAtt Secrets.Outputs.SQSSaltSecret
         EnabledSiteODSCodesParam: !GetAtt Parameters.Outputs.EnabledSiteODSCodesParameterName
         EnabledSystemsParam: !GetAtt Parameters.Outputs.EnabledSystemsParameterName
-        EnabledSupplierProductIDsParam: !GetAtt Parameters.Outputs.EnabledSupplierProductIDsParameterName
+        EnabledSupplierApplicationIDsParam: !GetAtt Parameters.Outputs.EnabledSupplierApplicationIDsParameterName
         BlockedSiteODSCodesParam: !GetAtt Parameters.Outputs.BlockedSiteODSCodesParameterName
         NotifyRoutingPlanIDParam: !GetAtt Parameters.Outputs.NotifyRoutingPlanIDParameterName
         NotifyAPIBaseURLParam: !GetAtt Parameters.Outputs.NotifyAPIBaseURLParameterName

SAMtemplates/parameters/main.yaml

@@ -28,7 +28,7 @@ Parameters:
     Type: String
     Default: " "
 
-  EnabledSupplierProductIDsValue:
+  EnabledSupplierApplicationIDsValue:
     Type: String
     Default: " "
 
@@ -73,13 +73,13 @@ Resources:
       Type: String
       Value: !Ref EnabledSystemsValue
 
-  EnabledSupplierProductIDsParameter:
+  EnabledSupplierApplicationIDsParameter:
     Type: AWS::SSM::Parameter
     Properties:
-      Name: !Sub ${StackName}-PSUNotifyEnabledSupplierProductIDs
+      Name: !Sub ${StackName}-PSUNotifyEnabledSupplierApplicationIDs
       Description: "List of supplier product IDs for which notifications are enabled"
       Type: String
-      Value: !Ref EnabledSupplierProductIDsValue
+      Value: !Ref EnabledSupplierApplicationIDsValue
 
   BlockedSiteODSCodesParameter:
     Type: AWS::SSM::Parameter
@@ -167,7 +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}-PSUNotifyEnabledSupplierApplicationIDs
               - !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
@@ -192,11 +192,11 @@ Outputs:
     Export:
       Name: !Sub ${StackName}-PSUNotifyEnabledSystemsParam
 
-  EnabledSupplierProductIDsParameterName:
+  EnabledSupplierApplicationIDsParameterName:
     Description: "Name of the SSM parameter holding enabled supplier product IDs"
-    Value: !Ref EnabledSupplierProductIDsParameter
+    Value: !Ref EnabledSupplierApplicationIDsParameter
     Export:
-      Name: !Sub ${StackName}-PSUNotifyEnabledSupplierProductIDsParam
+      Name: !Sub ${StackName}-PSUNotifyEnabledSupplierApplicationIDsParam
 
   BlockedSiteODSCodesParameterName:
     Description: "Name of the SSM parameter holding blocked site ODS codes"

packages/updatePrescriptionStatus/src/validation/notificationSiteAndSystemFilters.ts

@@ -66,7 +66,7 @@ export async function checkSiteOrSystemIsNotifyEnabled(
 
     logger?.info(
       "Product ID, application name, and ODS code",
-      {productId: appId, applicationName: appName, odsCode, enabledSystemAppIds}
+      {ApplicationID: appId, applicationName: appName, odsCode, enabledSystemAppIds}
     )
 
     // Is this item supplier enabled?