Test/adw revert nhs number person text

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": "<<DATE_AGE_75>>",
       "GENDER": "0",
@@ -30,7 +30,7 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "PERSON#5000000001",
+      "NHS_NUMBER": "5000000001",
       "ATTRIBUTE_TYPE": "RSV",
       "BOOKED_APPOINTMENT_DATE": "<<DATE_TOMORROW>>",
       "BOOKED_APPOINTMENT_PROVIDER": "NBS"

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": "<<DATE_AGE_75>>",
       "GENDER": "0",

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": "<<DATE_AGE_75>>",
       "GENDER": "0",

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": "<<DATE_AGE_75>>",
       "GENDER": "0",
@@ -30,7 +30,7 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "PERSON#5000000004",
+      "NHS_NUMBER": "5000000004",
       "ATTRIBUTE_TYPE": "RSV",
       "BOOKED_APPOINTMENT_DATE": "<<DATE_TOMORROW>>",
       "BOOKED_APPOINTMENT_PROVIDER": "NBS"

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": "<<DATE_AGE_75>>",
       "GENDER": "0",
@@ -30,7 +30,7 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "PERSON#5000000005",
+      "NHS_NUMBER": "5000000005",
       "ATTRIBUTE_TYPE": "RSV",
       "BOOKED_APPOINTMENT_DATE": "<<DATE_TOMORROW>>",
       "BOOKED_APPOINTMENT_PROVIDER": "ACC"

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": "<<DATE_AGE_75>>",
       "GENDER": "0",
@@ -30,7 +30,7 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "PERSON#5000000006",
+      "NHS_NUMBER": "5000000006",
       "ATTRIBUTE_TYPE": "RSV",
       "LAST_SUCCESSFUL_DATE": "<<DATE_LAST_WEEK>>"
     }

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": "<<DATE_AGE_75>>",
       "GENDER": "0",
@@ -30,7 +30,7 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "PERSON#5000000007",
+      "NHS_NUMBER": "5000000007",
       "ATTRIBUTE_TYPE": "RSV",
       "LAST_SUCCESSFUL_DATE": "<<DATE_LAST_WEEK>>"
     }

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": "<<DATE_AGE_75>>",
       "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"
     }

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": "<<DATE_AGE_75>>",
       "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"
     }

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": "<<DATE_AGE_75>>",
       "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"
     }

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": "<<DATE_AGE_75>>",
       "GENDER": "0",

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": "<<DATE_AGE_50>>",
       "GENDER": "0",
@@ -25,7 +25,7 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "PERSON#5000000012",
+      "NHS_NUMBER": "5000000012",
       "ATTRIBUTE_TYPE": "RSV",
       "LAST_SUCCESSFUL_DATE": "<<DATE_LAST_WEEK>>"
     }

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": "<<DATE_AGE_50>>",
       "GENDER": "0",
@@ -30,7 +30,7 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "PERSON#50000000014",
+      "NHS_NUMBER": "50000000014",
       "ATTRIBUTE_TYPE": "RSV",
       "LAST_SUCCESSFUL_DATE": "<<DATE_LAST_WEEK>>"
     }

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": "<<DATE_AGE_50>>",
       "GENDER": "0",

tests/test_data/test_config/test_config.json

@@ -1,7 +1,7 @@
 {
   "CampaignConfig": {
-    "ID": "id_1",
-    "Version": 1,
+    "ID": "id_100",
+    "Version": "1",
     "Name": "Test Config",
     "Type": "V",
     "Target": "COVID",
@@ -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,11 +40,11 @@
             "Priority": 20,
             "AttributeLevel": "PERSON",
             "AttributeName": "DATE_OF_BIRTH",
-            "Operator": ">",
+            "Operator": "=",
             "Comparator": "19000101"
           }
         ],
-        "Version": 1,
+        "Version": "1",
         "Name": "Test Config",
         "Type": "M",
         "IterationDate": "20250101",