From 8a0f05ac3d0d1a2af8a9b2cdd49b00cb712bbef8 Mon Sep 17 00:00:00 2001 From: Adam Waller <176666249+adam-wallernhs1@users.noreply.github.com> Date: Fri, 24 Apr 2026 16:31:47 +0100 Subject: [PATCH 1/6] first commit with the 1st scenario --- .../inProgressTestConfigs/AUTO_ELI-727.json | 145 ++++++++++++++++++ .../inProgressTestData/AUTO_ELI-727_01.json | 33 ++++ .../AUTO_ELI-727_01.json | 30 ++++ 3 files changed, 208 insertions(+) create mode 100644 data/configs/inProgressTestConfigs/AUTO_ELI-727.json create mode 100644 data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json create mode 100644 data/responses/inProgressTestResponses/AUTO_ELI-727_01.json diff --git a/data/configs/inProgressTestConfigs/AUTO_ELI-727.json b/data/configs/inProgressTestConfigs/AUTO_ELI-727.json new file mode 100644 index 00000000..324c4fb0 --- /dev/null +++ b/data/configs/inProgressTestConfigs/AUTO_ELI-727.json @@ -0,0 +1,145 @@ +{ + "CampaignConfig": { + "ID": "Story_Campaign_Config_ID", + "Version": 1, + "Name": "EliD COVID-19 campaign example config", + "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": "20260201", + "EndDate": "20260930", + "ApprovalMinimum": 0, + "ApprovalMaximum": 0, + "DefaultCommsRouting": "", + "Iterations": [ + { + "ID": "8ecb742b-45ea-4f0d-8e2e-9c2feb1e46d1", + "DefaultCommsRouting": "DEFAULT_ACTION", + "DefaultNotActionableRouting": "", + "DefaultNotEligibleRouting": "", + "Version": 1, + "Name": "EliDMy Vaccines COVID-19 campaign - Iteration 2 exclude cohorts", + "IterationDate": "20260407", + "IterationNumber": 1, + "CommsType": "I", + "ApprovalMinimum": 0, + "ApprovalMaximum": 0, + "Type": "O", + "StatusText": { + "NotEligible": "NotEligible - Iteration Status Text", + "NotActionable": "NotActionable - Iteration Status Text", + "Actionable": "Actionable - Iteration Status Text" + }, + "IterationCohorts": [ + { + "CohortLabel": "cohort_1", + "CohortGroup": "cohort_1_group", + "PositiveDescription": "are in cohort 1 group", + "NegativeDescription": "are NOT in cohort 1 group", + "Priority": 40 + } + ], + "IterationRules": [ + { + "Type": "F", + "Name": "Filter if already vaccinated", + "Description": "Filter if already vaccinated", + "Operator": "is_not_null", + "Comparator": "", + "AttributeTarget": "COVID", + "AttributeLevel": "TARGET", + "AttributeName": "LAST_SUCCESSFUL_DATE", + "Priority": 100 + }, + { + "Type": "S", + "Name": "AlreadyVaccinated", + "Description": "## You've had your COVID-19 vaccination\n\nWe believe you were vaccinated against COVID-19 on [[TARGET.COVID.LAST_SUCCESSFUL_DATE:DATE(%-d %B %Y)]]", + "Priority": 500, + "AttributeLevel": "TARGET", + "AttributeTarget": "COVID", + "AttributeName": "LAST_SUCCESSFUL_DATE", + "Operator": ">=", + "Comparator": "20260413", + "RuleStop": "Y" + }, + { + "Type": "R", + "Name": "if there have the ICB value 9000072701", + "Description": "if there have the ICB value 9000072701", + "Priority": 1000, + "Operator": "=", + "Comparator": "9000072701", + "AttributeLevel": "PERSON", + "AttributeName": "ICB", + "CommsRouting": "STATUS_TEXT_OVERRIDE_ACTIONABLE" + }, + { + "Type": "Y", + "Name": "Already vaccinated default text", + "Description": "Already vaccinated default text", + "Priority": 3000, + "AttributeLevel": "TARGET", + "AttributeTarget": "COVID", + "AttributeName": "LAST_SUCCESSFUL_DATE", + "Operator": ">=", + "Comparator": "20260413", + "CommsRouting": "STATUS_TEXT_OVERRIDE_NOT_ACTIONABLE" + }, + { + "Type": "X", + "Name": "Other setting default text", + "Description": "Other setting default text", + "Priority": 4100, + "AttributeLevel": "COHORT", + "AttributeName": "COHORT_LABEL", + "Operator": "MemberOf", + "Comparator": "covid_16+_immunosuppression,covid_under16_immunosuppression", + "CommsRouting": "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE" + } + ], + "ActionsMapper": { + "DEFAULT_ACTION": { + "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", + "ActionDescription": "DEFAULT_ActionDescription", + "ActionType": "DEFAULT_UrlLabel", + "UrlLink": "https://www.nhs.uk/default_url/", + "UrlLabel": "DEFAULT_UrlLabel" + }, + "STATUS_TEXT_OVERRIDE_ACTIONABLE": { + "ExternalRoutingCode": "StatusTextOverrideActionable", + "ActionDescription": "Status Text Override Actionable", + "ActionType": "StatusText", + "UrlLink": null, + "UrlLabel": "" + }, + "STATUS_TEXT_OVERRIDE_NOT_ACTIONABLE": { + "ExternalRoutingCode": "StatusTextOverrideNotActionable", + "ActionDescription": "Status Text Override Not Actionable", + "ActionType": "StatusText", + "UrlLink": null, + "UrlLabel": "" + }, + "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE": { + "ExternalRoutingCode": "StatusTextOverrideNotEligible", + "ActionDescription": "Status Text Override Not Eligible", + "ActionType": "StatusText", + "UrlLink": null, + "UrlLabel": "" + } + } + } + ] + } +} diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json new file mode 100644 index 00000000..29cd7a5a --- /dev/null +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json @@ -0,0 +1,33 @@ +{ + "scenario_name": "ELI-727 - Actionable - Status Override", + "request_headers": { + "nhs-login-nhs-number": "9000072701", + "nhsd-End-User-Organisation-ods": "elid_automation" + }, + "config_filenames": [ + "AUTO_ELI-727.json" + ], + "data": [ + { + "NHS_NUMBER": "9000072701", + "ATTRIBUTE_TYPE": "PERSON", + "DATE_OF_BIRTH": "<>", + "ICB": "9000072701" + }, + { + "NHS_NUMBER": "9000072701", + "ATTRIBUTE_TYPE": "COHORTS", + "COHORT_MEMBERSHIPS": [ + { + "COHORT_LABEL": "cohort_1", + "DATE_JOINED": "20240101" + } + ] + }, + { + "NHS_NUMBER": "9000072701", + "ATTRIBUTE_TYPE": "COVID" + + } + ] +} diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_01.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_01.json new file mode 100644 index 00000000..7f883d93 --- /dev/null +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_01.json @@ -0,0 +1,30 @@ +{ + "meta": { + "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + }, + "processedSuggestions": [ + { + "actions": [ + { + "actionCode": "BookNBS", + "actionType": "InfoText", + "description": "Eligible to book", + "urlLabel": "", + "urlLink": "" + } + ], + "condition": "FLU", + "eligibilityCohorts": [ + { + "cohortCode": "flu_clinical_risk", + "cohortStatus": "Actionable", + "cohortText": "have a weakened immune system because of a health condition or treatment" + } + ], + "status": "Actionable", + "statusText": "You should have the Flu vaccine", + "suitabilityRules": [] + } + ], + "responseId": "ffa31707-6172-427d-91e0-16b04d745647" +} From 0e333d5f1f32c7029c3a6c1483b5249b5c3bf06a Mon Sep 17 00:00:00 2001 From: Feyisayo Afolabi Date: Wed, 29 Apr 2026 13:08:48 +0100 Subject: [PATCH 2/6] Chore: [ELI-727] - Added more scenarios for Override text --- .../AUTO_ELI-727-EMPTY-ROUTING.json | 168 ++++++++++++++++++ .../AUTO_ELI-727-EMPTY-STATUS.json | 168 ++++++++++++++++++ .../inProgressTestConfigs/AUTO_ELI-727.json | 65 ++++--- .../inProgressTestData/AUTO_ELI-727_01.json | 9 +- .../inProgressTestData/AUTO_ELI-727_02.json | 32 ++++ .../inProgressTestData/AUTO_ELI-727_03.json | 37 ++++ .../inProgressTestData/AUTO_ELI-727_04.json | 31 ++++ .../inProgressTestData/AUTO_ELI-727_05.json | 32 ++++ .../inProgressTestData/AUTO_ELI-727_06.json | 31 ++++ .../inProgressTestData/AUTO_ELI-727_07.json | 35 ++++ .../inProgressTestData/AUTO_ELI-727_08.json | 32 ++++ .../inProgressTestData/AUTO_ELI-727_09.json | 32 ++++ .../AUTO_ELI-727_02.json | 36 ++++ .../AUTO_ELI-727_03.json | 36 ++++ .../AUTO_ELI-727_04.json | 30 ++++ .../AUTO_ELI-727_05.json | 36 ++++ .../AUTO_ELI-727_06.json | 22 +++ .../AUTO_ELI-727_07.json | 22 +++ .../AUTO_ELI-727_08.json | 30 ++++ .../AUTO_ELI-727_09.json | 36 ++++ 20 files changed, 896 insertions(+), 24 deletions(-) create mode 100644 data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-ROUTING.json create mode 100644 data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json create mode 100644 data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json create mode 100644 data/dynamoDB/inProgressTestData/AUTO_ELI-727_03.json create mode 100644 data/dynamoDB/inProgressTestData/AUTO_ELI-727_04.json create mode 100644 data/dynamoDB/inProgressTestData/AUTO_ELI-727_05.json create mode 100644 data/dynamoDB/inProgressTestData/AUTO_ELI-727_06.json create mode 100644 data/dynamoDB/inProgressTestData/AUTO_ELI-727_07.json create mode 100644 data/dynamoDB/inProgressTestData/AUTO_ELI-727_08.json create mode 100644 data/dynamoDB/inProgressTestData/AUTO_ELI-727_09.json create mode 100644 data/responses/inProgressTestResponses/AUTO_ELI-727_02.json create mode 100644 data/responses/inProgressTestResponses/AUTO_ELI-727_03.json create mode 100644 data/responses/inProgressTestResponses/AUTO_ELI-727_04.json create mode 100644 data/responses/inProgressTestResponses/AUTO_ELI-727_05.json create mode 100644 data/responses/inProgressTestResponses/AUTO_ELI-727_06.json create mode 100644 data/responses/inProgressTestResponses/AUTO_ELI-727_07.json create mode 100644 data/responses/inProgressTestResponses/AUTO_ELI-727_08.json create mode 100644 data/responses/inProgressTestResponses/AUTO_ELI-727_09.json diff --git a/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-ROUTING.json b/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-ROUTING.json new file mode 100644 index 00000000..047f9a0a --- /dev/null +++ b/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-ROUTING.json @@ -0,0 +1,168 @@ +{ + "CampaignConfig": { + "ID": "Story_Campaign_Config_ID", + "Version": 1, + "Name": "EliD COVID-19 campaign example config", + "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": "20260201", + "EndDate": "20260930", + "ApprovalMinimum": 0, + "ApprovalMaximum": 0, + "DefaultCommsRouting": "DEFAULT_CONFIG_LEVEL_ROUTING", + "Iterations": [ + { + "ID": "8ecb742b-45ea-4f0d-8e2e-9c2feb1e46d1", + "DefaultCommsRouting": "", + "DefaultNotActionableRouting": "", + "DefaultNotEligibleRouting": "", + "Version": 1, + "Name": "EliDMy Vaccines COVID-19 campaign - Iteration 2 exclude cohorts", + "IterationDate": "20260407", + "IterationNumber": 1, + "CommsType": "I", + "ApprovalMinimum": 0, + "ApprovalMaximum": 0, + "Type": "O", + "StatusText": { + "NotEligible": "NotEligible - Iteration Status Text", + "NotActionable": "NotActionable - Iteration Status Text", + "Actionable": "Actionable - Iteration Status Text" + }, + "IterationCohorts": [ + { + "CohortLabel": "cohort_1", + "CohortGroup": "cohort_1_group", + "PositiveDescription": "are in cohort 1 group", + "NegativeDescription": "are NOT in cohort 1 group", + "Priority": 40 + } + ], + "IterationRules": [ + { + "Type": "F", + "Name": "Filter if already vaccinated", + "Description": "Filter if already vaccinated", + "Operator": "is_not_null", + "Comparator": "", + "AttributeTarget": "COVID", + "AttributeLevel": "TARGET", + "AttributeName": "LAST_SUCCESSFUL_DATE", + "Priority": 100 + }, + { + "Type": "S", + "Name": "TriggerSRuleViaICB", + "Description": "You have been made NotActionable by this S rule", + "Priority": 500, + "AttributeLevel": "PERSON", + "AttributeName": "ICB", + "Operator": "=", + "Comparator": "Scenario_2", + "RuleStop": "Y" + }, + { + "Type": "S", + "Name": "TriggerSRuleViaICB", + "Description": "You have been made NotActionable by this S rule", + "Priority": 510, + "AttributeLevel": "PERSON", + "AttributeName": "ICB", + "Operator": "=", + "Comparator": "Scenario_3", + "RuleStop": "Y" + }, + { + "Type": "R", + "Name": "if there have the ICB value Scenario_1", + "Description": "if there have the ICB value 9000072701", + "Priority": 1000, + "Operator": "=", + "Comparator": "Scenario_1", + "AttributeLevel": "PERSON", + "AttributeName": "ICB", + "CommsRouting": "STATUS_TEXT_OVERRIDE_ACTIONABLE" + }, + { + "Type": "Y", + "Name": "Already vaccinated default text", + "Description": "Already vaccinated default text", + "Priority": 3000, + "AttributeLevel": "PERSON", + "AttributeName": "ICB", + "Operator": "=", + "Comparator": "Scenario_2", + "CommsRouting": "STATUS_TEXT_OVERRIDE_NOT_ACTIONABLE" + }, + { + "Type": "X", + "Name": "Other setting default text", + "Description": "Other setting default text", + "Priority": 4100, + "AttributeLevel": "COHORT", + "AttributeName": "COHORT_LABEL", + "Operator": "MemberOf", + "Comparator": "covid_16+_immunosuppression,covid_under16_immunosuppression", + "CommsRouting": "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE" + } + ], + "ActionsMapper": { + "DEFAULT_CONFIG_LEVEL_ROUTING": { + "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", + "ActionDescription": "DEFAULT_ActionDescription", + "ActionType": "DEFAULT_UrlLabel", + "UrlLink": "https://www.nhs.uk/default_url/", + "UrlLabel": "DEFAULT_UrlLabel" + }, + "DEFAULT_ACTIONABLE_ROUTING": { + "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", + "ActionDescription": "DEFAULT_ActionDescription", + "ActionType": "DEFAULT_UrlLabel", + "UrlLink": "https://www.nhs.uk/default_url/", + "UrlLabel": "DEFAULT_UrlLabel" + }, + "DEFAULT_NOTACTIONABLE_ROUTING": { + "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", + "ActionDescription": "DEFAULT_ActionDescription", + "ActionType": "DEFAULT_UrlLabel", + "UrlLink": "https://www.nhs.uk/default_url/", + "UrlLabel": "DEFAULT_UrlLabel" + }, + "STATUS_TEXT_OVERRIDE_ACTIONABLE": { + "ExternalRoutingCode": "StatusTextOverrideActionable", + "ActionDescription": "Status Text Override Actionable", + "ActionType": "norender_StatusTextOverride", + "UrlLink": null, + "UrlLabel": "" + }, + "STATUS_TEXT_OVERRIDE_NOT_ACTIONABLE": { + "ExternalRoutingCode": "StatusTextOverrideNotActionable", + "ActionDescription": "Status Text Override Not Actionable", + "ActionType": "norender_StatusTextOverride", + "UrlLink": null, + "UrlLabel": "" + }, + "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE": { + "ExternalRoutingCode": "StatusTextOverrideNotEligible", + "ActionDescription": "Status Text Override Not Eligible", + "ActionType": "norender_StatusTextOverride", + "UrlLink": null, + "UrlLabel": "" + } + } + } + ] + } +} diff --git a/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json b/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json new file mode 100644 index 00000000..a3e9fef2 --- /dev/null +++ b/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json @@ -0,0 +1,168 @@ +{ + "CampaignConfig": { + "ID": "Story_Campaign_Config_ID", + "Version": 1, + "Name": "EliD COVID-19 campaign example config", + "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": "20260201", + "EndDate": "20260930", + "ApprovalMinimum": 0, + "ApprovalMaximum": 0, + "DefaultCommsRouting": "DEFAULT_CONFIG_LEVEL_ROUTING", + "Iterations": [ + { + "ID": "8ecb742b-45ea-4f0d-8e2e-9c2feb1e46d1", + "DefaultCommsRouting": "DEFAULT_ACTIONABLE_ROUTING", + "DefaultNotActionableRouting": "DEFAULT_NOTACTIONABLE_ROUTING", + "DefaultNotEligibleRouting": "", + "Version": 1, + "Name": "EliDMy Vaccines COVID-19 campaign - Iteration 2 exclude cohorts", + "IterationDate": "20260407", + "IterationNumber": 1, + "CommsType": "I", + "ApprovalMinimum": 0, + "ApprovalMaximum": 0, + "Type": "O", + "StatusText": { + "NotEligible": "", + "NotActionable": "", + "Actionable": "" + }, + "IterationCohorts": [ + { + "CohortLabel": "cohort_1", + "CohortGroup": "cohort_1_group", + "PositiveDescription": "are in cohort 1 group", + "NegativeDescription": "are NOT in cohort 1 group", + "Priority": 40 + } + ], + "IterationRules": [ + { + "Type": "F", + "Name": "Filter if already vaccinated", + "Description": "Filter if already vaccinated", + "Operator": "is_not_null", + "Comparator": "", + "AttributeTarget": "COVID", + "AttributeLevel": "TARGET", + "AttributeName": "LAST_SUCCESSFUL_DATE", + "Priority": 100 + }, + { + "Type": "S", + "Name": "TriggerSRuleViaICB", + "Description": "You have been made NotActionable by this S rule", + "Priority": 500, + "AttributeLevel": "PERSON", + "AttributeName": "ICB", + "Operator": "=", + "Comparator": "Scenario_2", + "RuleStop": "Y" + }, + { + "Type": "S", + "Name": "TriggerSRuleViaICB", + "Description": "You have been made NotActionable by this S rule", + "Priority": 510, + "AttributeLevel": "PERSON", + "AttributeName": "ICB", + "Operator": "=", + "Comparator": "Scenario_3", + "RuleStop": "Y" + }, + { + "Type": "R", + "Name": "if there have the ICB value Scenario_1", + "Description": "if there have the ICB value 9000072701", + "Priority": 1000, + "Operator": "=", + "Comparator": "Scenario_1", + "AttributeLevel": "PERSON", + "AttributeName": "ICB", + "CommsRouting": "STATUS_TEXT_OVERRIDE_ACTIONABLE" + }, + { + "Type": "Y", + "Name": "Already vaccinated default text", + "Description": "Already vaccinated default text", + "Priority": 3000, + "AttributeLevel": "PERSON", + "AttributeName": "ICB", + "Operator": "=", + "Comparator": "Scenario_2", + "CommsRouting": "STATUS_TEXT_OVERRIDE_NOT_ACTIONABLE" + }, + { + "Type": "X", + "Name": "Other setting default text", + "Description": "Other setting default text", + "Priority": 4100, + "AttributeLevel": "COHORT", + "AttributeName": "COHORT_LABEL", + "Operator": "MemberOf", + "Comparator": "covid_16+_immunosuppression,covid_under16_immunosuppression", + "CommsRouting": "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE" + } + ], + "ActionsMapper": { + "DEFAULT_CONFIG_LEVEL_ROUTING": { + "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", + "ActionDescription": "DEFAULT_ActionDescription", + "ActionType": "DEFAULT_UrlLabel", + "UrlLink": "https://www.nhs.uk/default_url/", + "UrlLabel": "DEFAULT_UrlLabel" + }, + "DEFAULT_ACTIONABLE_ROUTING": { + "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", + "ActionDescription": "DEFAULT_ActionDescription", + "ActionType": "DEFAULT_UrlLabel", + "UrlLink": "https://www.nhs.uk/default_url/", + "UrlLabel": "DEFAULT_UrlLabel" + }, + "DEFAULT_NOTACTIONABLE_ROUTING": { + "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", + "ActionDescription": "DEFAULT_ActionDescription", + "ActionType": "DEFAULT_UrlLabel", + "UrlLink": "https://www.nhs.uk/default_url/", + "UrlLabel": "DEFAULT_UrlLabel" + }, + "STATUS_TEXT_OVERRIDE_ACTIONABLE": { + "ExternalRoutingCode": "StatusTextOverrideActionable", + "ActionDescription": "Status Text Override Actionable", + "ActionType": "norender_StatusTextOverride", + "UrlLink": null, + "UrlLabel": "" + }, + "STATUS_TEXT_OVERRIDE_NOT_ACTIONABLE": { + "ExternalRoutingCode": "StatusTextOverrideNotActionable", + "ActionDescription": "Status Text Override Not Actionable", + "ActionType": "norender_StatusTextOverride", + "UrlLink": null, + "UrlLabel": "" + }, + "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE": { + "ExternalRoutingCode": "StatusTextOverrideNotEligible", + "ActionDescription": "Status Text Override Not Eligible", + "ActionType": "norender_StatusTextOverride", + "UrlLink": null, + "UrlLabel": "" + } + } + } + ] + } +} diff --git a/data/configs/inProgressTestConfigs/AUTO_ELI-727.json b/data/configs/inProgressTestConfigs/AUTO_ELI-727.json index 324c4fb0..29af3937 100644 --- a/data/configs/inProgressTestConfigs/AUTO_ELI-727.json +++ b/data/configs/inProgressTestConfigs/AUTO_ELI-727.json @@ -21,12 +21,12 @@ "EndDate": "20260930", "ApprovalMinimum": 0, "ApprovalMaximum": 0, - "DefaultCommsRouting": "", + "DefaultCommsRouting": "DEFAULT_CONFIG_LEVEL_ROUTING", "Iterations": [ { "ID": "8ecb742b-45ea-4f0d-8e2e-9c2feb1e46d1", - "DefaultCommsRouting": "DEFAULT_ACTION", - "DefaultNotActionableRouting": "", + "DefaultCommsRouting": "DEFAULT_ACTIONABLE_ROUTING", + "DefaultNotActionableRouting": "DEFAULT_NOTACTIONABLE_ROUTING", "DefaultNotEligibleRouting": "", "Version": 1, "Name": "EliDMy Vaccines COVID-19 campaign - Iteration 2 exclude cohorts", @@ -64,23 +64,33 @@ }, { "Type": "S", - "Name": "AlreadyVaccinated", - "Description": "## You've had your COVID-19 vaccination\n\nWe believe you were vaccinated against COVID-19 on [[TARGET.COVID.LAST_SUCCESSFUL_DATE:DATE(%-d %B %Y)]]", + "Name": "TriggerSRuleViaICB", + "Description": "You have been made NotActionable by this S rule", "Priority": 500, - "AttributeLevel": "TARGET", - "AttributeTarget": "COVID", - "AttributeName": "LAST_SUCCESSFUL_DATE", - "Operator": ">=", - "Comparator": "20260413", + "AttributeLevel": "PERSON", + "AttributeName": "ICB", + "Operator": "=", + "Comparator": "Scenario_2", + "RuleStop": "Y" + }, + { + "Type": "S", + "Name": "TriggerSRuleViaICB", + "Description": "You have been made NotActionable by this S rule", + "Priority": 510, + "AttributeLevel": "PERSON", + "AttributeName": "ICB", + "Operator": "=", + "Comparator": "Scenario_3", "RuleStop": "Y" }, { "Type": "R", - "Name": "if there have the ICB value 9000072701", + "Name": "if there have the ICB value Scenario_1", "Description": "if there have the ICB value 9000072701", "Priority": 1000, "Operator": "=", - "Comparator": "9000072701", + "Comparator": "Scenario_1", "AttributeLevel": "PERSON", "AttributeName": "ICB", "CommsRouting": "STATUS_TEXT_OVERRIDE_ACTIONABLE" @@ -90,11 +100,10 @@ "Name": "Already vaccinated default text", "Description": "Already vaccinated default text", "Priority": 3000, - "AttributeLevel": "TARGET", - "AttributeTarget": "COVID", - "AttributeName": "LAST_SUCCESSFUL_DATE", - "Operator": ">=", - "Comparator": "20260413", + "AttributeLevel": "PERSON", + "AttributeName": "ICB", + "Operator": "=", + "Comparator": "Scenario_2", "CommsRouting": "STATUS_TEXT_OVERRIDE_NOT_ACTIONABLE" }, { @@ -110,7 +119,21 @@ } ], "ActionsMapper": { - "DEFAULT_ACTION": { + "DEFAULT_CONFIG_LEVEL_ROUTING": { + "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", + "ActionDescription": "DEFAULT_ActionDescription", + "ActionType": "DEFAULT_UrlLabel", + "UrlLink": "https://www.nhs.uk/default_url/", + "UrlLabel": "DEFAULT_UrlLabel" + }, + "DEFAULT_ACTIONABLE_ROUTING": { + "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", + "ActionDescription": "DEFAULT_ActionDescription", + "ActionType": "DEFAULT_UrlLabel", + "UrlLink": "https://www.nhs.uk/default_url/", + "UrlLabel": "DEFAULT_UrlLabel" + }, + "DEFAULT_NOTACTIONABLE_ROUTING": { "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", "ActionDescription": "DEFAULT_ActionDescription", "ActionType": "DEFAULT_UrlLabel", @@ -120,21 +143,21 @@ "STATUS_TEXT_OVERRIDE_ACTIONABLE": { "ExternalRoutingCode": "StatusTextOverrideActionable", "ActionDescription": "Status Text Override Actionable", - "ActionType": "StatusText", + "ActionType": "norender_StatusTextOverride", "UrlLink": null, "UrlLabel": "" }, "STATUS_TEXT_OVERRIDE_NOT_ACTIONABLE": { "ExternalRoutingCode": "StatusTextOverrideNotActionable", "ActionDescription": "Status Text Override Not Actionable", - "ActionType": "StatusText", + "ActionType": "norender_StatusTextOverride", "UrlLink": null, "UrlLabel": "" }, "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE": { "ExternalRoutingCode": "StatusTextOverrideNotEligible", "ActionDescription": "Status Text Override Not Eligible", - "ActionType": "StatusText", + "ActionType": "norender_StatusTextOverride", "UrlLink": null, "UrlLabel": "" } diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json index 29cd7a5a..06418bd0 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json @@ -1,5 +1,5 @@ { - "scenario_name": "ELI-727 - Actionable - Status Override", + "scenario_name": "ELI-727 - Actionable - Status Override - includeActions Y", "request_headers": { "nhs-login-nhs-number": "9000072701", "nhsd-End-User-Organisation-ods": "elid_automation" @@ -12,7 +12,7 @@ "NHS_NUMBER": "9000072701", "ATTRIBUTE_TYPE": "PERSON", "DATE_OF_BIRTH": "<>", - "ICB": "9000072701" + "ICB": "Scenario_1" }, { "NHS_NUMBER": "9000072701", @@ -29,5 +29,8 @@ "ATTRIBUTE_TYPE": "COVID" } - ] + ], + "query_params": { + "includeActions": "Y" + } } diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json new file mode 100644 index 00000000..911c4742 --- /dev/null +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json @@ -0,0 +1,32 @@ +{ + "scenario_name": "ELI-727 - NotActionable - Status Override", + "request_headers": { + "nhs-login-nhs-number": "9000072702", + "nhsd-End-User-Organisation-ods": "elid_automation" + }, + "config_filenames": [ + "AUTO_ELI-727.json" + ], + "data": [ + { + "NHS_NUMBER": "9000072702", + "ATTRIBUTE_TYPE": "PERSON", + "DATE_OF_BIRTH": "<>", + "ICB": "Scenario_2" + }, + { + "NHS_NUMBER": "9000072702", + "ATTRIBUTE_TYPE": "COHORTS", + "COHORT_MEMBERSHIPS": [ + { + "COHORT_LABEL": "cohort_1", + "DATE_JOINED": "20240101" + } + ] + }, + { + "NHS_NUMBER": "9000072702", + "ATTRIBUTE_TYPE": "COVID" + } + ] +} diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_03.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_03.json new file mode 100644 index 00000000..d55fc95a --- /dev/null +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_03.json @@ -0,0 +1,37 @@ +{ + "scenario_name": "ELI-727 - NotEligible - Status Override", + "request_headers": { + "nhs-login-nhs-number": "9000072703", + "nhsd-End-User-Organisation-ods": "elid_automation" + }, + "config_filenames": [ + "AUTO_ELI-727.json" + ], + "data": [ + { + "NHS_NUMBER": "9000072703", + "ATTRIBUTE_TYPE": "PERSON", + "DATE_OF_BIRTH": "20050101", + "ICB": "9000072703" + }, + { + "NHS_NUMBER": "9000072703", + "ATTRIBUTE_TYPE": "COHORTS", + "COHORT_MEMBERSHIPS": [ + { + "COHORT_LABEL": "cohort_1", + "DATE_JOINED": "20240101" + }, + { + "COHORT_LABEL": "covid_16+_immunosuppression", + "DATE_JOINED": "20240101" + } + ] + }, + { + "NHS_NUMBER": "9000072703", + "ATTRIBUTE_TYPE": "COVID", + "LAST_SUCCESSFUL_DATE": "20260413" + } + ] +} diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_04.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_04.json new file mode 100644 index 00000000..c8113eab --- /dev/null +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_04.json @@ -0,0 +1,31 @@ +{ + "scenario_name": "ELI-727 - NotEligible - No override", + "request_headers": { + "nhs-login-nhs-number": "9000072704", + "nhsd-End-User-Organisation-ods": "elid_automation" + }, + "config_filenames": [ + "AUTO_ELI-727.json" + ], + "data": [ + { + "NHS_NUMBER": "9000072704", + "ATTRIBUTE_TYPE": "PERSON", + "DATE_OF_BIRTH": "<>" + }, + { + "NHS_NUMBER": "9000072704", + "ATTRIBUTE_TYPE": "COHORTS", + "COHORT_MEMBERSHIPS": [ + { + "COHORT_LABEL": "covid_16+_immunosuppression", + "DATE_JOINED": "20020101" + } + ] + }, + { + "NHS_NUMBER": "9000072704", + "ATTRIBUTE_TYPE": "COVID" + } + ] +} diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_05.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_05.json new file mode 100644 index 00000000..580fb47e --- /dev/null +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_05.json @@ -0,0 +1,32 @@ +{ + "scenario_name": "ELI-727 - NotActionable - No override", + "request_headers": { + "nhs-login-nhs-number": "9000072705", + "nhsd-End-User-Organisation-ods": "elid_automation" + }, + "config_filenames": [ + "AUTO_ELI-727.json" + ], + "data": [ + { + "NHS_NUMBER": "9000072705", + "ATTRIBUTE_TYPE": "PERSON", + "DATE_OF_BIRTH": "<>", + "ICB": "Scenario_3" + }, + { + "NHS_NUMBER": "9000072705", + "ATTRIBUTE_TYPE": "COHORTS", + "COHORT_MEMBERSHIPS": [ + { + "COHORT_LABEL": "cohort_1", + "DATE_JOINED": "20240101" + } + ] + }, + { + "NHS_NUMBER": "9000072705", + "ATTRIBUTE_TYPE": "COVID" + } + ] +} diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_06.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_06.json new file mode 100644 index 00000000..aaae5058 --- /dev/null +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_06.json @@ -0,0 +1,31 @@ +{ + "scenario_name": "ELI-727 - NOTELIGIBLE - NoOverride", + "request_headers": { + "nhs-login-nhs-number": "9000072706", + "nhsd-End-User-Organisation-ods": "elid_automation" + }, + "config_filenames": [ + "AUTO_ELI-727.json" + ], + "data": [ + { + "NHS_NUMBER": "9000072706", + "ATTRIBUTE_TYPE": "PERSON", + "DATE_OF_BIRTH": "<>" + }, + { + "NHS_NUMBER": "9000072706", + "ATTRIBUTE_TYPE": "COHORTS", + "COHORT_MEMBERSHIPS": [ + { + "COHORT_LABEL": "cohort_1", + "DATE_JOINED": "20240101" + } + ] + }, + { + "NHS_NUMBER": "9000072706", + "ATTRIBUTE_TYPE": "COVID" + } + ] +} diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_07.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_07.json new file mode 100644 index 00000000..ec31b7ad --- /dev/null +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_07.json @@ -0,0 +1,35 @@ +{ + "scenario_name": "ELI-727 - Actionable - Override Suppressed - includeActions N", + "request_headers": { + "nhs-login-nhs-number": "9000072707", + "nhsd-End-User-Organisation-ods": "elid_automation" + }, + "config_filenames": [ + "AUTO_ELI-727.json" + ], + "data": [ + { + "NHS_NUMBER": "9000072707", + "ATTRIBUTE_TYPE": "PERSON", + "DATE_OF_BIRTH": "<>", + "ICB": "Scenario_1" + }, + { + "NHS_NUMBER": "9000072707", + "ATTRIBUTE_TYPE": "COHORTS", + "COHORT_MEMBERSHIPS": [ + { + "COHORT_LABEL": "cohort_1", + "DATE_JOINED": "20240101" + } + ] + }, + { + "NHS_NUMBER": "9000072707", + "ATTRIBUTE_TYPE": "COVID" + } + ], + "query_params": { + "includeActions": "N" + } +} diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_08.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_08.json new file mode 100644 index 00000000..4631ebf5 --- /dev/null +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_08.json @@ -0,0 +1,32 @@ +{ + "scenario_name": "ELI-727 - Actionable - Empty StatusText Fallback", + "request_headers": { + "nhs-login-nhs-number": "9000072708", + "nhsd-End-User-Organisation-ods": "elid_automation" + }, + "config_filenames": [ + "AUTO_ELI-727-EMPTY-STATUS.json" + ], + "data": [ + { + "NHS_NUMBER": "9000072708", + "ATTRIBUTE_TYPE": "PERSON", + "DATE_OF_BIRTH": "<>", + "ICB": "None" + }, + { + "NHS_NUMBER": "9000072708", + "ATTRIBUTE_TYPE": "COHORTS", + "COHORT_MEMBERSHIPS": [ + { + "COHORT_LABEL": "cohort_1", + "DATE_JOINED": "20240101" + } + ] + }, + { + "NHS_NUMBER": "9000072708", + "ATTRIBUTE_TYPE": "COVID" + } + ] +} diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_09.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_09.json new file mode 100644 index 00000000..a7eb5bce --- /dev/null +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_09.json @@ -0,0 +1,32 @@ +{ + "scenario_name": "ELI-727 - NotActionable - Empty Routing Fallback", + "request_headers": { + "nhs-login-nhs-number": "9000072709", + "nhsd-End-User-Organisation-ods": "elid_automation" + }, + "config_filenames": [ + "AUTO_ELI-727-EMPTY-ROUTING.json" + ], + "data": [ + { + "NHS_NUMBER": "9000072709", + "ATTRIBUTE_TYPE": "PERSON", + "DATE_OF_BIRTH": "<>", + "ICB": "Scenario_3" + }, + { + "NHS_NUMBER": "9000072709", + "ATTRIBUTE_TYPE": "COHORTS", + "COHORT_MEMBERSHIPS": [ + { + "COHORT_LABEL": "cohort_1", + "DATE_JOINED": "20240101" + } + ] + }, + { + "NHS_NUMBER": "9000072709", + "ATTRIBUTE_TYPE": "COVID" + } + ] +} diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_02.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_02.json new file mode 100644 index 00000000..055c7e95 --- /dev/null +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_02.json @@ -0,0 +1,36 @@ +{ + "meta": { + "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + }, + "processedSuggestions": [ + { + "actions": [ + { + "actionCode": "HelpSupportInfo", + "actionType": "InfoText", + "description": "### If you think this is incorrect\n\nIf you have already had this vaccination or your personal details are wrong, visit our [help and support page](https://www.nhs.uk/nhs-app/nhs-app-help-and-support/).", + "urlLabel": "", + "urlLink": "" + } + ], + "condition": "COVID", + "eligibilityCohorts": [ + { + "cohortCode": "cohort_1_group", + "cohortStatus": "NotActionable", + "cohortText": "are in cohort 1 group" + } + ], + "status": "NotActionable", + "statusText": "Status Text Override Not Actionable", + "suitabilityRules": [ + { + "ruleCode": "AlreadyVaccinated", + "ruleText": "AlreadyVaccinated", + "ruleType": "S" + } + ] + } + ], + "responseId": "ffa31707-6172-427d-91e0-16b04d745647" +} diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_03.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_03.json new file mode 100644 index 00000000..66d08408 --- /dev/null +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_03.json @@ -0,0 +1,36 @@ +{ + "meta": { + "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + }, + "processedSuggestions": [ + { + "actions": [ + { + "actionCode": "HelpSupportInfo", + "actionType": "InfoText", + "description": "### If you think this is incorrect\n\nIf you have already had this vaccination or your personal details are wrong, visit our [help and support page](https://www.nhs.uk/nhs-app/nhs-app-help-and-support/).", + "urlLabel": "", + "urlLink": "" + } + ], + "condition": "COVID", + "eligibilityCohorts": [ + { + "cohortCode": "cohort_1_group", + "cohortStatus": "NotEligible", + "cohortText": "are NOT in cohort 1 group" + } + ], + "status": "NotEligible", + "statusText": "Status Text Override Not Eligible", + "suitabilityRules": [ + { + "ruleCode": "NotEligibleOverride", + "ruleText": "Actionable due to clinical risk only", + "ruleType": "X" + } + ] + } + ], + "responseId": "ffa31707-6172-427d-91e0-16b04d745647" +} diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_04.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_04.json new file mode 100644 index 00000000..a873d1bd --- /dev/null +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_04.json @@ -0,0 +1,30 @@ +{ + "meta": { + "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + }, + "processedSuggestions": [ + { + "actions": [ + { + "actionCode": "HelpSupportInfo", + "actionType": "InfoText", + "description": "### If you think this is incorrect\n\nIf you have already had this vaccination or your personal details are wrong, visit our [help and support page](https://www.nhs.uk/nhs-app/nhs-app-help-and-support/).", + "urlLabel": "", + "urlLink": "" + } + ], + "condition": "COVID", + "eligibilityCohorts": [ + { + "cohortCode": "cohort_1_group", + "cohortStatus": "NotEligible", + "cohortText": "are NOT in cohort 1 group" + } + ], + "status": "NotEligible", + "statusText": "NotEligible - Iteration Status Text", + "suitabilityRules": [] + } + ], + "responseId": "ffa31707-6172-427d-91e0-16b04d745647" +} diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_05.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_05.json new file mode 100644 index 00000000..4b8ad440 --- /dev/null +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_05.json @@ -0,0 +1,36 @@ +{ + "meta": { + "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + }, + "processedSuggestions": [ + { + "actions": [ + { + "actionCode": "HelpSupportInfo", + "actionType": "InfoText", + "description": "### If you think this is incorrect\n\nIf you have already had this vaccination or your personal details are wrong, visit our [help and support page](https://www.nhs.uk/nhs-app/nhs-app-help-and-support/).", + "urlLabel": "", + "urlLink": "" + } + ], + "condition": "COVID", + "eligibilityCohorts": [ + { + "cohortCode": "cohort_1_group", + "cohortStatus": "NotActionable", + "cohortText": "are in cohort 1 group" + } + ], + "status": "NotActionable", + "statusText": "NotActionable - Iteration Status Text", + "suitabilityRules": [ + { + "ruleCode": "TooClose", + "ruleText": "TooClose", + "ruleType": "S" + } + ] + } + ], + "responseId": "ffa31707-6172-427d-91e0-16b04d745647" +} diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_06.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_06.json new file mode 100644 index 00000000..9ce4ff65 --- /dev/null +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_06.json @@ -0,0 +1,22 @@ +{ + "meta": { + "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + }, + "processedSuggestions": [ + { + "actions": [], + "condition": "COVID", + "eligibilityCohorts": [ + { + "cohortCode": "cohort_1_group", + "cohortStatus": "Actionable", + "cohortText": "are in cohort 1 group" + } + ], + "status": "Actionable", + "statusText": "Actionable - Iteration Status Text", + "suitabilityRules": [] + } + ], + "responseId": "ffa31707-6172-427d-91e0-16b04d745647" +} diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_07.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_07.json new file mode 100644 index 00000000..9ce4ff65 --- /dev/null +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_07.json @@ -0,0 +1,22 @@ +{ + "meta": { + "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + }, + "processedSuggestions": [ + { + "actions": [], + "condition": "COVID", + "eligibilityCohorts": [ + { + "cohortCode": "cohort_1_group", + "cohortStatus": "Actionable", + "cohortText": "are in cohort 1 group" + } + ], + "status": "Actionable", + "statusText": "Actionable - Iteration Status Text", + "suitabilityRules": [] + } + ], + "responseId": "ffa31707-6172-427d-91e0-16b04d745647" +} diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_08.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_08.json new file mode 100644 index 00000000..c91e0636 --- /dev/null +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_08.json @@ -0,0 +1,30 @@ +{ + "meta": { + "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + }, + "processedSuggestions": [ + { + "actions": [ + { + "actionCode": "DEFAULT_ExternalRoutingCode", + "actionType": "DEFAULT_UrlLabel", + "description": "DEFAULT_ActionDescription", + "urlLabel": "DEFAULT_UrlLabel", + "urlLink": "https://www.nhs.uk/default_url/" + } + ], + "condition": "COVID", + "eligibilityCohorts": [ + { + "cohortCode": "cohort_1_group", + "cohortStatus": "Actionable", + "cohortText": "are in cohort 1 group" + } + ], + "status": "Actionable", + "statusText": "You can have the COVID-19 vaccine", + "suitabilityRules": [] + } + ], + "responseId": "ffa31707-6172-427d-91e0-16b04d745647" +} diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_09.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_09.json new file mode 100644 index 00000000..71c1152b --- /dev/null +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_09.json @@ -0,0 +1,36 @@ +{ + "meta": { + "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + }, + "processedSuggestions": [ + { + "actions": [ + { + "actionCode": "DEFAULT_ExternalRoutingCode", + "actionType": "DEFAULT_UrlLabel", + "description": "DEFAULT_ActionDescription", + "urlLabel": "DEFAULT_UrlLabel", + "urlLink": "https://www.nhs.uk/default_url/" + } + ], + "condition": "COVID", + "eligibilityCohorts": [ + { + "cohortCode": "cohort_1_group", + "cohortStatus": "NotActionable", + "cohortText": "are in cohort 1 group" + } + ], + "status": "NotActionable", + "statusText": "NotActionable - Iteration Status Text", + "suitabilityRules": [ + { + "ruleCode": "TriggerSRuleViaICB", + "ruleText": "You have been made NotActionable by this S rule", + "ruleType": "S" + } + ] + } + ], + "responseId": "ffa31707-6172-427d-91e0-16b04d745647" +} From 5a3339ffd4916c5e846b26254a6d2d5847a1be45 Mon Sep 17 00:00:00 2001 From: Feyisayo Afolabi Date: Wed, 29 Apr 2026 13:10:58 +0100 Subject: [PATCH 3/6] Chore: [ELI-727] - Added more scenarios for Override text --- data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json index 911c4742..c9ea9209 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json @@ -1,5 +1,5 @@ { - "scenario_name": "ELI-727 - NotActionable - Status Override", + "scenario_name": "ELI-727 - NotActionable - Status Override - includeActions Y", "request_headers": { "nhs-login-nhs-number": "9000072702", "nhsd-End-User-Organisation-ods": "elid_automation" @@ -28,5 +28,8 @@ "NHS_NUMBER": "9000072702", "ATTRIBUTE_TYPE": "COVID" } - ] + ], + "query_params": { + "includeActions": "Y" + } } From f8f50b37e1d0dc61d5cd7f08a7f929a8300f016b Mon Sep 17 00:00:00 2001 From: Adam Waller <176666249+adam-wallernhs1@users.noreply.github.com> Date: Wed, 29 Apr 2026 14:19:49 +0100 Subject: [PATCH 4/6] updated config and tests to standardise --- .../AUTO_ELI-727-EMPTY-STATUS.json | 6 +- .../inProgressTestConfigs/AUTO_ELI-727.json | 77 ++++++++++--------- .../inProgressTestData/AUTO_ELI-727_01.json | 9 +-- .../inProgressTestData/AUTO_ELI-727_02.json | 8 +- .../inProgressTestData/AUTO_ELI-727_03.json | 2 +- .../inProgressTestData/AUTO_ELI-727_04.json | 4 +- .../inProgressTestData/AUTO_ELI-727_06.json | 5 +- .../inProgressTestData/AUTO_ELI-727_07.json | 8 +- 8 files changed, 63 insertions(+), 56 deletions(-) diff --git a/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json b/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json index a3e9fef2..e9526d62 100644 --- a/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json +++ b/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json @@ -4,7 +4,7 @@ "Version": 1, "Name": "EliD COVID-19 campaign example config", "Type": "V", - "Target": "COVID", + "Target": "MMR", "Manager": [ "example@nhs.net" ], @@ -37,8 +37,8 @@ "ApprovalMaximum": 0, "Type": "O", "StatusText": { - "NotEligible": "", - "NotActionable": "", + "NotEligible": "NotEligible - Iteration Status Text", + "NotActionable": "NotActionable - Iteration Status Text", "Actionable": "" }, "IterationCohorts": [ diff --git a/data/configs/inProgressTestConfigs/AUTO_ELI-727.json b/data/configs/inProgressTestConfigs/AUTO_ELI-727.json index 29af3937..03218fcc 100644 --- a/data/configs/inProgressTestConfigs/AUTO_ELI-727.json +++ b/data/configs/inProgressTestConfigs/AUTO_ELI-727.json @@ -2,7 +2,7 @@ "CampaignConfig": { "ID": "Story_Campaign_Config_ID", "Version": 1, - "Name": "EliD COVID-19 campaign example config", + "Name": "Status Text Override Campaign Config", "Type": "V", "Target": "COVID", "Manager": [ @@ -17,8 +17,8 @@ "IterationFrequency": "X", "IterationType": "O", "IterationTime": "07:00:00", - "StartDate": "20260201", - "EndDate": "20260930", + "StartDate": "<>", + "EndDate": "<>", "ApprovalMinimum": 0, "ApprovalMaximum": 0, "DefaultCommsRouting": "DEFAULT_CONFIG_LEVEL_ROUTING", @@ -29,8 +29,8 @@ "DefaultNotActionableRouting": "DEFAULT_NOTACTIONABLE_ROUTING", "DefaultNotEligibleRouting": "", "Version": 1, - "Name": "EliDMy Vaccines COVID-19 campaign - Iteration 2 exclude cohorts", - "IterationDate": "20260407", + "Name": "Status Text Override Campaign Config - Iteration", + "IterationDate": "<>", "IterationNumber": 1, "CommsType": "I", "ApprovalMinimum": 0, @@ -47,7 +47,7 @@ "CohortGroup": "cohort_1_group", "PositiveDescription": "are in cohort 1 group", "NegativeDescription": "are NOT in cohort 1 group", - "Priority": 40 + "Priority": 10 } ], "IterationRules": [ @@ -75,8 +75,8 @@ }, { "Type": "S", - "Name": "TriggerSRuleViaICB", - "Description": "You have been made NotActionable by this S rule", + "Name": "TriggerSRuleViaICB_2", + "Description": "You have been made NotActionable by this S other rule", "Priority": 510, "AttributeLevel": "PERSON", "AttributeName": "ICB", @@ -86,19 +86,19 @@ }, { "Type": "R", - "Name": "if there have the ICB value Scenario_1", - "Description": "if there have the ICB value 9000072701", + "Name": "Trigger the Override Text if Actionable", + "Description": "If person has the ICB value Scenario_1", "Priority": 1000, "Operator": "=", "Comparator": "Scenario_1", "AttributeLevel": "PERSON", "AttributeName": "ICB", - "CommsRouting": "STATUS_TEXT_OVERRIDE_ACTIONABLE" + "CommsRouting": "STATUS_TEXT_OVERRIDE_ACTIONABLE|OTHER_NORMAL_ACTION" }, { "Type": "Y", - "Name": "Already vaccinated default text", - "Description": "Already vaccinated default text", + "Name": "Trigger the Override Text if NotActionable", + "Description": "If person has the ICB value Scenario_2", "Priority": 3000, "AttributeLevel": "PERSON", "AttributeName": "ICB", @@ -108,58 +108,65 @@ }, { "Type": "X", - "Name": "Other setting default text", - "Description": "Other setting default text", - "Priority": 4100, + "Name": "Trigger the Override Text if NotEligible", + "Description": "If they are a member of one of the cohorts in the Comparator", + "Priority": 4000, "AttributeLevel": "COHORT", "AttributeName": "COHORT_LABEL", "Operator": "MemberOf", "Comparator": "covid_16+_immunosuppression,covid_under16_immunosuppression", - "CommsRouting": "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE" + "CommsRouting": "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE|OTHER_NORMAL_ACTION" } ], "ActionsMapper": { + "OTHER_NORMAL_ACTION": { + "ExternalRoutingCode": "OtherNormalAction", + "ActionDescription": "Other Normal Action", + "ActionType": "InfoText", + "UrlLink": null, + "UrlLabel": "" + }, "DEFAULT_CONFIG_LEVEL_ROUTING": { - "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", - "ActionDescription": "DEFAULT_ActionDescription", - "ActionType": "DEFAULT_UrlLabel", + "ExternalRoutingCode": "CONFIG_LEVEL_ROUTING_ExternalRoutingCode", + "ActionDescription": "CONFIG_LEVEL_ROUTING_ActionDescription", + "ActionType": "CONFIG_LEVEL_ROUTING_UrlLabel", "UrlLink": "https://www.nhs.uk/default_url/", - "UrlLabel": "DEFAULT_UrlLabel" + "UrlLabel": "CONFIG_LEVEL_ROUTING_UrlLabel" }, "DEFAULT_ACTIONABLE_ROUTING": { - "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", - "ActionDescription": "DEFAULT_ActionDescription", - "ActionType": "DEFAULT_UrlLabel", + "ExternalRoutingCode": "DEFAULT_ACTIONABLE_ExternalRoutingCode", + "ActionDescription": "DEFAULT_ACTIONABLE_ActionDescription", + "ActionType": "DEFAULT_ACTIONABLE__UrlLabel", "UrlLink": "https://www.nhs.uk/default_url/", - "UrlLabel": "DEFAULT_UrlLabel" + "UrlLabel": "DEFAULT_ACTIONABLE__UrlLabel" }, "DEFAULT_NOTACTIONABLE_ROUTING": { - "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", - "ActionDescription": "DEFAULT_ActionDescription", - "ActionType": "DEFAULT_UrlLabel", + "ExternalRoutingCode": "DEFAULT_NOTACTIONABLE_ExternalRoutingCode", + "ActionDescription": "DEFAULT_NOTACTIONABLE_ActionDescription", + "ActionType": "DEFAULT_NOTACTIONABLE_UrlLabel", "UrlLink": "https://www.nhs.uk/default_url/", - "UrlLabel": "DEFAULT_UrlLabel" + "UrlLabel": "DEFAULT_NOTACTIONABLE_UrlLabel" }, "STATUS_TEXT_OVERRIDE_ACTIONABLE": { "ExternalRoutingCode": "StatusTextOverrideActionable", "ActionDescription": "Status Text Override Actionable", "ActionType": "norender_StatusTextOverride", - "UrlLink": null, - "UrlLabel": "" + "UrlLink": "https://www.nhs.uk/actionable_overide/", + "UrlLabel": "actionable_overide" }, "STATUS_TEXT_OVERRIDE_NOT_ACTIONABLE": { "ExternalRoutingCode": "StatusTextOverrideNotActionable", "ActionDescription": "Status Text Override Not Actionable", "ActionType": "norender_StatusTextOverride", - "UrlLink": null, - "UrlLabel": "" + "UrlLink": "https://www.nhs.uk/notactionable_overide/", + "UrlLabel": "notactionable_overide" }, "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE": { "ExternalRoutingCode": "StatusTextOverrideNotEligible", "ActionDescription": "Status Text Override Not Eligible", "ActionType": "norender_StatusTextOverride", - "UrlLink": null, - "UrlLabel": "" + "UrlLink": "https://www.nhs.uk/noteligible_overide/", + "UrlLabel": "noteligible_overide" } } } diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json index 06418bd0..136542d6 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json @@ -4,6 +4,9 @@ "nhs-login-nhs-number": "9000072701", "nhsd-End-User-Organisation-ods": "elid_automation" }, + "query_params": { + "includeActions": "Y" + }, "config_filenames": [ "AUTO_ELI-727.json" ], @@ -27,10 +30,6 @@ { "NHS_NUMBER": "9000072701", "ATTRIBUTE_TYPE": "COVID" - } - ], - "query_params": { - "includeActions": "Y" - } + ] } diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json index c9ea9209..ff93c4e0 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json @@ -4,6 +4,9 @@ "nhs-login-nhs-number": "9000072702", "nhsd-End-User-Organisation-ods": "elid_automation" }, + "query_params": { + "includeActions": "Y" + }, "config_filenames": [ "AUTO_ELI-727.json" ], @@ -28,8 +31,5 @@ "NHS_NUMBER": "9000072702", "ATTRIBUTE_TYPE": "COVID" } - ], - "query_params": { - "includeActions": "Y" - } + ] } diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_03.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_03.json index d55fc95a..d051dd61 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_03.json +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_03.json @@ -1,5 +1,5 @@ { - "scenario_name": "ELI-727 - NotEligible - Status Override", + "scenario_name": "ELI-727 - NotEligible - Status Override - Default includeActions is Y", "request_headers": { "nhs-login-nhs-number": "9000072703", "nhsd-End-User-Organisation-ods": "elid_automation" diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_04.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_04.json index c8113eab..f9f287e4 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_04.json +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_04.json @@ -1,5 +1,5 @@ { - "scenario_name": "ELI-727 - NotEligible - No override", + "scenario_name": "ELI-727 - Actionable - No override", "request_headers": { "nhs-login-nhs-number": "9000072704", "nhsd-End-User-Organisation-ods": "elid_automation" @@ -18,7 +18,7 @@ "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": [ { - "COHORT_LABEL": "covid_16+_immunosuppression", + "COHORT_LABEL": "cohort_1", "DATE_JOINED": "20020101" } ] diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_06.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_06.json index aaae5058..1644da86 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_06.json +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_06.json @@ -1,5 +1,5 @@ { - "scenario_name": "ELI-727 - NOTELIGIBLE - NoOverride", + "scenario_name": "ELI-727 - NotEligible - NoOverride", "request_headers": { "nhs-login-nhs-number": "9000072706", "nhsd-End-User-Organisation-ods": "elid_automation" @@ -25,7 +25,8 @@ }, { "NHS_NUMBER": "9000072706", - "ATTRIBUTE_TYPE": "COVID" + "ATTRIBUTE_TYPE": "COVID", + "LAST_SUCCESSFUL_DATE": "<>" } ] } diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_07.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_07.json index ec31b7ad..ee73914d 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_07.json +++ b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_07.json @@ -4,6 +4,9 @@ "nhs-login-nhs-number": "9000072707", "nhsd-End-User-Organisation-ods": "elid_automation" }, + "query_params": { + "includeActions": "N" + }, "config_filenames": [ "AUTO_ELI-727.json" ], @@ -28,8 +31,5 @@ "NHS_NUMBER": "9000072707", "ATTRIBUTE_TYPE": "COVID" } - ], - "query_params": { - "includeActions": "N" - } + ] } From ed8be4984b351508dc0318a538cd95c5b3e3c5aa Mon Sep 17 00:00:00 2001 From: Feyisayo Afolabi Date: Wed, 29 Apr 2026 16:26:06 +0100 Subject: [PATCH 5/6] Chore: [ELI-727] - Added the working responses --- .../AUTO_ELI-727-EMPTY-ROUTING.json | 2 +- .../AUTO_ELI-727-EMPTY-STATUS.json | 79 ++++++++++--------- .../AUTO_ELI-727_01.json | 16 ++-- .../AUTO_ELI-727_02.json | 18 ++--- .../AUTO_ELI-727_03.json | 16 ++-- .../AUTO_ELI-727_04.json | 22 +++--- .../AUTO_ELI-727_05.json | 18 ++--- .../AUTO_ELI-727_06.json | 12 +-- .../AUTO_ELI-727_07.json | 5 +- .../AUTO_ELI-727_08.json | 14 ++-- .../AUTO_ELI-727_09.json | 14 +--- 11 files changed, 100 insertions(+), 116 deletions(-) diff --git a/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-ROUTING.json b/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-ROUTING.json index 047f9a0a..e31b9bbe 100644 --- a/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-ROUTING.json +++ b/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-ROUTING.json @@ -2,7 +2,7 @@ "CampaignConfig": { "ID": "Story_Campaign_Config_ID", "Version": 1, - "Name": "EliD COVID-19 campaign example config", + "Name": "Status Text Override Campaign Config - Empty ROUTING Text", "Type": "V", "Target": "COVID", "Manager": [ diff --git a/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json b/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json index e9526d62..2510fb2c 100644 --- a/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json +++ b/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json @@ -2,9 +2,9 @@ "CampaignConfig": { "ID": "Story_Campaign_Config_ID", "Version": 1, - "Name": "EliD COVID-19 campaign example config", + "Name": "Status Text Override Campaign Config - Empty Status Text", "Type": "V", - "Target": "MMR", + "Target": "COVID", "Manager": [ "example@nhs.net" ], @@ -17,8 +17,8 @@ "IterationFrequency": "X", "IterationType": "O", "IterationTime": "07:00:00", - "StartDate": "20260201", - "EndDate": "20260930", + "StartDate": "<>", + "EndDate": "<>", "ApprovalMinimum": 0, "ApprovalMaximum": 0, "DefaultCommsRouting": "DEFAULT_CONFIG_LEVEL_ROUTING", @@ -29,8 +29,8 @@ "DefaultNotActionableRouting": "DEFAULT_NOTACTIONABLE_ROUTING", "DefaultNotEligibleRouting": "", "Version": 1, - "Name": "EliDMy Vaccines COVID-19 campaign - Iteration 2 exclude cohorts", - "IterationDate": "20260407", + "Name": "Status Text Override Campaign Config - Iteration", + "IterationDate": "<>", "IterationNumber": 1, "CommsType": "I", "ApprovalMinimum": 0, @@ -47,7 +47,7 @@ "CohortGroup": "cohort_1_group", "PositiveDescription": "are in cohort 1 group", "NegativeDescription": "are NOT in cohort 1 group", - "Priority": 40 + "Priority": 10 } ], "IterationRules": [ @@ -75,8 +75,8 @@ }, { "Type": "S", - "Name": "TriggerSRuleViaICB", - "Description": "You have been made NotActionable by this S rule", + "Name": "TriggerSRuleViaICB_2", + "Description": "You have been made NotActionable by this S other rule", "Priority": 510, "AttributeLevel": "PERSON", "AttributeName": "ICB", @@ -86,19 +86,19 @@ }, { "Type": "R", - "Name": "if there have the ICB value Scenario_1", - "Description": "if there have the ICB value 9000072701", + "Name": "Trigger the Override Text if Actionable", + "Description": "If person has the ICB value Scenario_1", "Priority": 1000, "Operator": "=", "Comparator": "Scenario_1", "AttributeLevel": "PERSON", "AttributeName": "ICB", - "CommsRouting": "STATUS_TEXT_OVERRIDE_ACTIONABLE" + "CommsRouting": "STATUS_TEXT_OVERRIDE_ACTIONABLE|OTHER_NORMAL_ACTION" }, { "Type": "Y", - "Name": "Already vaccinated default text", - "Description": "Already vaccinated default text", + "Name": "Trigger the Override Text if NotActionable", + "Description": "If person has the ICB value Scenario_2", "Priority": 3000, "AttributeLevel": "PERSON", "AttributeName": "ICB", @@ -108,58 +108,65 @@ }, { "Type": "X", - "Name": "Other setting default text", - "Description": "Other setting default text", - "Priority": 4100, + "Name": "Trigger the Override Text if NotEligible", + "Description": "If they are a member of one of the cohorts in the Comparator", + "Priority": 4000, "AttributeLevel": "COHORT", "AttributeName": "COHORT_LABEL", "Operator": "MemberOf", "Comparator": "covid_16+_immunosuppression,covid_under16_immunosuppression", - "CommsRouting": "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE" + "CommsRouting": "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE|OTHER_NORMAL_ACTION" } ], "ActionsMapper": { + "OTHER_NORMAL_ACTION": { + "ExternalRoutingCode": "OtherNormalAction", + "ActionDescription": "Other Normal Action", + "ActionType": "InfoText", + "UrlLink": null, + "UrlLabel": "" + }, "DEFAULT_CONFIG_LEVEL_ROUTING": { - "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", - "ActionDescription": "DEFAULT_ActionDescription", - "ActionType": "DEFAULT_UrlLabel", + "ExternalRoutingCode": "CONFIG_LEVEL_ROUTING_ExternalRoutingCode", + "ActionDescription": "CONFIG_LEVEL_ROUTING_ActionDescription", + "ActionType": "CONFIG_LEVEL_ROUTING_UrlLabel", "UrlLink": "https://www.nhs.uk/default_url/", - "UrlLabel": "DEFAULT_UrlLabel" + "UrlLabel": "CONFIG_LEVEL_ROUTING_UrlLabel" }, "DEFAULT_ACTIONABLE_ROUTING": { - "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", - "ActionDescription": "DEFAULT_ActionDescription", - "ActionType": "DEFAULT_UrlLabel", + "ExternalRoutingCode": "DEFAULT_ACTIONABLE_ExternalRoutingCode", + "ActionDescription": "DEFAULT_ACTIONABLE_ActionDescription", + "ActionType": "DEFAULT_ACTIONABLE__UrlLabel", "UrlLink": "https://www.nhs.uk/default_url/", - "UrlLabel": "DEFAULT_UrlLabel" + "UrlLabel": "DEFAULT_ACTIONABLE__UrlLabel" }, "DEFAULT_NOTACTIONABLE_ROUTING": { - "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", - "ActionDescription": "DEFAULT_ActionDescription", - "ActionType": "DEFAULT_UrlLabel", + "ExternalRoutingCode": "DEFAULT_NOTACTIONABLE_ExternalRoutingCode", + "ActionDescription": "DEFAULT_NOTACTIONABLE_ActionDescription", + "ActionType": "DEFAULT_NOTACTIONABLE_UrlLabel", "UrlLink": "https://www.nhs.uk/default_url/", - "UrlLabel": "DEFAULT_UrlLabel" + "UrlLabel": "DEFAULT_NOTACTIONABLE_UrlLabel" }, "STATUS_TEXT_OVERRIDE_ACTIONABLE": { "ExternalRoutingCode": "StatusTextOverrideActionable", "ActionDescription": "Status Text Override Actionable", "ActionType": "norender_StatusTextOverride", - "UrlLink": null, - "UrlLabel": "" + "UrlLink": "https://www.nhs.uk/actionable_overide/", + "UrlLabel": "actionable_overide" }, "STATUS_TEXT_OVERRIDE_NOT_ACTIONABLE": { "ExternalRoutingCode": "StatusTextOverrideNotActionable", "ActionDescription": "Status Text Override Not Actionable", "ActionType": "norender_StatusTextOverride", - "UrlLink": null, - "UrlLabel": "" + "UrlLink": "https://www.nhs.uk/notactionable_overide/", + "UrlLabel": "notactionable_overide" }, "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE": { "ExternalRoutingCode": "StatusTextOverrideNotEligible", "ActionDescription": "Status Text Override Not Eligible", "ActionType": "norender_StatusTextOverride", - "UrlLink": null, - "UrlLabel": "" + "UrlLink": "https://www.nhs.uk/noteligible_overide/", + "UrlLabel": "noteligible_overide" } } } diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_01.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_01.json index 7f883d93..b408763f 100644 --- a/data/responses/inProgressTestResponses/AUTO_ELI-727_01.json +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_01.json @@ -1,30 +1,30 @@ { "meta": { - "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + "lastUpdated": "2026-04-29T15:02:34.262240+00:00" }, "processedSuggestions": [ { "actions": [ { - "actionCode": "BookNBS", + "actionCode": "OtherNormalAction", "actionType": "InfoText", - "description": "Eligible to book", + "description": "Other Normal Action", "urlLabel": "", "urlLink": "" } ], - "condition": "FLU", + "condition": "COVID", "eligibilityCohorts": [ { - "cohortCode": "flu_clinical_risk", + "cohortCode": "cohort_1_group", "cohortStatus": "Actionable", - "cohortText": "have a weakened immune system because of a health condition or treatment" + "cohortText": "are in cohort 1 group" } ], "status": "Actionable", - "statusText": "You should have the Flu vaccine", + "statusText": "Status Text Override Actionable", "suitabilityRules": [] } ], - "responseId": "ffa31707-6172-427d-91e0-16b04d745647" + "responseId": "648b6d73-c3d8-4189-8e6d-2103fd1d015f" } diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_02.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_02.json index 055c7e95..a267311f 100644 --- a/data/responses/inProgressTestResponses/AUTO_ELI-727_02.json +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_02.json @@ -1,18 +1,10 @@ { "meta": { - "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + "lastUpdated": "2026-04-29T15:15:27.191212+00:00" }, "processedSuggestions": [ { - "actions": [ - { - "actionCode": "HelpSupportInfo", - "actionType": "InfoText", - "description": "### If you think this is incorrect\n\nIf you have already had this vaccination or your personal details are wrong, visit our [help and support page](https://www.nhs.uk/nhs-app/nhs-app-help-and-support/).", - "urlLabel": "", - "urlLink": "" - } - ], + "actions": [], "condition": "COVID", "eligibilityCohorts": [ { @@ -25,12 +17,12 @@ "statusText": "Status Text Override Not Actionable", "suitabilityRules": [ { - "ruleCode": "AlreadyVaccinated", - "ruleText": "AlreadyVaccinated", + "ruleCode": "TriggerSRuleViaICB", + "ruleText": "You have been made NotActionable by this S rule", "ruleType": "S" } ] } ], - "responseId": "ffa31707-6172-427d-91e0-16b04d745647" + "responseId": "d339397a-885c-483f-b7b0-09c3a263f3c3" } diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_03.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_03.json index 66d08408..a21cdf40 100644 --- a/data/responses/inProgressTestResponses/AUTO_ELI-727_03.json +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_03.json @@ -1,14 +1,14 @@ { "meta": { - "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + "lastUpdated": "2026-04-29T15:15:56.046604+00:00" }, "processedSuggestions": [ { "actions": [ { - "actionCode": "HelpSupportInfo", + "actionCode": "OtherNormalAction", "actionType": "InfoText", - "description": "### If you think this is incorrect\n\nIf you have already had this vaccination or your personal details are wrong, visit our [help and support page](https://www.nhs.uk/nhs-app/nhs-app-help-and-support/).", + "description": "Other Normal Action", "urlLabel": "", "urlLink": "" } @@ -23,14 +23,8 @@ ], "status": "NotEligible", "statusText": "Status Text Override Not Eligible", - "suitabilityRules": [ - { - "ruleCode": "NotEligibleOverride", - "ruleText": "Actionable due to clinical risk only", - "ruleType": "X" - } - ] + "suitabilityRules": [] } ], - "responseId": "ffa31707-6172-427d-91e0-16b04d745647" + "responseId": "561ac455-51c3-48a7-b192-d06040b1939e" } diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_04.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_04.json index a873d1bd..9c8aee93 100644 --- a/data/responses/inProgressTestResponses/AUTO_ELI-727_04.json +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_04.json @@ -1,30 +1,30 @@ { "meta": { - "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + "lastUpdated": "2026-04-29T15:18:10.895760+00:00" }, "processedSuggestions": [ { "actions": [ { - "actionCode": "HelpSupportInfo", - "actionType": "InfoText", - "description": "### If you think this is incorrect\n\nIf you have already had this vaccination or your personal details are wrong, visit our [help and support page](https://www.nhs.uk/nhs-app/nhs-app-help-and-support/).", - "urlLabel": "", - "urlLink": "" + "actionCode": "DEFAULT_ACTIONABLE_ExternalRoutingCode", + "actionType": "DEFAULT_ACTIONABLE__UrlLabel", + "description": "DEFAULT_ACTIONABLE_ActionDescription", + "urlLabel": "DEFAULT_ACTIONABLE__UrlLabel", + "urlLink": "https://www.nhs.uk/default_url/" } ], "condition": "COVID", "eligibilityCohorts": [ { "cohortCode": "cohort_1_group", - "cohortStatus": "NotEligible", - "cohortText": "are NOT in cohort 1 group" + "cohortStatus": "Actionable", + "cohortText": "are in cohort 1 group" } ], - "status": "NotEligible", - "statusText": "NotEligible - Iteration Status Text", + "status": "Actionable", + "statusText": "Actionable - Iteration Status Text", "suitabilityRules": [] } ], - "responseId": "ffa31707-6172-427d-91e0-16b04d745647" + "responseId": "cddfb7f0-890c-468b-8a61-16e6cda027aa" } diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_05.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_05.json index 4b8ad440..6c8d72a0 100644 --- a/data/responses/inProgressTestResponses/AUTO_ELI-727_05.json +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_05.json @@ -1,16 +1,16 @@ { "meta": { - "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + "lastUpdated": "2026-04-29T15:18:46.445394+00:00" }, "processedSuggestions": [ { "actions": [ { - "actionCode": "HelpSupportInfo", - "actionType": "InfoText", - "description": "### If you think this is incorrect\n\nIf you have already had this vaccination or your personal details are wrong, visit our [help and support page](https://www.nhs.uk/nhs-app/nhs-app-help-and-support/).", - "urlLabel": "", - "urlLink": "" + "actionCode": "DEFAULT_NOTACTIONABLE_ExternalRoutingCode", + "actionType": "DEFAULT_NOTACTIONABLE_UrlLabel", + "description": "DEFAULT_NOTACTIONABLE_ActionDescription", + "urlLabel": "DEFAULT_NOTACTIONABLE_UrlLabel", + "urlLink": "https://www.nhs.uk/default_url/" } ], "condition": "COVID", @@ -25,12 +25,12 @@ "statusText": "NotActionable - Iteration Status Text", "suitabilityRules": [ { - "ruleCode": "TooClose", - "ruleText": "TooClose", + "ruleCode": "TriggerSRuleViaICB_2", + "ruleText": "You have been made NotActionable by this S other rule", "ruleType": "S" } ] } ], - "responseId": "ffa31707-6172-427d-91e0-16b04d745647" + "responseId": "6aec81b4-3c2c-48dd-a1cd-cb11d036b812" } diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_06.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_06.json index 9ce4ff65..1c30889d 100644 --- a/data/responses/inProgressTestResponses/AUTO_ELI-727_06.json +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_06.json @@ -1,6 +1,6 @@ { "meta": { - "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + "lastUpdated": "2026-04-29T15:19:40.152819+00:00" }, "processedSuggestions": [ { @@ -9,14 +9,14 @@ "eligibilityCohorts": [ { "cohortCode": "cohort_1_group", - "cohortStatus": "Actionable", - "cohortText": "are in cohort 1 group" + "cohortStatus": "NotEligible", + "cohortText": "are NOT in cohort 1 group" } ], - "status": "Actionable", - "statusText": "Actionable - Iteration Status Text", + "status": "NotEligible", + "statusText": "NotEligible - Iteration Status Text", "suitabilityRules": [] } ], - "responseId": "ffa31707-6172-427d-91e0-16b04d745647" + "responseId": "00bd9847-50cf-453b-a1dc-8a839cf5b68a" } diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_07.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_07.json index 9ce4ff65..fd3ac19f 100644 --- a/data/responses/inProgressTestResponses/AUTO_ELI-727_07.json +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_07.json @@ -1,10 +1,9 @@ { "meta": { - "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + "lastUpdated": "2026-04-29T15:21:05.553562+00:00" }, "processedSuggestions": [ { - "actions": [], "condition": "COVID", "eligibilityCohorts": [ { @@ -18,5 +17,5 @@ "suitabilityRules": [] } ], - "responseId": "ffa31707-6172-427d-91e0-16b04d745647" + "responseId": "f5c7621b-23f3-454e-9467-69e38cf8c069" } diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_08.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_08.json index c91e0636..3a32fdd5 100644 --- a/data/responses/inProgressTestResponses/AUTO_ELI-727_08.json +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_08.json @@ -1,15 +1,15 @@ { "meta": { - "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + "lastUpdated": "2026-04-29T15:22:26.094821+00:00" }, "processedSuggestions": [ { "actions": [ { - "actionCode": "DEFAULT_ExternalRoutingCode", - "actionType": "DEFAULT_UrlLabel", - "description": "DEFAULT_ActionDescription", - "urlLabel": "DEFAULT_UrlLabel", + "actionCode": "DEFAULT_ACTIONABLE_ExternalRoutingCode", + "actionType": "DEFAULT_ACTIONABLE__UrlLabel", + "description": "DEFAULT_ACTIONABLE_ActionDescription", + "urlLabel": "DEFAULT_ACTIONABLE__UrlLabel", "urlLink": "https://www.nhs.uk/default_url/" } ], @@ -22,9 +22,9 @@ } ], "status": "Actionable", - "statusText": "You can have the COVID-19 vaccine", + "statusText": "You should have the COVID vaccine", "suitabilityRules": [] } ], - "responseId": "ffa31707-6172-427d-91e0-16b04d745647" + "responseId": "5a6b1a52-df43-4c20-804b-7a39bb67ccaa" } diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_09.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_09.json index 71c1152b..7e65c60f 100644 --- a/data/responses/inProgressTestResponses/AUTO_ELI-727_09.json +++ b/data/responses/inProgressTestResponses/AUTO_ELI-727_09.json @@ -1,18 +1,10 @@ { "meta": { - "lastUpdated": "2026-03-04T14:57:46.982164+00:00" + "lastUpdated": "2026-04-29T15:24:19.099379+00:00" }, "processedSuggestions": [ { - "actions": [ - { - "actionCode": "DEFAULT_ExternalRoutingCode", - "actionType": "DEFAULT_UrlLabel", - "description": "DEFAULT_ActionDescription", - "urlLabel": "DEFAULT_UrlLabel", - "urlLink": "https://www.nhs.uk/default_url/" - } - ], + "actions": [], "condition": "COVID", "eligibilityCohorts": [ { @@ -32,5 +24,5 @@ ] } ], - "responseId": "ffa31707-6172-427d-91e0-16b04d745647" + "responseId": "4f0f6f69-8932-42d8-92a1-53bf08e1e459" } From c7db35979b32d3337102db8f52f5460ab32e7d46 Mon Sep 17 00:00:00 2001 From: Feyisayo Afolabi Date: Thu, 30 Apr 2026 09:55:32 +0100 Subject: [PATCH 6/6] Chore: [ELI-727] - Added the working responses for status text --- .../AUTO_ELI-727-EMPTY-ROUTING.json | 168 ------------------ .../AUTO_ELI-727-EMPTY-STATUS.json | 0 .../AUTO_ELI-727.json | 0 .../inProgressTestData/AUTO_ELI-727_09.json | 32 ---- .../AUTO_ELI-727_01.json | 2 +- .../AUTO_ELI-727_02.json | 2 +- .../AUTO_ELI-727_03.json | 2 +- .../AUTO_ELI-727_04.json | 2 +- .../AUTO_ELI-727_05.json | 2 +- .../AUTO_ELI-727_06.json | 2 +- .../AUTO_ELI-727_07.json | 2 +- .../AUTO_ELI-727_08.json | 2 +- .../AUTO_ELI-727_09.json | 28 --- .../AUTO_ELI-727_01.json | 0 .../AUTO_ELI-727_02.json | 0 .../AUTO_ELI-727_03.json | 0 .../AUTO_ELI-727_04.json | 0 .../AUTO_ELI-727_05.json | 0 .../AUTO_ELI-727_06.json | 0 .../AUTO_ELI-727_07.json | 0 .../AUTO_ELI-727_08.json | 0 21 files changed, 8 insertions(+), 236 deletions(-) delete mode 100644 data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-ROUTING.json rename data/configs/{inProgressTestConfigs => storyTestConfigs}/AUTO_ELI-727-EMPTY-STATUS.json (100%) rename data/configs/{inProgressTestConfigs => storyTestConfigs}/AUTO_ELI-727.json (100%) delete mode 100644 data/dynamoDB/inProgressTestData/AUTO_ELI-727_09.json rename data/dynamoDB/{inProgressTestData => storyTestData}/AUTO_ELI-727_01.json (91%) rename data/dynamoDB/{inProgressTestData => storyTestData}/AUTO_ELI-727_02.json (91%) rename data/dynamoDB/{inProgressTestData => storyTestData}/AUTO_ELI-727_03.json (92%) rename data/dynamoDB/{inProgressTestData => storyTestData}/AUTO_ELI-727_04.json (90%) rename data/dynamoDB/{inProgressTestData => storyTestData}/AUTO_ELI-727_05.json (90%) rename data/dynamoDB/{inProgressTestData => storyTestData}/AUTO_ELI-727_06.json (90%) rename data/dynamoDB/{inProgressTestData => storyTestData}/AUTO_ELI-727_07.json (91%) rename data/dynamoDB/{inProgressTestData => storyTestData}/AUTO_ELI-727_08.json (90%) delete mode 100644 data/responses/inProgressTestResponses/AUTO_ELI-727_09.json rename data/responses/{inProgressTestResponses => storyTestResponses}/AUTO_ELI-727_01.json (100%) rename data/responses/{inProgressTestResponses => storyTestResponses}/AUTO_ELI-727_02.json (100%) rename data/responses/{inProgressTestResponses => storyTestResponses}/AUTO_ELI-727_03.json (100%) rename data/responses/{inProgressTestResponses => storyTestResponses}/AUTO_ELI-727_04.json (100%) rename data/responses/{inProgressTestResponses => storyTestResponses}/AUTO_ELI-727_05.json (100%) rename data/responses/{inProgressTestResponses => storyTestResponses}/AUTO_ELI-727_06.json (100%) rename data/responses/{inProgressTestResponses => storyTestResponses}/AUTO_ELI-727_07.json (100%) rename data/responses/{inProgressTestResponses => storyTestResponses}/AUTO_ELI-727_08.json (100%) diff --git a/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-ROUTING.json b/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-ROUTING.json deleted file mode 100644 index e31b9bbe..00000000 --- a/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-ROUTING.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "CampaignConfig": { - "ID": "Story_Campaign_Config_ID", - "Version": 1, - "Name": "Status Text Override Campaign Config - Empty ROUTING Text", - "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": "20260201", - "EndDate": "20260930", - "ApprovalMinimum": 0, - "ApprovalMaximum": 0, - "DefaultCommsRouting": "DEFAULT_CONFIG_LEVEL_ROUTING", - "Iterations": [ - { - "ID": "8ecb742b-45ea-4f0d-8e2e-9c2feb1e46d1", - "DefaultCommsRouting": "", - "DefaultNotActionableRouting": "", - "DefaultNotEligibleRouting": "", - "Version": 1, - "Name": "EliDMy Vaccines COVID-19 campaign - Iteration 2 exclude cohorts", - "IterationDate": "20260407", - "IterationNumber": 1, - "CommsType": "I", - "ApprovalMinimum": 0, - "ApprovalMaximum": 0, - "Type": "O", - "StatusText": { - "NotEligible": "NotEligible - Iteration Status Text", - "NotActionable": "NotActionable - Iteration Status Text", - "Actionable": "Actionable - Iteration Status Text" - }, - "IterationCohorts": [ - { - "CohortLabel": "cohort_1", - "CohortGroup": "cohort_1_group", - "PositiveDescription": "are in cohort 1 group", - "NegativeDescription": "are NOT in cohort 1 group", - "Priority": 40 - } - ], - "IterationRules": [ - { - "Type": "F", - "Name": "Filter if already vaccinated", - "Description": "Filter if already vaccinated", - "Operator": "is_not_null", - "Comparator": "", - "AttributeTarget": "COVID", - "AttributeLevel": "TARGET", - "AttributeName": "LAST_SUCCESSFUL_DATE", - "Priority": 100 - }, - { - "Type": "S", - "Name": "TriggerSRuleViaICB", - "Description": "You have been made NotActionable by this S rule", - "Priority": 500, - "AttributeLevel": "PERSON", - "AttributeName": "ICB", - "Operator": "=", - "Comparator": "Scenario_2", - "RuleStop": "Y" - }, - { - "Type": "S", - "Name": "TriggerSRuleViaICB", - "Description": "You have been made NotActionable by this S rule", - "Priority": 510, - "AttributeLevel": "PERSON", - "AttributeName": "ICB", - "Operator": "=", - "Comparator": "Scenario_3", - "RuleStop": "Y" - }, - { - "Type": "R", - "Name": "if there have the ICB value Scenario_1", - "Description": "if there have the ICB value 9000072701", - "Priority": 1000, - "Operator": "=", - "Comparator": "Scenario_1", - "AttributeLevel": "PERSON", - "AttributeName": "ICB", - "CommsRouting": "STATUS_TEXT_OVERRIDE_ACTIONABLE" - }, - { - "Type": "Y", - "Name": "Already vaccinated default text", - "Description": "Already vaccinated default text", - "Priority": 3000, - "AttributeLevel": "PERSON", - "AttributeName": "ICB", - "Operator": "=", - "Comparator": "Scenario_2", - "CommsRouting": "STATUS_TEXT_OVERRIDE_NOT_ACTIONABLE" - }, - { - "Type": "X", - "Name": "Other setting default text", - "Description": "Other setting default text", - "Priority": 4100, - "AttributeLevel": "COHORT", - "AttributeName": "COHORT_LABEL", - "Operator": "MemberOf", - "Comparator": "covid_16+_immunosuppression,covid_under16_immunosuppression", - "CommsRouting": "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE" - } - ], - "ActionsMapper": { - "DEFAULT_CONFIG_LEVEL_ROUTING": { - "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", - "ActionDescription": "DEFAULT_ActionDescription", - "ActionType": "DEFAULT_UrlLabel", - "UrlLink": "https://www.nhs.uk/default_url/", - "UrlLabel": "DEFAULT_UrlLabel" - }, - "DEFAULT_ACTIONABLE_ROUTING": { - "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", - "ActionDescription": "DEFAULT_ActionDescription", - "ActionType": "DEFAULT_UrlLabel", - "UrlLink": "https://www.nhs.uk/default_url/", - "UrlLabel": "DEFAULT_UrlLabel" - }, - "DEFAULT_NOTACTIONABLE_ROUTING": { - "ExternalRoutingCode": "DEFAULT_ExternalRoutingCode", - "ActionDescription": "DEFAULT_ActionDescription", - "ActionType": "DEFAULT_UrlLabel", - "UrlLink": "https://www.nhs.uk/default_url/", - "UrlLabel": "DEFAULT_UrlLabel" - }, - "STATUS_TEXT_OVERRIDE_ACTIONABLE": { - "ExternalRoutingCode": "StatusTextOverrideActionable", - "ActionDescription": "Status Text Override Actionable", - "ActionType": "norender_StatusTextOverride", - "UrlLink": null, - "UrlLabel": "" - }, - "STATUS_TEXT_OVERRIDE_NOT_ACTIONABLE": { - "ExternalRoutingCode": "StatusTextOverrideNotActionable", - "ActionDescription": "Status Text Override Not Actionable", - "ActionType": "norender_StatusTextOverride", - "UrlLink": null, - "UrlLabel": "" - }, - "STATUS_TEXT_OVERRIDE_NOT_ELIGIBLE": { - "ExternalRoutingCode": "StatusTextOverrideNotEligible", - "ActionDescription": "Status Text Override Not Eligible", - "ActionType": "norender_StatusTextOverride", - "UrlLink": null, - "UrlLabel": "" - } - } - } - ] - } -} diff --git a/data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json b/data/configs/storyTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json similarity index 100% rename from data/configs/inProgressTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json rename to data/configs/storyTestConfigs/AUTO_ELI-727-EMPTY-STATUS.json diff --git a/data/configs/inProgressTestConfigs/AUTO_ELI-727.json b/data/configs/storyTestConfigs/AUTO_ELI-727.json similarity index 100% rename from data/configs/inProgressTestConfigs/AUTO_ELI-727.json rename to data/configs/storyTestConfigs/AUTO_ELI-727.json diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_09.json b/data/dynamoDB/inProgressTestData/AUTO_ELI-727_09.json deleted file mode 100644 index a7eb5bce..00000000 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_09.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "scenario_name": "ELI-727 - NotActionable - Empty Routing Fallback", - "request_headers": { - "nhs-login-nhs-number": "9000072709", - "nhsd-End-User-Organisation-ods": "elid_automation" - }, - "config_filenames": [ - "AUTO_ELI-727-EMPTY-ROUTING.json" - ], - "data": [ - { - "NHS_NUMBER": "9000072709", - "ATTRIBUTE_TYPE": "PERSON", - "DATE_OF_BIRTH": "<>", - "ICB": "Scenario_3" - }, - { - "NHS_NUMBER": "9000072709", - "ATTRIBUTE_TYPE": "COHORTS", - "COHORT_MEMBERSHIPS": [ - { - "COHORT_LABEL": "cohort_1", - "DATE_JOINED": "20240101" - } - ] - }, - { - "NHS_NUMBER": "9000072709", - "ATTRIBUTE_TYPE": "COVID" - } - ] -} diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json b/data/dynamoDB/storyTestData/AUTO_ELI-727_01.json similarity index 91% rename from data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json rename to data/dynamoDB/storyTestData/AUTO_ELI-727_01.json index 136542d6..6f57aefd 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_01.json +++ b/data/dynamoDB/storyTestData/AUTO_ELI-727_01.json @@ -2,7 +2,7 @@ "scenario_name": "ELI-727 - Actionable - Status Override - includeActions Y", "request_headers": { "nhs-login-nhs-number": "9000072701", - "nhsd-End-User-Organisation-ods": "elid_automation" + "nhsd-End-User-Organisation-ods": "elid_automation_status_text_override" }, "query_params": { "includeActions": "Y" diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json b/data/dynamoDB/storyTestData/AUTO_ELI-727_02.json similarity index 91% rename from data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json rename to data/dynamoDB/storyTestData/AUTO_ELI-727_02.json index ff93c4e0..1fc16ab1 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_02.json +++ b/data/dynamoDB/storyTestData/AUTO_ELI-727_02.json @@ -2,7 +2,7 @@ "scenario_name": "ELI-727 - NotActionable - Status Override - includeActions Y", "request_headers": { "nhs-login-nhs-number": "9000072702", - "nhsd-End-User-Organisation-ods": "elid_automation" + "nhsd-End-User-Organisation-ods": "elid_automation_status_text_override" }, "query_params": { "includeActions": "Y" diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_03.json b/data/dynamoDB/storyTestData/AUTO_ELI-727_03.json similarity index 92% rename from data/dynamoDB/inProgressTestData/AUTO_ELI-727_03.json rename to data/dynamoDB/storyTestData/AUTO_ELI-727_03.json index d051dd61..118c4567 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_03.json +++ b/data/dynamoDB/storyTestData/AUTO_ELI-727_03.json @@ -2,7 +2,7 @@ "scenario_name": "ELI-727 - NotEligible - Status Override - Default includeActions is Y", "request_headers": { "nhs-login-nhs-number": "9000072703", - "nhsd-End-User-Organisation-ods": "elid_automation" + "nhsd-End-User-Organisation-ods": "elid_automation_status_text_override" }, "config_filenames": [ "AUTO_ELI-727.json" diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_04.json b/data/dynamoDB/storyTestData/AUTO_ELI-727_04.json similarity index 90% rename from data/dynamoDB/inProgressTestData/AUTO_ELI-727_04.json rename to data/dynamoDB/storyTestData/AUTO_ELI-727_04.json index f9f287e4..9320ed5f 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_04.json +++ b/data/dynamoDB/storyTestData/AUTO_ELI-727_04.json @@ -2,7 +2,7 @@ "scenario_name": "ELI-727 - Actionable - No override", "request_headers": { "nhs-login-nhs-number": "9000072704", - "nhsd-End-User-Organisation-ods": "elid_automation" + "nhsd-End-User-Organisation-ods": "elid_automation_status_text_override" }, "config_filenames": [ "AUTO_ELI-727.json" diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_05.json b/data/dynamoDB/storyTestData/AUTO_ELI-727_05.json similarity index 90% rename from data/dynamoDB/inProgressTestData/AUTO_ELI-727_05.json rename to data/dynamoDB/storyTestData/AUTO_ELI-727_05.json index 580fb47e..16426cde 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_05.json +++ b/data/dynamoDB/storyTestData/AUTO_ELI-727_05.json @@ -2,7 +2,7 @@ "scenario_name": "ELI-727 - NotActionable - No override", "request_headers": { "nhs-login-nhs-number": "9000072705", - "nhsd-End-User-Organisation-ods": "elid_automation" + "nhsd-End-User-Organisation-ods": "elid_automation_status_text_override" }, "config_filenames": [ "AUTO_ELI-727.json" diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_06.json b/data/dynamoDB/storyTestData/AUTO_ELI-727_06.json similarity index 90% rename from data/dynamoDB/inProgressTestData/AUTO_ELI-727_06.json rename to data/dynamoDB/storyTestData/AUTO_ELI-727_06.json index 1644da86..ae189520 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_06.json +++ b/data/dynamoDB/storyTestData/AUTO_ELI-727_06.json @@ -2,7 +2,7 @@ "scenario_name": "ELI-727 - NotEligible - NoOverride", "request_headers": { "nhs-login-nhs-number": "9000072706", - "nhsd-End-User-Organisation-ods": "elid_automation" + "nhsd-End-User-Organisation-ods": "elid_automation_status_text_override" }, "config_filenames": [ "AUTO_ELI-727.json" diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_07.json b/data/dynamoDB/storyTestData/AUTO_ELI-727_07.json similarity index 91% rename from data/dynamoDB/inProgressTestData/AUTO_ELI-727_07.json rename to data/dynamoDB/storyTestData/AUTO_ELI-727_07.json index ee73914d..ddb3dee2 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_07.json +++ b/data/dynamoDB/storyTestData/AUTO_ELI-727_07.json @@ -2,7 +2,7 @@ "scenario_name": "ELI-727 - Actionable - Override Suppressed - includeActions N", "request_headers": { "nhs-login-nhs-number": "9000072707", - "nhsd-End-User-Organisation-ods": "elid_automation" + "nhsd-End-User-Organisation-ods": "elid_automation_status_text_override" }, "query_params": { "includeActions": "N" diff --git a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_08.json b/data/dynamoDB/storyTestData/AUTO_ELI-727_08.json similarity index 90% rename from data/dynamoDB/inProgressTestData/AUTO_ELI-727_08.json rename to data/dynamoDB/storyTestData/AUTO_ELI-727_08.json index 4631ebf5..16113369 100644 --- a/data/dynamoDB/inProgressTestData/AUTO_ELI-727_08.json +++ b/data/dynamoDB/storyTestData/AUTO_ELI-727_08.json @@ -2,7 +2,7 @@ "scenario_name": "ELI-727 - Actionable - Empty StatusText Fallback", "request_headers": { "nhs-login-nhs-number": "9000072708", - "nhsd-End-User-Organisation-ods": "elid_automation" + "nhsd-End-User-Organisation-ods": "elid_automation_status_text_override" }, "config_filenames": [ "AUTO_ELI-727-EMPTY-STATUS.json" diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_09.json b/data/responses/inProgressTestResponses/AUTO_ELI-727_09.json deleted file mode 100644 index 7e65c60f..00000000 --- a/data/responses/inProgressTestResponses/AUTO_ELI-727_09.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "meta": { - "lastUpdated": "2026-04-29T15:24:19.099379+00:00" - }, - "processedSuggestions": [ - { - "actions": [], - "condition": "COVID", - "eligibilityCohorts": [ - { - "cohortCode": "cohort_1_group", - "cohortStatus": "NotActionable", - "cohortText": "are in cohort 1 group" - } - ], - "status": "NotActionable", - "statusText": "NotActionable - Iteration Status Text", - "suitabilityRules": [ - { - "ruleCode": "TriggerSRuleViaICB", - "ruleText": "You have been made NotActionable by this S rule", - "ruleType": "S" - } - ] - } - ], - "responseId": "4f0f6f69-8932-42d8-92a1-53bf08e1e459" -} diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_01.json b/data/responses/storyTestResponses/AUTO_ELI-727_01.json similarity index 100% rename from data/responses/inProgressTestResponses/AUTO_ELI-727_01.json rename to data/responses/storyTestResponses/AUTO_ELI-727_01.json diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_02.json b/data/responses/storyTestResponses/AUTO_ELI-727_02.json similarity index 100% rename from data/responses/inProgressTestResponses/AUTO_ELI-727_02.json rename to data/responses/storyTestResponses/AUTO_ELI-727_02.json diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_03.json b/data/responses/storyTestResponses/AUTO_ELI-727_03.json similarity index 100% rename from data/responses/inProgressTestResponses/AUTO_ELI-727_03.json rename to data/responses/storyTestResponses/AUTO_ELI-727_03.json diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_04.json b/data/responses/storyTestResponses/AUTO_ELI-727_04.json similarity index 100% rename from data/responses/inProgressTestResponses/AUTO_ELI-727_04.json rename to data/responses/storyTestResponses/AUTO_ELI-727_04.json diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_05.json b/data/responses/storyTestResponses/AUTO_ELI-727_05.json similarity index 100% rename from data/responses/inProgressTestResponses/AUTO_ELI-727_05.json rename to data/responses/storyTestResponses/AUTO_ELI-727_05.json diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_06.json b/data/responses/storyTestResponses/AUTO_ELI-727_06.json similarity index 100% rename from data/responses/inProgressTestResponses/AUTO_ELI-727_06.json rename to data/responses/storyTestResponses/AUTO_ELI-727_06.json diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_07.json b/data/responses/storyTestResponses/AUTO_ELI-727_07.json similarity index 100% rename from data/responses/inProgressTestResponses/AUTO_ELI-727_07.json rename to data/responses/storyTestResponses/AUTO_ELI-727_07.json diff --git a/data/responses/inProgressTestResponses/AUTO_ELI-727_08.json b/data/responses/storyTestResponses/AUTO_ELI-727_08.json similarity index 100% rename from data/responses/inProgressTestResponses/AUTO_ELI-727_08.json rename to data/responses/storyTestResponses/AUTO_ELI-727_08.json