Skip to content

Commit 8a9d7ee

Browse files
Changes to tests
added 1 more test fixed 365 config to work with all test cases
1 parent f5bbaec commit 8a9d7ee

10 files changed

Lines changed: 164 additions & 505 deletions

File tree

tests/e2e/data/configs/storyTestConfigs/AUTO_RSV_ELI-365-1.json

Lines changed: 0 additions & 451 deletions
This file was deleted.

tests/e2e/data/configs/storyTestConfigs/AUTO_RSV_ELI-365.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,17 @@
301301
"AttributeName": "ICB",
302302
"CommsRouting": "BOOK_LOCAL|BOOK_NBS|HELP_SUPPORT"
303303
},
304+
{
305+
"Type": "R",
306+
"Name": "Within CP Expansion ICB not 80 plus",
307+
"Description": "Book an appointment on NBS as within CP expansion",
308+
"Priority": 1200,
309+
"AttributeLevel": "PERSON",
310+
"AttributeName": "DATE_OF_BIRTH",
311+
"Operator": "Y>",
312+
"Comparator": "-80",
313+
"CommsRouting": "BOOK_LOCAL|BOOK_NBS|HELP_SUPPORT"
314+
},
304315
{
305316
"Type": "R",
306317
"Name": "Within CP Expansion Local Authority",
@@ -312,6 +323,17 @@
312323
"AttributeName": "LOCAL_AUTHORITY",
313324
"CommsRouting": "BOOK_LOCAL|BOOK_NBS|HELP_SUPPORT"
314325
},
326+
{
327+
"Type": "R",
328+
"Name": "Within CP Expansion ICB not 80 plus",
329+
"Description": "Book an appointment on NBS as within CP expansion",
330+
"Priority": 1300,
331+
"AttributeLevel": "PERSON",
332+
"AttributeName": "DATE_OF_BIRTH",
333+
"Operator": "Y>",
334+
"Comparator": "-80",
335+
"CommsRouting": "BOOK_LOCAL|BOOK_NBS|HELP_SUPPORT"
336+
},
315337
{
316338
"Type": "Y",
317339
"Name": "Already vaccinated default text",

tests/e2e/data/dynamoDB/storyTestData/AUTO_RSV_ELI-365_024.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"scenario_name": "RSV - Actionable - In rsv_80_since_02_Sept_2024 - over 80 after 1st September 2024 - ICB",
2+
"scenario_name": "RSV - Actionable - In 3 actions - under 80 - Local Authority",
33
"request_headers": {
4-
"nhs-login-nhs-number": "9900036524"
4+
"nhs-login-nhs-number": "9900036526"
55
},
66
"config_filenames": [
77
"AUTO_RSV_ELI-365.json"
88
],
99
"data": [
1010
{
11-
"NHS_NUMBER": "9900036524",
11+
"NHS_NUMBER": "9900036526",
1212
"ATTRIBUTE_TYPE": "COHORTS",
1313
"COHORT_MEMBERSHIPS": [
1414
{
@@ -18,9 +18,9 @@
1818
]
1919
},
2020
{
21-
"NHS_NUMBER": "9900036524",
21+
"NHS_NUMBER": "9900036526",
2222
"ATTRIBUTE_TYPE": "PERSON",
23-
"DATE_OF_BIRTH": "<<DATE_AGE_80>>",
23+
"DATE_OF_BIRTH": "<<DATE_AGE_79>>",
2424
"GENDER": "0",
2525
"POSTCODE": "SG8 6EG",
2626
"POSTCODE_SECTOR": "SG86",
@@ -29,15 +29,15 @@
2929
"LSOA": "E01018267",
3030
"GP_PRACTICE_CODE": "D81046",
3131
"PCN": "U75549",
32-
"ICB": "QH8",
33-
"LOCAL_AUTHORITY": "ZZ8000011",
32+
"ICB": "zz1",
33+
"LOCAL_AUTHORITY": "E08000014",
3434
"COMMISSIONING_REGION": "Y61",
3535
"13Q_FLAG": "N",
3636
"CARE_HOME_FLAG": "N",
3737
"DE_FLAG": "N"
3838
},
3939
{
40-
"NHS_NUMBER": "9900036524",
40+
"NHS_NUMBER": "9900036526",
4141
"ATTRIBUTE_TYPE": "RSV",
4242
"LAST_SUCCESSFUL_DATE": null,
4343
"BOOKED_APPOINTMENT_DATE": null,

tests/e2e/data/dynamoDB/storyTestData/AUTO_RSV_ELI-365_025.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"scenario_name": "RSV - Actionable - In rsv_80_since_02_Sept_2024 - over 80 after 1st September 2024 - Local Authority",
2+
"scenario_name": "RSV - Actionable - In 3 actions - under 80 - ICB",
33
"request_headers": {
4-
"nhs-login-nhs-number": "9900036525"
4+
"nhs-login-nhs-number": "9900036527"
55
},
66
"config_filenames": [
77
"AUTO_RSV_ELI-365.json"
88
],
99
"data": [
1010
{
11-
"NHS_NUMBER": "9900036525",
11+
"NHS_NUMBER": "9900036527",
1212
"ATTRIBUTE_TYPE": "COHORTS",
1313
"COHORT_MEMBERSHIPS": [
1414
{
@@ -18,9 +18,9 @@
1818
]
1919
},
2020
{
21-
"NHS_NUMBER": "9900036525",
21+
"NHS_NUMBER": "9900036527",
2222
"ATTRIBUTE_TYPE": "PERSON",
23-
"DATE_OF_BIRTH": "<<DATE_AGE_80>>",
23+
"DATE_OF_BIRTH": "<<DATE_AGE_79>>",
2424
"GENDER": "0",
2525
"POSTCODE": "SG8 6EG",
2626
"POSTCODE_SECTOR": "SG86",
@@ -29,15 +29,15 @@
2929
"LSOA": "E01018267",
3030
"GP_PRACTICE_CODE": "D81046",
3131
"PCN": "U75549",
32-
"ICB": "zz1",
33-
"LOCAL_AUTHORITY": "E08000014",
32+
"ICB": "QH8",
33+
"LOCAL_AUTHORITY": "ZZ8000014",
3434
"COMMISSIONING_REGION": "Y61",
3535
"13Q_FLAG": "N",
3636
"CARE_HOME_FLAG": "N",
3737
"DE_FLAG": "N"
3838
},
3939
{
40-
"NHS_NUMBER": "9900036525",
40+
"NHS_NUMBER": "9900036527",
4141
"ATTRIBUTE_TYPE": "RSV",
4242
"LAST_SUCCESSFUL_DATE": null,
4343
"BOOKED_APPOINTMENT_DATE": null,

tests/e2e/data/dynamoDB/storyTestData/AUTO_RSV_ELI-365_026.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"scenario_name": "RSV - Actionable - In rsv_80_since_02_Sept_2024 - over 80 before 1st September 2024 - Local Authority",
2+
"scenario_name": "RSV - Actionable - 2 actions - 80 or over - ICB",
33
"request_headers": {
4-
"nhs-login-nhs-number": "9900036526"
4+
"nhs-login-nhs-number": "9900036524"
55
},
66
"config_filenames": [
77
"AUTO_RSV_ELI-365.json"
88
],
99
"data": [
1010
{
11-
"NHS_NUMBER": "9900036526",
11+
"NHS_NUMBER": "9900036524",
1212
"ATTRIBUTE_TYPE": "COHORTS",
1313
"COHORT_MEMBERSHIPS": [
1414
{
@@ -18,9 +18,9 @@
1818
]
1919
},
2020
{
21-
"NHS_NUMBER": "9900036526",
21+
"NHS_NUMBER": "9900036524",
2222
"ATTRIBUTE_TYPE": "PERSON",
23-
"DATE_OF_BIRTH": "<<DATE_AGE_81>>",
23+
"DATE_OF_BIRTH": "<<DATE_AGE_80>>",
2424
"GENDER": "0",
2525
"POSTCODE": "SG8 6EG",
2626
"POSTCODE_SECTOR": "SG86",
@@ -29,15 +29,15 @@
2929
"LSOA": "E01018267",
3030
"GP_PRACTICE_CODE": "D81046",
3131
"PCN": "U75549",
32-
"ICB": "zz1",
33-
"LOCAL_AUTHORITY": "E08000014",
32+
"ICB": "QH8",
33+
"LOCAL_AUTHORITY": "ZZ8000011",
3434
"COMMISSIONING_REGION": "Y61",
3535
"13Q_FLAG": "N",
3636
"CARE_HOME_FLAG": "N",
3737
"DE_FLAG": "N"
3838
},
3939
{
40-
"NHS_NUMBER": "9900036526",
40+
"NHS_NUMBER": "9900036524",
4141
"ATTRIBUTE_TYPE": "RSV",
4242
"LAST_SUCCESSFUL_DATE": null,
4343
"BOOKED_APPOINTMENT_DATE": null,

tests/e2e/data/dynamoDB/storyTestData/AUTO_RSV_ELI-365_027.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"scenario_name": "RSV - Actionable - In rsv_80_since_02_Sept_2024 - over 80 before 1st September 2024 - ICB",
2+
"scenario_name": "RSV - Actionable - 2 actions - 80 or over - Local Authority",
33
"request_headers": {
4-
"nhs-login-nhs-number": "9900036527"
4+
"nhs-login-nhs-number": "9900036525"
55
},
66
"config_filenames": [
77
"AUTO_RSV_ELI-365.json"
88
],
99
"data": [
1010
{
11-
"NHS_NUMBER": "9900036527",
11+
"NHS_NUMBER": "9900036525",
1212
"ATTRIBUTE_TYPE": "COHORTS",
1313
"COHORT_MEMBERSHIPS": [
1414
{
@@ -18,9 +18,9 @@
1818
]
1919
},
2020
{
21-
"NHS_NUMBER": "9900036527",
21+
"NHS_NUMBER": "9900036525",
2222
"ATTRIBUTE_TYPE": "PERSON",
23-
"DATE_OF_BIRTH": "<<DATE_AGE_81>>",
23+
"DATE_OF_BIRTH": "<<DATE_AGE_80>>",
2424
"GENDER": "0",
2525
"POSTCODE": "SG8 6EG",
2626
"POSTCODE_SECTOR": "SG86",
@@ -29,15 +29,15 @@
2929
"LSOA": "E01018267",
3030
"GP_PRACTICE_CODE": "D81046",
3131
"PCN": "U75549",
32-
"ICB": "QH8",
33-
"LOCAL_AUTHORITY": "ZZ8000014",
32+
"ICB": "zz1",
33+
"LOCAL_AUTHORITY": "E08000014",
3434
"COMMISSIONING_REGION": "Y61",
3535
"13Q_FLAG": "N",
3636
"CARE_HOME_FLAG": "N",
3737
"DE_FLAG": "N"
3838
},
3939
{
40-
"NHS_NUMBER": "9900036527",
40+
"NHS_NUMBER": "9900036525",
4141
"ATTRIBUTE_TYPE": "RSV",
4242
"LAST_SUCCESSFUL_DATE": null,
4343
"BOOKED_APPOINTMENT_DATE": null,
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"scenario_name": "RSV - Actionable - 2 actions - 80 or over - No ICB or Local Authority",
3+
"request_headers": {
4+
"nhs-login-nhs-number": "9900036528"
5+
},
6+
"config_filenames": [
7+
"AUTO_RSV_ELI-365.json"
8+
],
9+
"data": [
10+
{
11+
"NHS_NUMBER": "9900036528",
12+
"ATTRIBUTE_TYPE": "COHORTS",
13+
"COHORT_MEMBERSHIPS": [
14+
{
15+
"COHORT_LABEL": "rsv_80_since_02_Sept_2024",
16+
"DATE_JOINED": "20231020"
17+
}
18+
]
19+
},
20+
{
21+
"NHS_NUMBER": "9900036528",
22+
"ATTRIBUTE_TYPE": "PERSON",
23+
"DATE_OF_BIRTH": "<<DATE_AGE_80>>",
24+
"GENDER": "0",
25+
"POSTCODE": "SG8 6EG",
26+
"POSTCODE_SECTOR": "SG86",
27+
"POSTCODE_OUTCODE": "SG8",
28+
"MSOA": "E02003792",
29+
"LSOA": "E01018267",
30+
"GP_PRACTICE_CODE": "D81046",
31+
"PCN": "U75549",
32+
"ICB": "zz1",
33+
"LOCAL_AUTHORITY": "ZZ8000014",
34+
"COMMISSIONING_REGION": "Y61",
35+
"13Q_FLAG": "N",
36+
"CARE_HOME_FLAG": "N",
37+
"DE_FLAG": "N"
38+
},
39+
{
40+
"NHS_NUMBER": "9900036528",
41+
"ATTRIBUTE_TYPE": "RSV",
42+
"LAST_SUCCESSFUL_DATE": null,
43+
"BOOKED_APPOINTMENT_DATE": null,
44+
"BOOKED_APPOINTMENT_PROVIDER": null
45+
}
46+
]
47+
}

tests/e2e/data/responses/storyTestResponses/AUTO_RSV_ELI-365_026.json

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,30 @@
66
{
77
"actions": [
88
{
9-
"actionCode": "HealthcareProInfo",
9+
"actionCode": "BookLocal",
1010
"actionType": "InfoText",
11-
"description": "## If you think this is incorrect\n\nSpeak to your healthcare professional if you think you should be offered this vaccine.\n\nFor anything else, visit our help and support page. (ADD LINK)",
11+
"description": "##Getting the vaccine\n\nYou can get an RSV vaccination at your GP surgery.\nYour GP surgery may contact you about getting the RSV vaccine. This may be by letter, text, phone call, email or through the NHS App. You do not need to wait to be contacted before booking your vaccination.",
12+
"urlLabel": "",
13+
"urlLink": ""
14+
},
15+
{
16+
"actionCode": "HelpSupportInfo",
17+
"actionType": "InfoText",
18+
"description": "## CONTENT TBC\n\nBlah blah blah.",
1219
"urlLabel": "",
1320
"urlLink": ""
1421
}
1522
],
1623
"condition": "RSV",
1724
"eligibilityCohorts": [
18-
{
19-
"cohortCode": "rsv_age",
20-
"cohortStatus": "NotEligible",
21-
"cohortText": "are not aged 75 to 79 years old"
22-
},
2325
{
2426
"cohortCode": "rsv_age_catchup",
25-
"cohortStatus": "NotEligible",
26-
"cohortText": "did not turn 80 after 1 September 2024"
27+
"cohortStatus": "Actionable",
28+
"cohortText": "turned 80 after 1st September 2024"
2729
}
2830
],
29-
"status": "NotEligible",
30-
"statusText": "We do not believe you can have it",
31+
"status": "Actionable",
32+
"statusText": "You should have the RSV vaccine",
3133
"suitabilityRules": []
3234
}
3335
],

tests/e2e/data/responses/storyTestResponses/AUTO_RSV_ELI-365_027.json

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,30 @@
66
{
77
"actions": [
88
{
9-
"actionCode": "HealthcareProInfo",
9+
"actionCode": "BookLocal",
1010
"actionType": "InfoText",
11-
"description": "## If you think this is incorrect\n\nSpeak to your healthcare professional if you think you should be offered this vaccine.\n\nFor anything else, visit our help and support page. (ADD LINK)",
11+
"description": "##Getting the vaccine\n\nYou can get an RSV vaccination at your GP surgery.\nYour GP surgery may contact you about getting the RSV vaccine. This may be by letter, text, phone call, email or through the NHS App. You do not need to wait to be contacted before booking your vaccination.",
12+
"urlLabel": "",
13+
"urlLink": ""
14+
},
15+
{
16+
"actionCode": "HelpSupportInfo",
17+
"actionType": "InfoText",
18+
"description": "## CONTENT TBC\n\nBlah blah blah.",
1219
"urlLabel": "",
1320
"urlLink": ""
1421
}
1522
],
1623
"condition": "RSV",
1724
"eligibilityCohorts": [
18-
{
19-
"cohortCode": "rsv_age",
20-
"cohortStatus": "NotEligible",
21-
"cohortText": "are not aged 75 to 79 years old"
22-
},
2325
{
2426
"cohortCode": "rsv_age_catchup",
25-
"cohortStatus": "NotEligible",
26-
"cohortText": "did not turn 80 after 1 September 2024"
27+
"cohortStatus": "Actionable",
28+
"cohortText": "turned 80 after 1st September 2024"
2729
}
2830
],
29-
"status": "NotEligible",
30-
"statusText": "We do not believe you can have it",
31+
"status": "Actionable",
32+
"statusText": "You should have the RSV vaccine",
3133
"suitabilityRules": []
3234
}
3335
],

0 commit comments

Comments
 (0)