Skip to content

Chore: [AEA-6428] - Filter for notifications by application ID rather than name #2917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wildjames merged 15 commits into from
Apr 7, 2026
Merged

Chore: [AEA-6428] - Filter for notifications by application ID rather than name #2917

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8025904
Filter by application ID. Also enable product ID checking to see if i…
wildjames Mar 27, 2026
801e127
implement the ID checking in parallel, with env flag to toggle betwee…
wildjames Mar 27, 2026
0516e2d
Forgot to add default to main template yaml
wildjames Mar 27, 2026
8cf0f93
Add non-empty defaults for the new parameter
wildjames Mar 27, 2026
d23ea7a
Remove product ID check since it requires altering the apigee app
wildjames Mar 27, 2026
939311e
Rename parameter since we're not gonna use product IDs
wildjames Mar 27, 2026
3deea27
Rename from productID to app ID
wildjames Mar 30, 2026
ab45511
actually log
wildjames Mar 30, 2026
fe7fd6d
Wrong env var name
wildjames Mar 30, 2026
1fbd9df
app ID match isnt working. debug log statements
wildjames Mar 31, 2026
37c137f
TYPO
wildjames Mar 31, 2026
c651d21
Merge branch 'main' into aea-6428-filter-notifications-by-product-id
wildjames Mar 31, 2026
023366b
Rename from product ID to app ID in a few places
wildjames Apr 2, 2026
3549d59
Merge branch 'main' into aea-6428-filter-notifications-by-product-id
wildjames Apr 2, 2026
77473f9
Merge branch 'main' into aea-6428-filter-notifications-by-product-id
connoravo-nhs Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/scripts/release_code.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ sam deploy \
EnabledSiteODSCodesValue="${ENABLED_SITE_ODS_CODES:-' '}" \
EnablePostDatedNotifications="$ENABLE_POST_DATED_NOTIFICATIONS" \
EnabledSystemsValue="${ENABLED_SYSTEMS:-' '}" \
EnabledSupplierApplicationIDsValue="${ENABLED_SUPPLIER_PRODUCT_IDS:-' '}" \
BlockedSiteODSCodesValue="${BLOCKED_SITE_ODS_CODES:-' '}" \
NotifyRoutingPlanIDValue="$NOTIFY_ROUTING_PLAN_ID" \
NotifyAPIBaseURLValue="$NOTIFY_API_BASE_URL" \
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
ENABLE_POST_DATED_NOTIFICATIONS: true
ENABLED_SYSTEMS: "Internal Test System"
BLOCKED_SITE_ODS_CODES: "B3J1Z"
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
MTLS_KEY: psu-mtls-1
Expand Down Expand Up @@ -124,6 +125,7 @@ jobs:
ENABLE_POST_DATED_NOTIFICATIONS: true
ENABLED_SYSTEMS: "Internal Test System"
BLOCKED_SITE_ODS_CODES: "B3J1Z"
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX" # Workaround empty string handling
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
MTLS_KEY: psu-mtls-1
Expand All @@ -135,7 +137,8 @@ jobs:
PROXYGEN_ROLE: ${{ secrets.PROXYGEN_PTL_ROLE }}

release_qa:
needs: [tag_release, release_dev, package_code, get_commit_id, get_config_values]
needs:
[tag_release, release_dev, package_code, get_commit_id, get_config_values]
Copy link
Copy Markdown
Contributor

@tstephen-nhs tstephen-nhs Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gratuitious whitespace change?

uses: ./.github/workflows/run_release_code_and_api.yml
with:
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
Expand Down Expand Up @@ -164,6 +167,7 @@ jobs:
ENABLE_POST_DATED_NOTIFICATIONS: true
ENABLED_SYSTEMS: "Internal Test System"
BLOCKED_SITE_ODS_CODES: "B3J1Z"
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX" # Workaround empty string handling
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
MTLS_KEY: psu-mtls-1
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ jobs:
ENABLE_POST_DATED_NOTIFICATIONS: true
ENABLED_SYSTEMS: "Internal Test System"
BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
MTLS_KEY: psu-mtls-1
Expand Down Expand Up @@ -159,6 +160,7 @@ jobs:
ENABLE_NOTIFICATIONS_EXTERNAL: false
ENABLED_SYSTEMS: "Internal Test System"
BLOCKED_SITE_ODS_CODES: "B3J1Z"
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX" # Workaround empty string handling
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
MTLS_KEY: psu-mtls-1
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
jira_release_prefix: "psu"
secrets:
EXECUTE_JIRA_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}


