Skip to content

Commit ca242f0

Browse files
nhsdevwsnhsdevws
committed
Merge branch 'master' into VED-81-Number-Update
2 parents 0108c56 + b2dabcc commit ca242f0

File tree

96 files changed

+1335
-837
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+1335
-837
lines changed

‎azure/templates/post-deploy.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ steps:
4141
set -e
4242
if ! [[ $APIGEE_ENVIRONMENT =~ .*-*sandbox ]]; then
4343
export AWS_PROFILE=apim-dev
44-
aws_account_no="$(aws sts get-caller-identity --query Account --output text)"
45-
4644
service_name=$(FULLY_QUALIFIED_SERVICE_NAME)
4745
4846
pr_no=$(echo $service_name | { grep -oE '[0-9]+$' || true; })
@@ -58,10 +56,10 @@ steps:
5856
echo Apigee environment: $APIGEE_ENVIRONMENT
5957
echo pr_no: $pr_no
6058
61-
cd terraform
59+
cd terraform
6260
6361
make init
64-
make apply aws_account_no=${aws_account_no} environment=$workspace
62+
make apply environment=${{ parameters.aws_account_type }} sub_environment=$workspace
6563
6664
AWS_DOMAIN_NAME=$(make -s output name=service_domain_name)
6765
IMMS_DELTA_TABLE_NAME=$(make -s output name=imms_delta_table_name)

‎config/common/disease_mapping.json‎

Lines changed: 21 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
[
2+
{
3+
"vacc_type": "3IN1",
4+
"diseases": [
5+
{
6+
"code": "398102009",
7+
"term": "Acute poliomyelitis"
8+
},
9+
{
10+
"code": "397430003",
11+
"term": "Diphtheria caused by Corynebacterium diphtheriae"
12+
},
13+
{
14+
"code": "76902006",
15+
"term": "Tetanus (disorder)"
16+
}
17+
]
18+
},
219
{
320
"vacc_type": "COVID19",
421
"diseases": [
@@ -27,24 +44,16 @@
2744
]
2845
},
2946
{
30-
"vacc_type": "MMR",
47+
"vacc_type": "MENACWY",
3148
"diseases": [
3249
{
33-
"code": "14189004",
34-
"term": "Measles (disorder)"
35-
},
36-
{
37-
"code": "36989005",
38-
"term": "Mumps (disorder)"
39-
},
40-
{
41-
"code": "36653000",
42-
"term": "Rubella (disorder)"
50+
"code": "23511006",
51+
"term": "Meningococcal infectious disease"
4352
}
4453
]
4554
},
4655
{
47-
"vacc_type": "MMRV",
56+
"vacc_type": "MMR",
4857
"diseases": [
4958
{
5059
"code": "14189004",
@@ -57,10 +66,6 @@
5766
{
5867
"code": "36653000",
5968
"term": "Rubella (disorder)"
60-
},
61-
{
62-
"code": "38907003",
63-
"term": "Varicella (disorder)"
6469
}
6570
]
6671
},
@@ -72,58 +77,5 @@
7277
"term": "Respiratory syncytial virus infection (disorder)"
7378
}
7479
]
75-
},
76-
{
77-
"vacc_type": "PERTUSSIS",
78-
"diseases": [
79-
{
80-
"code": "27836007",
81-
"term": "Pertussis (disorder)"
82-
}
83-
]
84-
},
85-
{
86-
"vacc_type": "SHINGLES",
87-
"diseases": [
88-
{
89-
"code": "4740000",
90-
"term": "Herpes zoster"
91-
}
92-
]
93-
},
94-
{
95-
"vacc_type": "PCV13",
96-
"diseases": [
97-
{
98-
"code": "16814004",
99-
"term": "Pneumococcal infectious disease"
100-
}
101-
]
102-
},
103-
{
104-
"vacc_type": "3in1",
105-
"diseases": [
106-
{
107-
"code": "398102009",
108-
"term": "Acute poliomyelitis"
109-
},
110-
{
111-
"code": "397430003",
112-
"term": "Diphtheria caused by Corynebacterium diphtheriae"
113-
},
114-
{
115-
"code": "76902006",
116-
"term": "Tetanus (disorder)"
117-
}
118-
]
119-
},
120-
{
121-
"vacc_type": "MENACWY",
122-
"diseases": [
123-
{
124-
"code": "23511006",
125-
"term": "Meningococcal infectious disease"
126-
}
127-
]
12880
}
12981
]

