simplified the NBS covid config to allow too close suitability rule to be triggered via a single config.

update vaccination dates to align with the above on 2 scenarios
updated expected response for the above 2 scenarios to align with vaccs date

Author: adam-wallernhs1

data/configs/nbsIntegrationTestConfigs/NBS_COVID_Config_Spring2026_v1.1.json

@@ -17,8 +17,8 @@
         "IterationFrequency": "X",
         "IterationType": "O",
         "IterationTime": "07:00:00",
-        "StartDate": "<<DATE_DAY_-100>>",
-        "EndDate": "<<DATE_DAY_+100>>",
+        "StartDate": "<<DATE_DAY_-89>>",
+        "EndDate": "<<DATE_DAY_+89>>",
         "ApprovalMinimum": 0,
         "ApprovalMaximum": 0,
         "DefaultCommsRouting": "BOOK_NBS",
@@ -30,7 +30,7 @@
                 "DefaultNotEligibleRouting": "",
                 "Version": 1,
                 "Name": "EliD NBS COVID-19 campaign config Release 1",
-                "IterationDate": "<<DATE_DAY_-100>>",
+                "IterationDate": "<<DATE_DAY_-89>>",
                 "IterationNumber": 1,
                 "CommsType": "I",
                 "ApprovalMinimum": 0,
@@ -89,7 +89,7 @@
                         "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_-93>>[[NVL:18000101]]",
+                        "Comparator": "<<DATE_DAY_-89>>[[NVL:18000101]]",
                         "AttributeTarget": "COVID",
                         "AttributeLevel": "TARGET",
                         "AttributeName": "LAST_SUCCESSFUL_DATE",
@@ -124,7 +124,7 @@
                         "Name": "Remove from eligible cohorts if already vaccinated",
                         "Description": "Remove anyone already vaccinated in current campaign from eligible cohorts",
                         "Operator": ">=",
-                        "Comparator": "<<DATE_DAY_-93>>",
+                        "Comparator": "<<DATE_DAY_-89>>",
                         "AttributeTarget": "COVID",
                         "AttributeLevel": "TARGET",
                         "AttributeName": "LAST_SUCCESSFUL_DATE",
@@ -140,7 +140,7 @@
                         "AttributeTarget": "COVID",
                         "AttributeName": "LAST_SUCCESSFUL_DATE",
                         "Operator": ">=",
-                        "Comparator": "<<DATE_DAY_-93>>",
+                        "Comparator": "<<DATE_DAY_-89>>",
                         "RuleStop": "Y"
                     },
                     {
@@ -223,7 +223,7 @@
                         "AttributeTarget": "COVID",
                         "AttributeName": "LAST_SUCCESSFUL_DATE",
                         "Operator": ">=",
-                        "Comparator": "<<DATE_DAY_-93>>",
+                        "Comparator": "<<DATE_DAY_-89>>",
                         "CommsRouting": "LAST_VACCINATION_DATE"
                     },
                     {

data/configs/nbsIntegrationTestConfigs/NBS_COVID_Config_Spring2026_v1.1_too_close.json

@@ -34,7 +34,7 @@
         {
             "NHS_NUMBER": "5998800788",
             "ATTRIBUTE_TYPE": "COVID",
-            "LAST_SUCCESSFUL_DATE": "<<DATE_DAY_-92>>"
+            "LAST_SUCCESSFUL_DATE": "<<DATE_DAY_-50>>"
         }
     ]
 }

data/dynamoDB/nbsIntegrationTestData/AUTO_COVID_NBS_INT_NA01.json

@@ -5,7 +5,7 @@
         "nhsd-End-User-Organisation-ods": "elid_automation"
     },
     "config_filenames": [
-        "NBS_COVID_Config_Spring2026_v1.1_too_close.json"
+        "NBS_COVID_Config_Spring2026_v1.1.json"
     ],
     "data": [
         {

data/dynamoDB/nbsIntegrationTestData/AUTO_COVID_NBS_INT_NA02.json

@@ -17,7 +17,7 @@
         {
             "NHS_NUMBER": "9454350900",
             "ATTRIBUTE_TYPE": "COVID",
-            "LAST_SUCCESSFUL_DATE": "<<DATE_DAY_-92>>"
+            "LAST_SUCCESSFUL_DATE": "<<DATE_DAY_-50>>"
         },
         {
             "NHS_NUMBER": "9454350900",

data/dynamoDB/nbsIntegrationTestData/AUTO_COVID_NBS_INT_NA03.json

@@ -8,7 +8,7 @@
                 {
                     "actionCode": "DateOfLastVaccination",
                     "actionType": "DataValue",
-                    "description": "<<NBSDATE_DAY_-92>>",
+                    "description": "<<NBSDATE_DAY_-50>>",
                     "urlLabel": "",
                     "urlLink": ""
                 }

data/responses/nbsIntegrationTestResponses/AUTO_COVID_NBS_INT_NA01.json

@@ -8,7 +8,7 @@
                 {
                     "actionCode": "DateOfLastVaccination",
                     "actionType": "DataValue",
-                    "description": "<<NBSDATE_DAY_-92>>",
+                    "description": "<<NBSDATE_DAY_-50>>",
                     "urlLabel": "",
                     "urlLink": ""
                 }