package_code:
needs: [tag_release, get_config_values]
Expand Down Expand Up @@ -83,6 +82,7 @@ jobs:
ENABLE_POST_DATED_NOTIFICATIONS: true
ENABLED_SYSTEMS: "Internal Test System"
BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
MTLS_KEY: psu-mtls-1
Expand Down Expand Up @@ -129,6 +129,7 @@ jobs:
ENABLE_POST_DATED_NOTIFICATIONS: false
ENABLED_SYSTEMS: "Internal Test System"
BLOCKED_SITE_ODS_CODES: "B3J1Z"
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
MTLS_KEY: psu-mtls-1
Expand Down Expand Up @@ -181,6 +182,7 @@ jobs:
ENABLE_POST_DATED_NOTIFICATIONS: false
ENABLED_SYSTEMS: "Internal Test System, Apotec Ltd - Apotec CRM - Production, CrxPatientApp, nhsPrescriptionApp, Titan PSU Prod"
BLOCKED_SITE_ODS_CODES: "B3J1Z"
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
MTLS_KEY: psu-mtls-1
Expand Down Expand Up @@ -233,6 +235,7 @@ jobs:
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"
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
MTLS_KEY: psu-mtls-1
Expand All @@ -248,7 +251,8 @@ jobs:
REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}

release_int:
needs: [tag_release, release_qa, package_code, get_commit_id, get_config_values]
needs:
[tag_release, release_qa, package_code, get_commit_id, get_config_values]
uses: ./.github/workflows/run_release_code_and_api.yml
with:
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
Expand Down Expand Up @@ -277,6 +281,7 @@ jobs:
ENABLE_POST_DATED_NOTIFICATIONS: true
ENABLED_SYSTEMS: "CrxPatientApp"
BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
MTLS_KEY: psu-mtls-1
Expand All @@ -296,7 +301,8 @@ jobs:
REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}

release_int_sandbox:
needs: [tag_release, release_qa, package_code, get_commit_id, get_config_values]
needs:
[tag_release, release_qa, package_code, get_commit_id, get_config_values]
uses: ./.github/workflows/run_release_code_and_api.yml
with:
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
Expand All @@ -323,6 +329,7 @@ jobs:
ENABLE_POST_DATED_NOTIFICATIONS: false
ENABLED_SYSTEMS: "Internal Test System, Apotec Ltd - Apotec CRM - Production, CrxPatientApp, nhsPrescriptionApp, Titan PSU Prod"
BLOCKED_SITE_ODS_CODES: "B3J1Z"
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
MTLS_KEY: psu-mtls-1
Expand Down Expand Up @@ -375,6 +382,7 @@ jobs:
ENABLE_POST_DATED_NOTIFICATIONS: false
ENABLED_SYSTEMS: "CrxPatientApp"
BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c" # INT and PROD share a value
NOTIFY_API_BASE_URL: "https://api.service.nhs.uk"
MTLS_KEY: psu-mtls-1
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/run_release_code_and_api.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ on:
BLOCKED_SITE_ODS_CODES:
required: true
type: string
ENABLED_SUPPLIER_PRODUCT_IDS:
Comment thread
wildjames marked this conversation as resolved.
Outdated
required: true
type: string
NOTIFY_ROUTING_PLAN_ID:
required: true
type: string
Expand Down Expand Up @@ -216,6 +219,7 @@ jobs:
ENABLED_SITE_ODS_CODES: ${{ steps.read.outputs.ods_csv }}
ENABLED_SYSTEMS: ${{ inputs.ENABLED_SYSTEMS }}
BLOCKED_SITE_ODS_CODES: ${{ inputs.BLOCKED_SITE_ODS_CODES }}
ENABLED_SUPPLIER_PRODUCT_IDS: ${{ inputs.ENABLED_SUPPLIER_PRODUCT_IDS }}
NOTIFY_ROUTING_PLAN_ID: ${{ inputs.NOTIFY_ROUTING_PLAN_ID }}
NOTIFY_API_BASE_URL: ${{ inputs.NOTIFY_API_BASE_URL }}
TEST_PRESCRIPTIONS_1: ${{ inputs.TEST_PRESCRIPTIONS_1 || 'noval' }}
Expand Down
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +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} \
EnabledSupplierApplicationIDsValue=$${ENABLED_SUPPLIER_PRODUCT_IDS:-XXXXX} \
Comment thread
wildjames marked this conversation as resolved.
Outdated
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} \
Expand Down Expand Up @@ -80,6 +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} \
EnabledSupplierApplicationIDsValue=$${ENABLED_SUPPLIER_PRODUCT_IDS:-XXXXX} \
Comment thread
wildjames marked this conversation as resolved.
Outdated
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} \
Expand Down
10 changes: 9 additions & 1 deletion SAMtemplates/functions/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ Parameters:
EnabledSystemsParam:
Type: AWS::SSM::Parameter::Name<String>

