From 863e5ffb7540544e1bc30c6671210f4f30c5ef72 Mon Sep 17 00:00:00 2001 From: Adam Waller <176666249+adam-wallernhs1@users.noreply.github.com> Date: Thu, 19 Jun 2025 13:04:28 +0100 Subject: [PATCH 1/2] removed the #PERSON prefix from e2e test data in line with the changes decided this morning --- tests/e2e/data/dynamoDB/AUTO_RSV_SB_001.json | 6 +++--- tests/e2e/data/dynamoDB/AUTO_RSV_SB_002.json | 4 ++-- tests/e2e/data/dynamoDB/AUTO_RSV_SB_003.json | 4 ++-- tests/e2e/data/dynamoDB/AUTO_RSV_SB_004.json | 6 +++--- tests/e2e/data/dynamoDB/AUTO_RSV_SB_005.json | 6 +++--- tests/e2e/data/dynamoDB/AUTO_RSV_SB_006.json | 6 +++--- tests/e2e/data/dynamoDB/AUTO_RSV_SB_007.json | 6 +++--- tests/e2e/data/dynamoDB/AUTO_RSV_SB_008.json | 6 +++--- tests/e2e/data/dynamoDB/AUTO_RSV_SB_009.json | 6 +++--- tests/e2e/data/dynamoDB/AUTO_RSV_SB_010.json | 6 +++--- tests/e2e/data/dynamoDB/AUTO_RSV_SB_011.json | 4 ++-- tests/e2e/data/dynamoDB/AUTO_RSV_SB_012.json | 6 +++--- tests/e2e/data/dynamoDB/AUTO_RSV_SB_013.json | 6 +++--- tests/e2e/data/dynamoDB/AUTO_RSV_SB_014.json | 4 ++-- tests/test_data/test_config/test_config.json | 20 +++++++++++++------- 15 files changed, 51 insertions(+), 45 deletions(-) diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_001.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_001.json index 42121c0a4..712cf9439 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_001.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_001.json @@ -2,7 +2,7 @@ "scenario_name": "RSV - Actionable due to membership of an Age Cohort incl. suggested actions (with booking)", "data": [ { - "NHS_NUMBER": "PERSON#5000000001", + "NHS_NUMBER": "5000000001", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { @@ -12,7 +12,7 @@ ] }, { - "NHS_NUMBER": "PERSON#5000000001", + "NHS_NUMBER": "5000000001", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", @@ -30,7 +30,7 @@ "DE_FLAG": "N" }, { - "NHS_NUMBER": "PERSON#5000000001", + "NHS_NUMBER": "5000000001", "ATTRIBUTE_TYPE": "RSV", "BOOKED_APPOINTMENT_DATE": "<>", "BOOKED_APPOINTMENT_PROVIDER": "NBS" diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_002.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_002.json index 6205cbe15..bd49f7d82 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_002.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_002.json @@ -2,7 +2,7 @@ "scenario_name": "RSV - Actionable due to membership of an Age Cohort incl. suggested action (not booking)", "data": [ { - "NHS_NUMBER": "PERSON#5000000002", + "NHS_NUMBER": "5000000002", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { @@ -12,7 +12,7 @@ ] }, { - "NHS_NUMBER": "PERSON#5000000002", + "NHS_NUMBER": "5000000002", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_003.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_003.json index 0446dac74..07364dac6 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_003.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_003.json @@ -2,7 +2,7 @@ "scenario_name": "RSV - Actionable due to membership of an alternative Age Cohort incl. suggested action", "data": [ { - "NHS_NUMBER": "PERSON#5000000003", + "NHS_NUMBER": "5000000003", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { @@ -12,7 +12,7 @@ ] }, { - "NHS_NUMBER": "PERSON#5000000003", + "NHS_NUMBER": "5000000003", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_004.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_004.json index 99d6ca39f..0e2734b43 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_004.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_004.json @@ -2,7 +2,7 @@ "scenario_name": "RSV - Actionable due to membership of an Age Cohort incl. suggested action (existing national booking)", "data": [ { - "NHS_NUMBER": "PERSON#5000000004", + "NHS_NUMBER": "5000000004", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { @@ -12,7 +12,7 @@ ] }, { - "NHS_NUMBER": "PERSON#5000000004", + "NHS_NUMBER": "5000000004", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", @@ -30,7 +30,7 @@ "DE_FLAG": "N" }, { - "NHS_NUMBER": "PERSON#5000000004", + "NHS_NUMBER": "5000000004", "ATTRIBUTE_TYPE": "RSV", "BOOKED_APPOINTMENT_DATE": "<>", "BOOKED_APPOINTMENT_PROVIDER": "NBS" diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_005.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_005.json index d04cf3469..1f8d11043 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_005.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_005.json @@ -2,7 +2,7 @@ "scenario_name": "RSV - Actionable due to membership of an Age Cohort incl. suggested actions (with local booking)", "data": [ { - "NHS_NUMBER": "PERSON#5000000005", + "NHS_NUMBER": "5000000005", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { @@ -12,7 +12,7 @@ ] }, { - "NHS_NUMBER": "PERSON#5000000005", + "NHS_NUMBER": "5000000005", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", @@ -30,7 +30,7 @@ "DE_FLAG": "N" }, { - "NHS_NUMBER": "PERSON#5000000005", + "NHS_NUMBER": "5000000005", "ATTRIBUTE_TYPE": "RSV", "BOOKED_APPOINTMENT_DATE": "<>", "BOOKED_APPOINTMENT_PROVIDER": "ACC" diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_006.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_006.json index 7109252df..a68bb1204 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_006.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_006.json @@ -2,7 +2,7 @@ "scenario_name": "RSV - Not Actionable despite membership of an Age Cohort, already vaccinated", "data": [ { - "NHS_NUMBER": "PERSON#5000000006", + "NHS_NUMBER": "5000000006", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { @@ -12,7 +12,7 @@ ] }, { - "NHS_NUMBER": "PERSON#5000000006", + "NHS_NUMBER": "5000000006", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", @@ -30,7 +30,7 @@ "DE_FLAG": "N" }, { - "NHS_NUMBER": "PERSON#5000000006", + "NHS_NUMBER": "5000000006", "ATTRIBUTE_TYPE": "RSV", "LAST_SUCCESSFUL_DATE": "<>" } diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_007.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_007.json index e61a7fca2..5d0534e29 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_007.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_007.json @@ -2,7 +2,7 @@ "scenario_name": "RSV - Not Actionable, membership of Age Cohort, no available vaccinations (not available type 1)", "data": [ { - "NHS_NUMBER": "PERSON#5000000007", + "NHS_NUMBER": "5000000007", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { @@ -12,7 +12,7 @@ ] }, { - "NHS_NUMBER": "PERSON#5000000007", + "NHS_NUMBER": "5000000007", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", @@ -30,7 +30,7 @@ "DE_FLAG": "N" }, { - "NHS_NUMBER": "PERSON#5000000007", + "NHS_NUMBER": "5000000007", "ATTRIBUTE_TYPE": "RSV", "LAST_SUCCESSFUL_DATE": "<>" } diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_008.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_008.json index 1b7ec3c39..5f0673c5f 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_008.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_008.json @@ -2,7 +2,7 @@ "scenario_name": "RSV - No RSV response as no active campaign (not available type 2)", "data": [ { - "NHS_NUMBER": "PERSON#5000000008", + "NHS_NUMBER": "5000000008", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { @@ -12,7 +12,7 @@ ] }, { - "NHS_NUMBER": "PERSON#5000000008", + "NHS_NUMBER": "5000000008", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", @@ -30,7 +30,7 @@ "DE_FLAG": "N" }, { - "NHS_NUMBER": "PERSON#5000000008", + "NHS_NUMBER": "5000000008", "ATTRIBUTE_TYPE": "RSV", "BOOKED_APPOINTMENT_DATE": "2024-07-01" } diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_009.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_009.json index 134ffc101..3570ac674 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_009.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_009.json @@ -2,7 +2,7 @@ "scenario_name": "RSV - Not Actionable, membership of Age Cohort, dose not yet due", "data": [ { - "NHS_NUMBER": "PERSON#5000000009", + "NHS_NUMBER": "5000000009", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { @@ -12,7 +12,7 @@ ] }, { - "NHS_NUMBER": "PERSON#5000000009", + "NHS_NUMBER": "5000000009", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", @@ -30,7 +30,7 @@ "DE_FLAG": "N" }, { - "NHS_NUMBER": "PERSON#5000000009", + "NHS_NUMBER": "5000000009", "ATTRIBUTE_TYPE": "RSV", "LAST_SUCCESSFUL_DATE": "2023-07-01" } diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_010.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_010.json index a6343d91f..55ad46fde 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_010.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_010.json @@ -2,7 +2,7 @@ "scenario_name": "RSV - Not Actionable, membership of Age Cohort, dose not far enough apart", "data": [ { - "NHS_NUMBER": "PERSON#5000000010", + "NHS_NUMBER": "5000000010", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { @@ -12,7 +12,7 @@ ] }, { - "NHS_NUMBER": "PERSON#5000000010", + "NHS_NUMBER": "5000000010", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", @@ -30,7 +30,7 @@ "DE_FLAG": "N" }, { - "NHS_NUMBER": "PERSON#5000000010", + "NHS_NUMBER": "5000000010", "ATTRIBUTE_TYPE": "RSV", "LAST_SUCCESSFUL_DATE": "2023-07-01" } diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_011.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_011.json index ecf76d917..621617418 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_011.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_011.json @@ -2,7 +2,7 @@ "scenario_name": "RSV - Not Actionable despite to membership of an Age Cohort with reasoning of vaccination given in other setting (e.g. care home)", "data": [ { - "NHS_NUMBER": "PERSON#5000000011", + "NHS_NUMBER": "5000000011", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { @@ -12,7 +12,7 @@ ] }, { - "NHS_NUMBER": "PERSON#5000000011", + "NHS_NUMBER": "5000000011", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_012.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_012.json index 1d8382c4f..dfdda6170 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_012.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_012.json @@ -2,12 +2,12 @@ "scenario_name": "RSV - Not Actionable despite no cohort membership with reasoning of already vaccinated (type 1 includes unknown cohort)", "data": [ { - "NHS_NUMBER": "PERSON#5000000012", + "NHS_NUMBER": "5000000012", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [] }, { - "NHS_NUMBER": "PERSON#5000000012", + "NHS_NUMBER": "5000000012", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", @@ -25,7 +25,7 @@ "DE_FLAG": "N" }, { - "NHS_NUMBER": "PERSON#5000000012", + "NHS_NUMBER": "5000000012", "ATTRIBUTE_TYPE": "RSV", "LAST_SUCCESSFUL_DATE": "<>" } diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_013.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_013.json index 83741de0c..b66f71afe 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_013.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_013.json @@ -2,7 +2,7 @@ "scenario_name": "RSV - Not Actionable despite no cohort membership with reasoning of already vaccinated (type 2 includes no cohorts)", "data": [ { - "NHS_NUMBER": "PERSON#5000000013", + "NHS_NUMBER": "5000000013", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { @@ -12,7 +12,7 @@ ] }, { - "NHS_NUMBER": "PERSON#5000000013", + "NHS_NUMBER": "5000000013", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", @@ -30,7 +30,7 @@ "DE_FLAG": "N" }, { - "NHS_NUMBER": "PERSON#50000000014", + "NHS_NUMBER": "50000000014", "ATTRIBUTE_TYPE": "RSV", "LAST_SUCCESSFUL_DATE": "<>" } diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_014.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_014.json index 7be78e8d3..c480e69bd 100644 --- a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_014.json +++ b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_014.json @@ -2,7 +2,7 @@ "scenario_name": "RSV - Not Eligible", "data": [ { - "NHS_NUMBER": "PERSON#5000000014", + "NHS_NUMBER": "5000000014", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { @@ -12,7 +12,7 @@ ] }, { - "NHS_NUMBER": "PERSON#50000000014", + "NHS_NUMBER": "50000000014", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", "GENDER": "0", diff --git a/tests/test_data/test_config/test_config.json b/tests/test_data/test_config/test_config.json index 86117f97b..13b09a79f 100644 --- a/tests/test_data/test_config/test_config.json +++ b/tests/test_data/test_config/test_config.json @@ -1,6 +1,6 @@ { "CampaignConfig": { - "ID": "id_1", + "ID": "id_100", "Version": 1, "Name": "Test Config", "Type": "V", @@ -14,16 +14,22 @@ "DefaultCommsRouting": "Default_Comms_1", "Iterations": [ { - "ID": "id_1", + "ID": "id_100", "DefaultCommsRouting": "Default_Comms_1", "IterationCohorts": [ { - "CohortLabel": "cohort_1", - "Priority": 10 + "CohortLabel": "rsv_75_rolling", + "CohortGroupCode": "rsv_age_range", + "CohortGroupDescriptionPositive": "You are currently aged 75 to 79", + "CohortGroupDescriptionNegative": "You are not currently aged 75 to 79", + "Priority": 0 }, { - "CohortLabel": "cohort_2", - "Priority": 20 + "CohortLabel": "rsv_75to79_2024", + "CohortGroupCode": "rsv_catch_up_age_range", + "CohortGroupDescriptionPositive": "You turned 80 after 1 September 2024, so are eligible for the RSV vaccine until 31 August 2025", + "CohortGroupDescriptionNegative": "You did not turn 80 after 1 September 2024 and get vaccinated by 31 August 2025", + "Priority": 10 } ], "IterationRules": [ @@ -34,7 +40,7 @@ "Priority": 20, "AttributeLevel": "PERSON", "AttributeName": "DATE_OF_BIRTH", - "Operator": ">", + "Operator": "=", "Comparator": "19000101" } ], From 4aebba237147d232758475f7d987d07262e34c6a Mon Sep 17 00:00:00 2001 From: Adam Waller <176666249+adam-wallernhs1@users.noreply.github.com> Date: Thu, 19 Jun 2025 13:07:58 +0100 Subject: [PATCH 2/2] removed the #PERSON prefix from e2e test data in line with the changes decided this morning --- tests/test_data/test_config/test_config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_data/test_config/test_config.json b/tests/test_data/test_config/test_config.json index 13b09a79f..47cfe4716 100644 --- a/tests/test_data/test_config/test_config.json +++ b/tests/test_data/test_config/test_config.json @@ -1,7 +1,7 @@ { "CampaignConfig": { "ID": "id_100", - "Version": 1, + "Version": "1", "Name": "Test Config", "Type": "V", "Target": "COVID", @@ -44,7 +44,7 @@ "Comparator": "19000101" } ], - "Version": 1, + "Version": "1", "Name": "Test Config", "Type": "M", "IterationDate": "20250101",