Merge remote-tracking branch 'origin/main' into bugfix/eja-eli-306-adding-kms-decrypt-for-lambda-rules-bucket

eddalmond1 · eddalmond1 · commit 19f90bfd59df · 2025-06-19T13:58:57.000+01:00
diff --git a/src/eligibility_signposting_api/repos/person_repo.py b/src/eligibility_signposting_api/repos/person_repo.py
@@ -36,7 +36,7 @@ def __init__(self, table: Annotated[Any, Inject(qualifier="person_table")]) -> N
         self.table = table
 
     def get_eligibility_data(self, nhs_number: NHSNumber) -> list[dict[str, Any]]:
-        response = self.table.query(KeyConditionExpression=Key("NHS_NUMBER").eq(f"PERSON#{nhs_number}"))
+        response = self.table.query(KeyConditionExpression=Key("NHS_NUMBER").eq(nhs_number))
         logger.debug("response %r for %r", response, nhs_number, extra={"response": response, "nhs_number": nhs_number})
 
         if not (items := response.get("Items")):
diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_001.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_001.json
@@ -2,17 +2,17 @@
   "scenario_name": "RSV - Actionable due to membership of an Age Cohort incl. suggested actions (with booking)",
   "data": [
     {
-      "NHS_NUMBER": "5000000001",
+      "NHS_NUMBER": "PERSON#5000000001",
       "ATTRIBUTE_TYPE": "COHORTS",
       "COHORT_MEMBERSHIPS": [
         {
           "COHORT_LABEL": "rsv_75_rolling",
-          "DATE_JOINED": "2025-01-01"
+          "DATE_JOINED": "20250101"
         }
       ]
     },
     {
-      "NHS_NUMBER": "5000000001",
+      "NHS_NUMBER": "PERSON#5000000001",
       "ATTRIBUTE_TYPE": "PERSON",
       "DATE_OF_BIRTH": "<<DATE_AGE_75>>",
       "GENDER": "0",
@@ -30,9 +30,8 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "5000000001",
-      "ATTRIBUTE_TYPE": "TARGET",
-      "TYPE": "RSV",
+      "NHS_NUMBER": "PERSON#5000000001",
+      "ATTRIBUTE_TYPE": "RSV",
       "BOOKED_APPOINTMENT_DATE": "<<DATE_TOMORROW>>",
       "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
@@ -2,17 +2,17 @@
   "scenario_name": "RSV - Actionable due to membership of an Age Cohort incl. suggested action (not booking)",
   "data": [
     {
-      "NHS_NUMBER": "5000000002",
+      "NHS_NUMBER": "PERSON#5000000002",
       "ATTRIBUTE_TYPE": "COHORTS",
       "COHORT_MEMBERSHIPS": [
         {
           "COHORT_LABEL": "rsv_75_rolling",
-          "DATE_JOINED": "2025-01-01"
+          "DATE_JOINED": "20250101"
         }
       ]
     },
     {
-      "NHS_NUMBER": "5000000002",
+      "NHS_NUMBER": "PERSON#5000000002",
       "ATTRIBUTE_TYPE": "PERSON",
       "DATE_OF_BIRTH": "<<DATE_AGE_75>>",
       "GENDER": "0",
diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_003.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_003.json
@@ -2,17 +2,17 @@
   "scenario_name": "RSV - Actionable due to membership of an alternative Age Cohort incl. suggested action",
   "data": [
     {
-      "NHS_NUMBER": "5000000003",
+      "NHS_NUMBER": "PERSON#5000000003",
       "ATTRIBUTE_TYPE": "COHORTS",
       "COHORT_MEMBERSHIPS": [
         {
           "COHORT_LABEL": "rsv_age_catchup",
-          "DATE_JOINED": "2025-01-01"
+          "DATE_JOINED": "20250101"
         }
       ]
     },
     {
-      "NHS_NUMBER": "5000000003",
+      "NHS_NUMBER": "PERSON#5000000003",
       "ATTRIBUTE_TYPE": "PERSON",
       "DATE_OF_BIRTH": "<<DATE_AGE_75>>",
       "GENDER": "0",
diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_004.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_004.json
@@ -2,17 +2,17 @@
   "scenario_name": "RSV - Actionable due to membership of an Age Cohort incl. suggested action (existing national booking)",
   "data": [
     {
-      "NHS_NUMBER": "5000000004",
+      "NHS_NUMBER": "PERSON#5000000004",
       "ATTRIBUTE_TYPE": "COHORTS",
       "COHORT_MEMBERSHIPS": [
         {
           "COHORT_LABEL": "rsv_75_rolling",
-          "DATE_JOINED": "2025-01-01"
+          "DATE_JOINED": "20250101"
         }
       ]
     },
     {
-      "NHS_NUMBER": "5000000004",
+      "NHS_NUMBER": "PERSON#5000000004",
       "ATTRIBUTE_TYPE": "PERSON",
       "DATE_OF_BIRTH": "<<DATE_AGE_75>>",
       "GENDER": "0",
@@ -30,9 +30,8 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "5000000004",
-      "ATTRIBUTE_TYPE": "TARGET",
-      "TYPE": "RSV",
+      "NHS_NUMBER": "PERSON#5000000004",
+      "ATTRIBUTE_TYPE": "RSV",
       "BOOKED_APPOINTMENT_DATE": "<<DATE_TOMORROW>>",
       "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
@@ -2,17 +2,17 @@
   "scenario_name": "RSV - Actionable due to membership of an Age Cohort incl. suggested actions (with local booking)",
   "data": [
     {
-      "NHS_NUMBER": "5000000005",
+      "NHS_NUMBER": "PERSON#5000000005",
       "ATTRIBUTE_TYPE": "COHORTS",
       "COHORT_MEMBERSHIPS": [
         {
           "COHORT_LABEL": "rsv_75_rolling",
-          "DATE_JOINED": "2025-01-01"
+          "DATE_JOINED": "20250101"
         }
       ]
     },
     {
-      "NHS_NUMBER": "5000000005",
+      "NHS_NUMBER": "PERSON#5000000005",
       "ATTRIBUTE_TYPE": "PERSON",
       "DATE_OF_BIRTH": "<<DATE_AGE_75>>",
       "GENDER": "0",
@@ -30,9 +30,8 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "5000000005",
-      "ATTRIBUTE_TYPE": "TARGET",
-      "TYPE": "RSV",
+      "NHS_NUMBER": "PERSON#5000000005",
+      "ATTRIBUTE_TYPE": "RSV",
       "BOOKED_APPOINTMENT_DATE": "<<DATE_TOMORROW>>",
       "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
@@ -2,17 +2,17 @@
   "scenario_name": "RSV - Not Actionable despite membership of an Age Cohort, already vaccinated",
   "data": [
     {
-      "NHS_NUMBER": "5000000006",
+      "NHS_NUMBER": "PERSON#5000000006",
       "ATTRIBUTE_TYPE": "COHORTS",
       "COHORT_MEMBERSHIPS": [
         {
           "COHORT_LABEL": "rsv_75_rolling",
-          "DATE_JOINED": "2025-01-01"
+          "DATE_JOINED": "20250101"
         }
       ]
     },
     {
-      "NHS_NUMBER": "5000000006",
+      "NHS_NUMBER": "PERSON#5000000006",
       "ATTRIBUTE_TYPE": "PERSON",
       "DATE_OF_BIRTH": "<<DATE_AGE_75>>",
       "GENDER": "0",
@@ -30,9 +30,8 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "5000000006",
-      "ATTRIBUTE_TYPE": "TARGET",
-      "TYPE": "RSV",
+      "NHS_NUMBER": "PERSON#5000000006",
+      "ATTRIBUTE_TYPE": "RSV",
       "LAST_SUCCESSFUL_DATE": "<<DATE_LAST_WEEK>>"
     }
   ]
diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_007.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_007.json
@@ -2,17 +2,17 @@
   "scenario_name": "RSV - Not Actionable, membership of Age Cohort, no available vaccinations (not available type 1)",
   "data": [
     {
-      "NHS_NUMBER": "5000000007",
+      "NHS_NUMBER": "PERSON#5000000007",
       "ATTRIBUTE_TYPE": "COHORTS",
       "COHORT_MEMBERSHIPS": [
         {
           "COHORT_LABEL": "rsv_75_rolling",
-          "DATE_JOINED": "2025-01-01"
+          "DATE_JOINED": "20250101"
         }
       ]
     },
     {
-      "NHS_NUMBER": "5000000007",
+      "NHS_NUMBER": "PERSON#5000000007",
       "ATTRIBUTE_TYPE": "PERSON",
       "DATE_OF_BIRTH": "<<DATE_AGE_75>>",
       "GENDER": "0",
@@ -30,9 +30,8 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "5000000007",
-      "ATTRIBUTE_TYPE": "TARGET",
-      "TYPE": "RSV",
+      "NHS_NUMBER": "PERSON#5000000007",
+      "ATTRIBUTE_TYPE": "RSV",
       "LAST_SUCCESSFUL_DATE": "<<DATE_LAST_WEEK>>"
     }
   ]
diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_008.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_008.json
@@ -2,17 +2,17 @@
   "scenario_name": "RSV - No RSV response as no active campaign (not available type 2)",
   "data": [
     {
-      "NHS_NUMBER": "5000000008",
+      "NHS_NUMBER": "PERSON#5000000008",
       "ATTRIBUTE_TYPE": "COHORTS",
       "COHORT_MEMBERSHIPS": [
         {
           "COHORT_LABEL": "rsv_75_rolling",
-          "DATE_JOINED": "2025-01-01"
+          "DATE_JOINED": "20250101"
         }
       ]
     },
     {
-      "NHS_NUMBER": "5000000008",
+      "NHS_NUMBER": "PERSON#5000000008",
       "ATTRIBUTE_TYPE": "PERSON",
       "DATE_OF_BIRTH": "<<DATE_AGE_75>>",
       "GENDER": "0",
@@ -30,9 +30,8 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "5000000008",
-      "ATTRIBUTE_TYPE": "TARGET",
-      "TYPE": "RSV",
+      "NHS_NUMBER": "PERSON#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
@@ -2,17 +2,17 @@
   "scenario_name": "RSV - Not Actionable, membership of Age Cohort, dose not yet due",
   "data": [
     {
-      "NHS_NUMBER": "5000000009",
+      "NHS_NUMBER": "PERSON#5000000009",
       "ATTRIBUTE_TYPE": "COHORTS",
       "COHORT_MEMBERSHIPS": [
         {
           "COHORT_LABEL": "rsv_75_rolling",
-          "DATE_JOINED": "2025-01-01"
+          "DATE_JOINED": "20250101"
         }
       ]
     },
     {
-      "NHS_NUMBER": "5000000009",
+      "NHS_NUMBER": "PERSON#5000000009",
       "ATTRIBUTE_TYPE": "PERSON",
       "DATE_OF_BIRTH": "<<DATE_AGE_75>>",
       "GENDER": "0",
@@ -30,9 +30,8 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "5000000009",
-      "ATTRIBUTE_TYPE": "TARGET",
-      "TYPE": "RSV",
+      "NHS_NUMBER": "PERSON#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
@@ -2,17 +2,17 @@
   "scenario_name": "RSV - Not Actionable, membership of Age Cohort, dose not far enough apart",
   "data": [
     {
-      "NHS_NUMBER": "5000000010",
+      "NHS_NUMBER": "PERSON#5000000010",
       "ATTRIBUTE_TYPE": "COHORTS",
       "COHORT_MEMBERSHIPS": [
         {
           "COHORT_LABEL": "rsv_75_rolling",
-          "DATE_JOINED": "2025-01-01"
+          "DATE_JOINED": "20250101"
         }
       ]
     },
     {
-      "NHS_NUMBER": "5000000010",
+      "NHS_NUMBER": "PERSON#5000000010",
       "ATTRIBUTE_TYPE": "PERSON",
       "DATE_OF_BIRTH": "<<DATE_AGE_75>>",
       "GENDER": "0",
@@ -30,9 +30,8 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "5000000010",
-      "ATTRIBUTE_TYPE": "TARGET",
-      "TYPE": "RSV",
+      "NHS_NUMBER": "PERSON#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
@@ -2,17 +2,17 @@
   "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": "5000000011",
+      "NHS_NUMBER": "PERSON#5000000011",
       "ATTRIBUTE_TYPE": "COHORTS",
       "COHORT_MEMBERSHIPS": [
         {
           "COHORT_LABEL": "rsv_75_rolling",
-          "DATE_JOINED": "2025-01-01"
+          "DATE_JOINED": "20250101"
         }
       ]
     },
     {
-      "NHS_NUMBER": "5000000011",
+      "NHS_NUMBER": "PERSON#5000000011",
       "ATTRIBUTE_TYPE": "PERSON",
       "DATE_OF_BIRTH": "<<DATE_AGE_75>>",
       "GENDER": "0",
diff --git 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": "5000000012",
+      "NHS_NUMBER": "PERSON#5000000012",
       "ATTRIBUTE_TYPE": "COHORTS",
       "COHORT_MEMBERSHIPS": []
     },
     {
-      "NHS_NUMBER": "5000000012",
+      "NHS_NUMBER": "PERSON#5000000012",
       "ATTRIBUTE_TYPE": "PERSON",
       "DATE_OF_BIRTH": "<<DATE_AGE_50>>",
       "GENDER": "0",
@@ -25,9 +25,8 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "5000000012",
-      "ATTRIBUTE_TYPE": "TARGET",
-      "TYPE": "RSV",
+      "NHS_NUMBER": "PERSON#5000000012",
+      "ATTRIBUTE_TYPE": "RSV",
       "LAST_SUCCESSFUL_DATE": "<<DATE_LAST_WEEK>>"
     }
   ]
diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_013.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_013.json
@@ -2,17 +2,17 @@
   "scenario_name": "RSV - Not Actionable despite no cohort membership with reasoning of already vaccinated (type 2 includes no cohorts)",
   "data": [
     {
-      "NHS_NUMBER": "5000000013",
+      "NHS_NUMBER": "PERSON#5000000013",
       "ATTRIBUTE_TYPE": "COHORTS",
       "COHORT_MEMBERSHIPS": [
         {
           "COHORT_LABEL": "covid_16+_immunosuppression",
-          "DATE_JOINED": "2025-01-01"
+          "DATE_JOINED": "20250101"
         }
       ]
     },
     {
-      "NHS_NUMBER": "5000000013",
+      "NHS_NUMBER": "PERSON#5000000013",
       "ATTRIBUTE_TYPE": "PERSON",
       "DATE_OF_BIRTH": "<<DATE_AGE_50>>",
       "GENDER": "0",
@@ -30,9 +30,8 @@
       "DE_FLAG": "N"
     },
     {
-      "NHS_NUMBER": "50000000014",
-      "ATTRIBUTE_TYPE": "TARGET",
-      "TYPE": "RSV",
+      "NHS_NUMBER": "PERSON#50000000014",
+      "ATTRIBUTE_TYPE": "RSV",
       "LAST_SUCCESSFUL_DATE": "<<DATE_LAST_WEEK>>"
     }
   ]
diff --git a/tests/e2e/data/dynamoDB/AUTO_RSV_SB_014.json b/tests/e2e/data/dynamoDB/AUTO_RSV_SB_014.json
diff --git a/tests/fixtures/builders/repos/person.py b/tests/fixtures/builders/repos/person.py
diff --git a/tests/integration/repo/test_person_repo.py b/tests/integration/repo/test_person_repo.py

Original file line number	Diff line number	Diff line change
`@@ -2,17 +2,17 @@`
`2`	`2`	`"scenario_name": "RSV - Actionable due to membership of an Age Cohort incl. suggested actions (with booking)",`
`3`	`3`	`"data": [`
`4`	`4`	`{`
`5`		`- "NHS_NUMBER": "5000000001",`
	`5`	`+ "NHS_NUMBER": "PERSON#5000000001",`
`6`	`6`	`"ATTRIBUTE_TYPE": "COHORTS",`
`7`	`7`	`"COHORT_MEMBERSHIPS": [`
`8`	`8`	`{`
`9`	`9`	`"COHORT_LABEL": "rsv_75_rolling",`
`10`		`- "DATE_JOINED": "2025-01-01"`
	`10`	`+ "DATE_JOINED": "20250101"`
`11`	`11`	`}`
`12`	`12`	`]`
`13`	`13`	`},`
`14`	`14`	`{`
`15`		`- "NHS_NUMBER": "5000000001",`
	`15`	`+ "NHS_NUMBER": "PERSON#5000000001",`
`16`	`16`	`"ATTRIBUTE_TYPE": "PERSON",`
`17`	`17`	`"DATE_OF_BIRTH": "<<DATE_AGE_75>>",`
`18`	`18`	`"GENDER": "0",`
`@@ -30,9 +30,8 @@`
`30`	`30`	`"DE_FLAG": "N"`
`31`	`31`	`},`
`32`	`32`	`{`
`33`		`- "NHS_NUMBER": "5000000001",`
`34`		`- "ATTRIBUTE_TYPE": "TARGET",`
`35`		`- "TYPE": "RSV",`
	`33`	`+ "NHS_NUMBER": "PERSON#5000000001",`
	`34`	`+ "ATTRIBUTE_TYPE": "RSV",`
`36`	`35`	`"BOOKED_APPOINTMENT_DATE": "<<DATE_TOMORROW>>",`
`37`	`36`	`"BOOKED_APPOINTMENT_PROVIDER": "NBS"`
`38`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,17 +2,17 @@`
`2`	`2`	`"scenario_name": "RSV - Not Actionable despite membership of an Age Cohort, already vaccinated",`
`3`	`3`	`"data": [`
`4`	`4`	`{`
`5`		`- "NHS_NUMBER": "5000000006",`
	`5`	`+ "NHS_NUMBER": "PERSON#5000000006",`
`6`	`6`	`"ATTRIBUTE_TYPE": "COHORTS",`
`7`	`7`	`"COHORT_MEMBERSHIPS": [`
`8`	`8`	`{`
`9`	`9`	`"COHORT_LABEL": "rsv_75_rolling",`
`10`		`- "DATE_JOINED": "2025-01-01"`
	`10`	`+ "DATE_JOINED": "20250101"`
`11`	`11`	`}`
`12`	`12`	`]`
`13`	`13`	`},`
`14`	`14`	`{`
`15`		`- "NHS_NUMBER": "5000000006",`
	`15`	`+ "NHS_NUMBER": "PERSON#5000000006",`
`16`	`16`	`"ATTRIBUTE_TYPE": "PERSON",`
`17`	`17`	`"DATE_OF_BIRTH": "<<DATE_AGE_75>>",`
`18`	`18`	`"GENDER": "0",`
`@@ -30,9 +30,8 @@`
`30`	`30`	`"DE_FLAG": "N"`
`31`	`31`	`},`
`32`	`32`	`{`
`33`		`- "NHS_NUMBER": "5000000006",`
`34`		`- "ATTRIBUTE_TYPE": "TARGET",`
`35`		`- "TYPE": "RSV",`
	`33`	`+ "NHS_NUMBER": "PERSON#5000000006",`
	`34`	`+ "ATTRIBUTE_TYPE": "RSV",`
`36`	`35`	`"LAST_SUCCESSFUL_DATE": "<<DATE_LAST_WEEK>>"`
`37`	`36`	`}`
`38`	`37`	`]`
Original file line number	Diff line number	Diff line change
`@@ -2,17 +2,17 @@`
`2`	`2`	`"scenario_name": "RSV - Not Actionable, membership of Age Cohort, no available vaccinations (not available type 1)",`
`3`	`3`	`"data": [`
`4`	`4`	`{`
`5`		`- "NHS_NUMBER": "5000000007",`
	`5`	`+ "NHS_NUMBER": "PERSON#5000000007",`
`6`	`6`	`"ATTRIBUTE_TYPE": "COHORTS",`
`7`	`7`	`"COHORT_MEMBERSHIPS": [`
`8`	`8`	`{`
`9`	`9`	`"COHORT_LABEL": "rsv_75_rolling",`
`10`		`- "DATE_JOINED": "2025-01-01"`
	`10`	`+ "DATE_JOINED": "20250101"`
`11`	`11`	`}`
`12`	`12`	`]`
`13`	`13`	`},`
`14`	`14`	`{`
`15`		`- "NHS_NUMBER": "5000000007",`
	`15`	`+ "NHS_NUMBER": "PERSON#5000000007",`
`16`	`16`	`"ATTRIBUTE_TYPE": "PERSON",`
`17`	`17`	`"DATE_OF_BIRTH": "<<DATE_AGE_75>>",`
`18`	`18`	`"GENDER": "0",`
`@@ -30,9 +30,8 @@`
`30`	`30`	`"DE_FLAG": "N"`
`31`	`31`	`},`
`32`	`32`	`{`
`33`		`- "NHS_NUMBER": "5000000007",`
`34`		`- "ATTRIBUTE_TYPE": "TARGET",`
`35`		`- "TYPE": "RSV",`
	`33`	`+ "NHS_NUMBER": "PERSON#5000000007",`
	`34`	`+ "ATTRIBUTE_TYPE": "RSV",`
`36`	`35`	`"LAST_SUCCESSFUL_DATE": "<<DATE_LAST_WEEK>>"`
`37`	`36`	`}`
`38`	`37`	`]`
Original file line number	Diff line number	Diff line change
`@@ -2,17 +2,17 @@`
`2`	`2`	`"scenario_name": "RSV - No RSV response as no active campaign (not available type 2)",`
`3`	`3`	`"data": [`
`4`	`4`	`{`
`5`		`- "NHS_NUMBER": "5000000008",`
	`5`	`+ "NHS_NUMBER": "PERSON#5000000008",`
`6`	`6`	`"ATTRIBUTE_TYPE": "COHORTS",`
`7`	`7`	`"COHORT_MEMBERSHIPS": [`
`8`	`8`	`{`
`9`	`9`	`"COHORT_LABEL": "rsv_75_rolling",`
`10`		`- "DATE_JOINED": "2025-01-01"`
	`10`	`+ "DATE_JOINED": "20250101"`
`11`	`11`	`}`
`12`	`12`	`]`
`13`	`13`	`},`
`14`	`14`	`{`
`15`		`- "NHS_NUMBER": "5000000008",`
	`15`	`+ "NHS_NUMBER": "PERSON#5000000008",`
`16`	`16`	`"ATTRIBUTE_TYPE": "PERSON",`
`17`	`17`	`"DATE_OF_BIRTH": "<<DATE_AGE_75>>",`
`18`	`18`	`"GENDER": "0",`
`@@ -30,9 +30,8 @@`
`30`	`30`	`"DE_FLAG": "N"`
`31`	`31`	`},`
`32`	`32`	`{`
`33`		`- "NHS_NUMBER": "5000000008",`
`34`		`- "ATTRIBUTE_TYPE": "TARGET",`
`35`		`- "TYPE": "RSV",`
	`33`	`+ "NHS_NUMBER": "PERSON#5000000008",`
	`34`	`+ "ATTRIBUTE_TYPE": "RSV",`
`36`	`35`	`"BOOKED_APPOINTMENT_DATE": "2024-07-01"`
`37`	`36`	`}`
`38`	`37`	`]`