EnabledSupplierApplicationIDsParam:
Type: AWS::SSM::Parameter::Name<String>

BlockedSiteODSCodesParam:
Type: AWS::SSM::Parameter::Name<String>

Expand Down Expand Up @@ -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_APP_ID_FOR_NOTIFICATIONS_FILTERING: false
ENABLED_SYSTEMS_PARAM: !Ref EnabledSystemsParam
#
ENABLED_APPLICATION_IDS_PARAM: !Ref EnabledSupplierApplicationIDsParam
ENABLED_SITE_ODS_CODES_PARAM: !Ref EnabledSiteODSCodesParam
BLOCKED_SITE_ODS_CODES_PARAM: !Ref BlockedSiteODSCodesParam
ENABLE_NOTIFICATIONS_PARAM: !Ref EnableNotificationsInternalParam
LOG_LEVEL: !Ref LogLevel
Expand Down
6 changes: 6 additions & 0 deletions SAMtemplates/main_template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ Parameters:
Type: String
Default: " "

EnabledSupplierApplicationIDsValue:
Type: String
Default: " "

BlockedSiteODSCodesValue:
Type: String
Default: " "
Expand Down Expand Up @@ -188,6 +192,7 @@ Resources:
EnableNotificationsExternalValue: !Ref EnableNotificationsExternal
EnabledSiteODSCodesValue: !Ref EnabledSiteODSCodesValue
EnabledSystemsValue: !Ref EnabledSystemsValue
EnabledSupplierApplicationIDsValue: !Ref EnabledSupplierApplicationIDsValue
BlockedSiteODSCodesValue: !Ref BlockedSiteODSCodesValue
NotifyRoutingPlanIDValue: !Ref NotifyRoutingPlanIDValue
NotifyAPIBaseURLValue: !Ref NotifyAPIBaseURLValue
Expand Down Expand Up @@ -254,6 +259,7 @@ Resources:
SQSSaltSecret: !GetAtt Secrets.Outputs.SQSSaltSecret
EnabledSiteODSCodesParam: !GetAtt Parameters.Outputs.EnabledSiteODSCodesParameterName
EnabledSystemsParam: !GetAtt Parameters.Outputs.EnabledSystemsParameterName
EnabledSupplierApplicationIDsParam: !GetAtt Parameters.Outputs.EnabledSupplierApplicationIDsParameterName
BlockedSiteODSCodesParam: !GetAtt Parameters.Outputs.BlockedSiteODSCodesParameterName
NotifyRoutingPlanIDParam: !GetAtt Parameters.Outputs.NotifyRoutingPlanIDParameterName
NotifyAPIBaseURLParam: !GetAtt Parameters.Outputs.NotifyAPIBaseURLParameterName
Expand Down
21 changes: 20 additions & 1 deletion SAMtemplates/parameters/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ Parameters:
Type: String
Default: " "

EnabledSupplierApplicationIDsValue:
Type: String
Default: " "

BlockedSiteODSCodesValue:
Type: String
Default: " "
Expand All @@ -39,7 +43,7 @@ Parameters:
NotifyAPIBaseURLValue:
Type: String
Default: " "

TestPresciptionsParamValue1:
Type: String

Expand Down Expand Up @@ -69,6 +73,14 @@ Resources:
Type: String
Value: !Ref EnabledSystemsValue

