Skip to content

Chore: [ELI-800] - NBS RSV and COVID simplified cohort names #262

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
adam-wallernhs1 merged 10 commits into from
Apr 22, 2026
Merged

Chore: [ELI-800] - NBS RSV and COVID simplified cohort names #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b6c8bc6
first commit for NBS covid config changes
adam-wallernhs1 Apr 16, 2026
c017217
Chore: [ELI-800] - Added current changes from version 1.1
feyisayo-afolabi-nhs Apr 20, 2026
f9407ba
Merge branch 'main' into eli-800-and-801
adam-wallernhs1 Apr 20, 2026
96e4cd3
first commit for NBS covid config changes
adam-wallernhs1 Apr 20, 2026
827ab9a
Merge branch 'main' into eli-800-and-801
adam-wallernhs1 Apr 20, 2026
6f5932a
updated RSV responses
adam-wallernhs1 Apr 20, 2026
4b05c30
files moved to the correct locations and consumer mapping for preprod…
adam-wallernhs1 Apr 20, 2026
702373d
added a run-nbs-preprod-tests:
adam-wallernhs1 Apr 20, 2026
de4d3ab
simplified the NBS covid config to allow too close suitability rule t…
adam-wallernhs1 Apr 21, 2026
6108b64
Merge branch 'main' into eli-800-and-801
adam-wallernhs1 Apr 22, 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
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,8 @@ endif
run-vita-preprod-tests:
poetry run pytest --env=preprod --log-cli-level=info tests/test_vita_integration_tests.py tests/test_upload_consumer_configs.py

run-nbs-preprod-tests:
poetry run pytest --env=preprod --log-cli-level=info tests/test_nbs_integration_tests.py tests/test_upload_consumer_configs.py