‎config/dev/permissions_config.json‎

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"FLU.CRUDS",
77
"MMR.CRUDS",
88
"RSV.CRUDS"
9-
]
9+
],
10+
"ods_codes": ["DPSFULL"]
1011
},
1112
{
1213
"supplier": "DPSREDUCED",
@@ -15,7 +16,8 @@
1516
"FLU.CRUD",
1617
"MMR.CRUD",
1718
"RSV.CRUD"
18-
]
19+
],
20+
"ods_codes": ["DPSREDUCED"]
1921
},
2022
{
2123
"supplier": "MAVIS",
@@ -25,61 +27,70 @@
2527
"MENACWY.CRUDS",
2628
"MMR.CRUDS",
2729
"FLU.CRUDS"
28-
]
29-
},
30-
{
31-
"supplier": "EMIS",
32-
"permissions": [
33-
"RSV.U"
34-
]
35-
},
36-
{
37-
"supplier": "PINNACLE",
38-
"permissions": []
30+
],
31+
"ods_codes": ["V0V8L"]
3932
},
4033
{
4134
"supplier": "SONAR",
4235
"permissions": [
4336
"FLU.CD"
44-
]
45-
},
46-
{
47-
"supplier": "TPP",
48-
"permissions": []
49-
},
50-
{
51-
"supplier": "AGEM-NIVS",
52-
"permissions": []
53-
},
54-
{
55-
"supplier": "NIMS",
56-
"permissions": []
37+
],
38+
"ods_codes": ["8HK48"]
5739
},
5840
{
5941
"supplier": "EVA",
6042
"permissions": [
6143
"COVID19.CUD"
62-
]
44+
],
45+
"ods_codes": ["8HA94"]
6346
},
6447
{
6548
"supplier": "RAVS",
6649
"permissions": [
67-
"RSV.CRUDS"
68-
]
50+
"RSV.CRUDS",
51+
"MMR.CRUDS"
52+
],
53+
"ods_codes": ["X8E5B"]
6954
},
7055
{
7156
"supplier": "AGEM-RAVS-Integration",
7257
"permissions": [
73-
"RSV.CRUDS"
58+
"RSV.CRUDS",
59+
"MMR.CRUDS"
7460
]
7561
},
7662
{
77-
"supplier": "MEDICAL_DIRECTOR",
78-
"permissions": []
63+
"supplier": "EMIS",
64+
"permissions": [
65+
"RSV.CRUDS",
66+
"MMR.CRUDS",
67+
"HPV.CRUDS",
68+
"3IN1.CRUDS",
69+
"MENACWY.CRUDS"
70+
],
71+
"ods_codes": ["YGM41", "YGJ"]
7972
},
8073
{
81-
"supplier": "COVID19_VACCINE_RESOLUTION_SERVICEDESK",
82-
"permissions": []
74+
"supplier": "TPP",
75+
"permissions": [
76+
"RSV.CRUDS",
77+
"MMR.CRUDS",
78+
"HPV.CRUDS",
79+
"3IN1.CRUDS",
80+
"MENACWY.CRUDS"
81+
],
82+
"ods_codes": ["YGA"]
83+
},
84+
{
85+
"supplier": "MEDICUS",
86+
"permissions": [
87+
"RSV.CRUDS",
88+
"MMR.CRUDS",
89+
"HPV.CRUDS",
90+
"3IN1.CRUDS",
91+
"MENACWY.CRUDS"
92+
],
93+
"ods_codes": ["YGMYW"]
8394
},
8495
{
8596
"supplier": "Test_App",

‎config/preprod/permissions_config.json‎

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"FLU.CRUDS",
77
"MMR.CRUDS",
88
"RSV.CRUDS"
9-
]
9+
],
10+
"ods_codes": ["DPSFULL"]
1011
},
1112
{
1213
"supplier": "DPSREDUCED",
@@ -15,7 +16,8 @@
1516
"FLU.CRUDS",
1617
"MMR.CRUDS",
1718
"RSV.CRUDS"
18-
]
19+
],
20+
"ods_codes": ["DPSREDUCED"]
1921
},
2022
{
2123
"supplier": "MAVIS",
@@ -25,14 +27,57 @@
2527
"MENACWY.CRUDS",
2628
"MMR.CRUDS",
2729
"FLU.CRUDS"
28-
]
30+
],
31+
"ods_codes": ["V0V8L"]
2932
},
3033
{
3134
"supplier": "RAVS",
3235
"permissions": [
33-
"RSV.CRUDS"
36+
"RSV.CRUDS",
37+
"MMR.CRUDS"
38+
],
39+
"ods_codes": ["X8E5B"]
40+
},
41+
{
42+
"supplier": "AGEM-RAVS-Integration",
43+
"permissions": [
44+
"RSV.CRUDS",
45+
"MMR.CRUDS"
3446
]
3547
},
48+
{
49+
"supplier": "EMIS",
50+
"permissions": [
51+
"RSV.CRUDS",
52+
"MMR.CRUDS",
53+
"HPV.CRUDS",
54+
"3IN1.CRUDS",
55+
"MENACWY.CRUDS"
56+
],
57+
"ods_codes": ["YGM41", "YGJ"]
58+
},
59+
{
60+
"supplier": "TPP",
61+
"permissions": [
62+
"RSV.CRUDS",
63+
"MMR.CRUDS",
64+
"HPV.CRUDS",
65+
"3IN1.CRUDS",
66+
"MENACWY.CRUDS"
67+
],
68+
"ods_codes": ["YGA"]
69+
},
70+
{
71+
"supplier": "MEDICUS",
72+
"permissions": [
73+
"RSV.CRUDS",
74+
"MMR.CRUDS",
75+
"HPV.CRUDS",
76+
"3IN1.CRUDS",
77+
"MENACWY.CRUDS"
78+
],
79+
"ods_codes": ["YGMYW"]
80+
},
3681
{
3782
"supplier": "Test_App",
3883
"permissions": [

‎config/prod/permissions_config.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,21 @@
33
"supplier": "DPSFULL",
44
"permissions": [
55
"RSV.CRUDS"
6-
]
6+
],
7+
"ods_codes": ["DPSFULL"]
78
},
89
{
910
"supplier": "DPSREDUCED",
1011
"permissions": [
1112
"RSV.CRUDS"
12-
]
13+
],
14+
"ods_codes": ["DPSREDUCED"]
1315
},
1416
{
1517
"supplier": "RAVS",
1618
"permissions": [
1719
"RSV.RS"
18-
]
20+
],
21+
"ods_codes": ["X8E5B"]
1922
}
2023
]

0 commit comments

Comments
 (0)