EnabledSupplierApplicationIDsParameter:
Type: AWS::SSM::Parameter
Properties:
Name: !Sub ${StackName}-PSUNotifyEnabledSupplierApplicationIDs
Description: "List of supplier product IDs for which notifications are enabled"
Comment thread
wildjames marked this conversation as resolved.
Outdated
Type: String
Value: !Ref EnabledSupplierApplicationIDsValue

BlockedSiteODSCodesParameter:
Type: AWS::SSM::Parameter
Properties:
Expand Down Expand Up @@ -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}-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
Expand All @@ -179,6 +192,12 @@ Outputs:
Export:
Name: !Sub ${StackName}-PSUNotifyEnabledSystemsParam

EnabledSupplierApplicationIDsParameterName:
Description: "Name of the SSM parameter holding enabled supplier product IDs"
Comment thread
wildjames marked this conversation as resolved.
Outdated
Value: !Ref EnabledSupplierApplicationIDsParameter
Export:
Name: !Sub ${StackName}-PSUNotifyEnabledSupplierApplicationIDsParam

BlockedSiteODSCodesParameterName:
Description: "Name of the SSM parameter holding blocked site ODS codes"
Value: !Ref BlockedSiteODSCodesParameter
Expand Down
1 change: 1 addition & 0 deletions packages/common/commonTypes/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export interface PSUDataItem {
TaskID: string
TerminalStatus: string
ApplicationName: string
ApplicationID: string
Comment thread
wildjames marked this conversation as resolved.
ExpiryTime: number
// (Optional, legacy batch-processors only) Indicates that {@link LastModified} is postdated;
// contains the ISO 8601 timestamp when the postdated update was set.
Expand Down
1 change: 1 addition & 0 deletions packages/nhsNotifyLambda/tests/testHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
1 change: 1 addition & 0 deletions packages/postDatedLambda/tests/testBusinessLogic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
3 changes: 3 additions & 0 deletions packages/specification/eps-prescription-status-update-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,9 @@ x-nhsd-apim:
- name: show-all-suppliers
required: false
header: show-all-suppliers
- name: id
required: false
header: nhsd-application-id
ratelimiting:
proxy:
limit: 20000
Expand Down
7 changes: 5 additions & 2 deletions packages/updatePrescriptionStatus/src/updatePrescriptionStatus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ const lambdaHandler = async (event: APIGatewayProxyEvent): Promise<APIGatewayPro

const xRequestID = getXRequestID(event, responseEntries)
const applicationName = event.headers["attribute-name"] ?? "unknown"
const applicationId = event.headers["nhsd-application-id"] ?? "unknown"

if (!xRequestID) {
return response(400, responseEntries)
Expand All @@ -131,7 +132,7 @@ const lambdaHandler = async (event: APIGatewayProxyEvent): Promise<APIGatewayPro
return response(400, responseEntries)
}

const dataItems = buildDataItems(requestEntries, xRequestID, applicationName)
const dataItems = buildDataItems(requestEntries, xRequestID, applicationName, applicationId)

// If the dataItems contain any invalid ODS codes, then return an error
const invalidODSCodes = dataItems
Expand Down Expand Up @@ -358,7 +359,8 @@ export function handleTransactionCancelledException(
export function buildDataItems(
requestEntries: Array<BundleEntry>,
xRequestID: string,
applicationName: string
applicationName: string,
applicationId: string
): Array<PSUDataItem> {
const dataItems: Array<PSUDataItem> = []

Expand All @@ -381,6 +383,7 @@ export function buildDataItems(
TaskID: task.id!,
TerminalStatus: task.status,
ApplicationName: applicationName,
ApplicationID: applicationId,
ExpiryTime: (Math.floor(Date.now() / 1000) + TTL_DELTA)
}

Expand Down
2 changes: 1 addition & 1 deletion packages/updatePrescriptionStatus/src/utils/sqsClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export async function pushPrescriptionToNotificationSQS(
}

// Only allow through sites and systems that are allowedSitesAndSystems
const allowedSitesAndSystemsData = await checkSiteOrSystemIsNotifyEnabled(data)
const allowedSitesAndSystemsData = await checkSiteOrSystemIsNotifyEnabled(data, logger)

// Only these statuses will be pushed to the SQS
const updateStatuses: Set<string> = new Set([
Expand Down
Loading
Loading