run-unit-tests: guard-env guard-log_level
poetry run pytest --env=${env} --log-cli-level=${log_level} tests/test_error_handling_utils.py -v
10 changes: 7 additions & 3 deletions data/configs/consumerMappings/consumer_mapping_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,32 @@
],
"test-P.XWA-VFF": [
{
"CampaignConfigID": "7fcb742b-45fa-4w0d-8f2f-9c2efb1f46d1",
"CampaignConfigID": "7fcb742b-43fa-4a0d-8f2f-9c2efb1f46d1",
"Description": "RSV Ongoing for NBS"
},
{
"CampaignConfigID": "b21cff69-a2c7-4e78-a514-ce067c09df0c",
"Description": "FLU Ongoing for NBS"
},
{
"CampaignConfigID": "3ecb346g-45ea-4g0d-8e2e-9g2feb1e46d0",
"Description": "COVID Ongoing for NBS"
},
{
"CampaignConfigID": "NBS_Campaign_Config_ID_RSV",
"Description": "RSV Test Config for NBS"
},
{
"CampaignConfigID": "NBS_Campaign_Config_ID_COVID",
"Description": "COVID Ongoing for NBS"
"Description": "COVID Test for NBS"
},
{
"CampaignConfigID": "NBS_Campaign_Config_ID_COVID_ACTIVE",
"Description": "COVID Ongoing for NBS"
},
{
"CampaignConfigID": "NBS_Campaign_Config_ID_FLU",
"Description": "Flu for NBS Story Tests"
"Description": "Flu Test for NBS"
},
{
"CampaignConfigID": "VITA_NBS_Campaign_Config_ID_COVID",
Expand Down
10 changes: 7 additions & 3 deletions data/configs/consumerMappings/preprod/consumer_mapping_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,24 @@
],
"P.XWA-VFF": [
{
"CampaignConfigID": "7fcb742b-45fa-4w0d-8f2f-9c2efb1f46d1",
"CampaignConfigID": "7fcb742b-43fa-4a0d-8f2f-9c2efb1f46d1",
"Description": "RSV Ongoing for NBS"
},
{
"CampaignConfigID": "b21cff69-a2c7-4e78-a514-ce067c09df0c",
"Description": "FLU Ongoing for NBS"
},
{
"CampaignConfigID": "3ecb346g-45ea-4g0d-8e2e-9g2feb1e46d0",
"Description": "COVID Ongoing for NBS"
},
{
"CampaignConfigID": "NBS_Campaign_Config_ID_RSV",
"Description": "RSV Ongoing for NBS"
"Description": "RSV Test for NBS"
},
{
"CampaignConfigID": "NBS_Campaign_Config_ID_COVID",
"Description": "COVID Ongoing for NBS"
"Description": "COVID Test Config for NBS"
},
{
"CampaignConfigID": "NBS_Campaign_Config_ID_COVID_ACTIVE",
Expand Down
287 changes: 287 additions & 0 deletions data/configs/nbsIntegrationTestConfigs/NBS_COVID_Config_Spring2026_v1.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,287 @@
{
"CampaignConfig": {
"ID": "3ecb346g-45ea-4g0d-8e2e-9g2feb1e46d0",
"Version": 1,
"Name": "EliD NBS COVID-19 campaign config Release 1",
"Type": "V",
"Target": "COVID",
"Manager": [
"example@nhs.net"
],
"Approver": [
"example@nhs.net"
],
"Reviewer": [
"example@nhs.net"
],
"IterationFrequency": "X",
"IterationType": "O",
"IterationTime": "07:00:00",
"StartDate": "<<DATE_DAY_-89>>",
"EndDate": "<<DATE_DAY_+89>>",
"ApprovalMinimum": 0,
"ApprovalMaximum": 0,
"DefaultCommsRouting": "BOOK_NBS",
"Iterations": [
{
"ID": "9ecb782b-48ea-4f0d-8e8y-9c2fyb1e46y1",
"DefaultCommsRouting": "BOOK_NBS",
"DefaultNotActionableRouting": "",
"DefaultNotEligibleRouting": "",
"Version": 1,
"Name": "EliD NBS COVID-19 campaign config Release 1",
"IterationDate": "<<DATE_DAY_-89>>",
"IterationNumber": 1,
"CommsType": "I",
"ApprovalMinimum": 0,
"ApprovalMaximum": 0,
"Type": "O",
"StatusText": {
"NotEligible": "We do not believe you can have it",
"NotActionable": "You should have the COVID-19 vaccine",
"Actionable": "You should have the COVID-19 vaccine"
},
"IterationCohorts": [
{
"CohortLabel": "covid_75+_spring2026",
"CohortGroup": "age",
"PositiveDescription": "are aged 75 or over (including those who will be 75 by 30 June 2026)",
"NegativeDescription": "are not aged 75 or over by 30 June 2026",
"Priority": 10,
"Virtual": "N"
},
{
"CohortLabel": "covid_16+_immunosuppression",
"CohortGroup": "clinical_risk",
"PositiveDescription": "have a weakened immune system because of a health condition or treatment",
"NegativeDescription": "do not have a weakened immune system because of a health condition or treatment",
"Priority": 20,
"Virtual": "N"
},
{
"CohortLabel": "covid_under16_immunosuppression",
"CohortGroup": "clinical_risk",
"PositiveDescription": "have a weakened immune system because of a health condition or treatment",
"NegativeDescription": "do not have a weakened immune system because of a health condition or treatment",
"Priority": 30,
"Virtual": "N"
},
{
"CohortLabel": "care_home_residents_older_adults",
"CohortGroup": "care_home_residents",
"PositiveDescription": "live in a care home for older adults",
"NegativeDescription": "do not live in a care home for older adults",
"Priority": 40,
"Virtual": "N"
},
{
"CohortLabel": "elid_all_people",
"CohortGroup": "virtual_cohort",
"PositiveDescription": "",
"NegativeDescription": "",
"Priority": 50,
"Virtual": "Y"
}
],
"IterationRules": [
{
"Type": "F",
"Name": "Remove from magic cohort unless already vaccinated or have future booking",
"Description": "Remove anyone NOT already vaccinated within the current campaign and do not have a future booking from the magic cohort",
"Operator": "<",
"Comparator": "<<DATE_DAY_-89>>[[NVL:18000101]]",
"AttributeTarget": "COVID",
"AttributeLevel": "TARGET",
"AttributeName": "LAST_SUCCESSFUL_DATE",
"CohortLabel": "elid_all_people",
"Priority": 100
},
{
"Type": "F",
"Name": "Remove from magic cohort unless already vaccinated or have future booking",
"Description": "Remove anyone without a future booking from magic cohort",
"Operator": "D<",
"Comparator": "0[[NVL:18000101]]",
"AttributeTarget": "COVID",
"AttributeLevel": "TARGET",
"AttributeName": "BOOKED_APPOINTMENT_DATE",
"CohortLabel": "elid_all_people",
"Priority": 100
},
{
"Type": "F",
"Name": "Remove under 75 Years at end of campaign",
"Description": "Ensure anyone who has a PDS date of birth which determines their age to be less than 75 years at the end of campaign is filtered out.",
"Priority": 120,
"AttributeLevel": "PERSON",
"AttributeName": "DATE_OF_BIRTH",
"Operator": ">=",
"Comparator": "19510701",
"CohortLabel": "covid_75+_spring2026"
},
{
"Type": "F",
"Name": "Remove from eligible cohorts if already vaccinated",
"Description": "Remove anyone already vaccinated in current campaign from eligible cohorts",
"Operator": ">=",
"Comparator": "<<DATE_DAY_-89>>",
"AttributeTarget": "COVID",
"AttributeLevel": "TARGET",
"AttributeName": "LAST_SUCCESSFUL_DATE",
"CohortLabel": "covid_75+_spring2026,covid_16+_immunosuppression,covid_under16_immunosuppression,care_home_residents_older_adults",
"Priority": 140
},
{
"Type": "S",
"Name": "AlreadyVaccinated",
"Description": "AlreadyVaccinated",
"Priority": 500,
"AttributeLevel": "TARGET",
"AttributeTarget": "COVID",
"AttributeName": "LAST_SUCCESSFUL_DATE",
"Operator": ">=",
"Comparator": "<<DATE_DAY_-89>>",
"RuleStop": "Y"
},
{
"Type": "S",
"Name": "TooClose",
"Description": "Within91days",
"Priority": 600,
"AttributeLevel": "TARGET",
"AttributeTarget": "COVID",
"AttributeName": "LAST_SUCCESSFUL_DATE",
"Operator": "D>",
"Comparator": "-91",
"RuleStop": "Y"
},
{
"Type": "S",
"Name": "FutureBookingNBS",
"Description": "NBS future booking",
"Priority": 700,
"Operator": "D>=",
"Comparator": "0",
"AttributeTarget": "COVID",
"AttributeLevel": "TARGET",
"AttributeName": "BOOKED_APPOINTMENT_DATE",
"RuleStop": "Y"
},
{
"Type": "S",
"Name": "FutureBookingNBS",
"Description": "NBS future booking",
"Priority": 700,
"Operator": "in",
"Comparator": "NBS,MYA",
"AttributeTarget": "COVID",
"AttributeLevel": "TARGET",
"AttributeName": "BOOKED_APPOINTMENT_PROVIDER",
"RuleStop": "Y"
},
{
"Type": "S",
"Name": "FutureBookingLocalInEligibleCohort",
"Description": "Local future booking",
"Priority": 750,
"Operator": "D>=",
"Comparator": "0",
"AttributeTarget": "COVID",
"AttributeLevel": "TARGET",
"AttributeName": "BOOKED_APPOINTMENT_DATE",
"RuleStop": "Y"
},
{
"Type": "S",
"Name": "FutureBookingLocalInEligibleCohort",
"Description": "Local future booking",
"Priority": 750,
"AttributeLevel": "COHORT",
"AttributeName": "COHORT_LABEL",
"Operator": "MemberOf",
"Comparator": "covid_75+_spring2026,covid_16+_immunosuppression,covid_under16_immunosuppression,care_home_residents_older_adults",
"RuleStop": "Y"
},
{
"Type": "S",
"Name": "FutureBookingLocalNotInEligibleCohort",
"Description": "Local future booking",
"Priority": 770,
"Operator": "D>=",
"Comparator": "0",
"AttributeTarget": "COVID",
"AttributeLevel": "TARGET",
"AttributeName": "BOOKED_APPOINTMENT_DATE",
"RuleStop": "Y"
},
{
"Type": "Y",
"Name": "Already vaccinated default text",
"Description": "Already vaccinated default text",
"Priority": 3000,
"AttributeLevel": "TARGET",
"AttributeTarget": "COVID",
"AttributeName": "LAST_SUCCESSFUL_DATE",
"Operator": ">=",
"Comparator": "<<DATE_DAY_-89>>",
"CommsRouting": "LAST_VACCINATION_DATE"
},
{
"Type": "Y",
"Name": "Too close default text",
"Description": "Too close default text",
"Priority": 3100,
"AttributeLevel": "TARGET",
"AttributeTarget": "COVID",
"AttributeName": "LAST_SUCCESSFUL_DATE",
"Operator": "D>",
"Comparator": "-91",
"CommsRouting": "EARLIEST_NEXT_VACCINATION_DATE|LAST_VACCINATION_DATE"
},
{
"Type": "Y",
"Name": "FutureBookingDate",
"Description": "Future booking date",
"Priority": 3200,
"AttributeLevel": "TARGET",
"AttributeTarget": "COVID",
"AttributeName": "BOOKED_APPOINTMENT_DATE",
"Operator": "D>=",
"Comparator": "0",
"CommsRouting": "FUTURE_APPOINTMENT_DATE"
}
],
"ActionsMapper": {
"BOOK_NBS": {
"ExternalRoutingCode": "BookNBS",
"ActionDescription": "Eligible within CP Expansion",
"ActionType": "InfoText",
"UrlLink": null,
"UrlLabel": ""
},
"LAST_VACCINATION_DATE": {
"ExternalRoutingCode": "DateOfLastVaccination",
"ActionDescription": "[[TARGET.COVID.LAST_SUCCESSFUL_DATE:DATE(%Y-%m-%d)]]",
"ActionType": "DataValue",
"UrlLink": null,
"UrlLabel": ""
},
"EARLIEST_NEXT_VACCINATION_DATE": {
"ExternalRoutingCode": "DateOfNextEarliestVaccination",
"ActionDescription": "[[TARGET.COVID.NEXT_DOSE_DUE:ADD_DAYS(91):DATE(%Y-%m-%d)]]",
"ActionType": "DataValue",
"UrlLink": null,
"UrlLabel": ""
},
"FUTURE_APPOINTMENT_DATE": {
"ExternalRoutingCode": "FutureBookingDate",
"ActionDescription": "[[TARGET.COVID.BOOKED_APPOINTMENT_DATE:DATE(%Y-%m-%d)]]",
"ActionType": "DataValue",
"UrlLink": null,
"UrlLabel": ""
}
}
}
]
}
}
Loading
Loading