Merge branch 'master' into VED-807-refactor-backend

Author: JamesW1-NHS

.github/workflows/deploy-backend.yml

@@ -51,6 +51,8 @@ permissions:
   id-token: write
   contents: read
 
+run-name: Deploy Backend - ${{ inputs.environment }} ${{ inputs.sub_environment }}
+
 jobs:
   terraform-plan:
     runs-on: ubuntu-latest

config/common/disease_mapping.json

@@ -91,7 +91,7 @@
     ]
   },
   {
-    "vacc_type": "PCV13",
+    "vacc_type": "PNEUMOCOCCAL",
     "diseases": [
       {
         "code": "16814004",

config/dev/permissions_config.json

@@ -59,7 +59,11 @@
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
-      "RSV.CRUDS"
+      "MMRV.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
+      "PERTUSSIS.CRUDS",
+      "RSV.CRUDS",
+      "SHINGLES.CRUDS"
     ],
     "ods_codes": ["YGM41", "YGJ"]
   },
@@ -70,7 +74,11 @@
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
-      "RSV.CRUDS"
+      "MMRV.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
+      "PERTUSSIS.CRUDS",
+      "RSV.CRUDS",
+      "SHINGLES.CRUDS"
     ],
     "ods_codes": ["YGA"]
   },
@@ -142,7 +150,11 @@
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
-      "RSV.CRUDS"
+      "MMRV.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
+      "PERTUSSIS.CRUDS",
+      "RSV.CRUDS",
+      "SHINGLES.CRUDS"
     ]
   },
   {
@@ -154,7 +166,11 @@
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
-      "RSV.CRUDS"
+      "MMRV.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
+      "PERTUSSIS.CRUDS",
+      "RSV.CRUDS",
+      "SHINGLES.CRUDS"
     ]
   }
 ]

config/preprod/permissions_config.json

@@ -49,7 +49,11 @@
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
-      "RSV.CRUDS"
+      "MMRV.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
+      "PERTUSSIS.CRUDS",
+      "RSV.CRUDS",
+      "SHINGLES.CRUDS"
     ],
     "ods_codes": ["YGM41", "YGJ"]
   },
@@ -60,7 +64,11 @@
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
-      "RSV.CRUDS"
+      "MMRV.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
+      "PERTUSSIS.CRUDS",
+      "RSV.CRUDS",
+      "SHINGLES.CRUDS"
     ],
     "ods_codes": ["YGA"]
   },
@@ -88,7 +96,11 @@
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
-      "RSV.CRUDS"
+      "MMRV.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
+      "PERTUSSIS.CRUDS",
+      "RSV.CRUDS",
+      "SHINGLES.CRUDS"
     ]
   },
   {
@@ -100,7 +112,11 @@
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
-      "RSV.CRUDS"
+      "MMRV.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
+      "PERTUSSIS.CRUDS",
+      "RSV.CRUDS",
+      "SHINGLES.CRUDS"
     ]
   },
   {

lambdas/backend/tests/controller/test_fhir_controller.py

@@ -1254,7 +1254,7 @@ class TestSearchImmunizations(TestFhirControllerBase):
         "MMR",
         "HPV",
         "MMRV",
-        "PCV13",
+        "PNEUMOCOCCAL",
         "SHINGLES",
         "COVID",
         "FLU",

lambdas/redis_sync/tests/test_data/disease_mapping.json

@@ -92,7 +92,7 @@
     ]
   },
   {
-    "vacc_type": "PCV13",
+    "vacc_type": "PNEUMOCOCCAL",
     "diseases": [
       {
         "code": "16814004",

lambdas/redis_sync/tests/test_data/expected_disease_to_vacc.json

@@ -7,7 +7,7 @@
   "55735004": "RSV",
   "27836007": "PERTUSSIS",
   "4740000": "SHINGLES",
-  "16814004": "PCV13",
+  "16814004": "PNEUMOCOCCAL",
   "397430003:398102009:76902006": "3in1",
   "23511006": "MENACWY"
 }

lambdas/redis_sync/tests/test_data/expected_vacc_to_diseases.json

@@ -67,7 +67,7 @@
       "term": "Herpes zoster"
     }
   ],
-  "PCV13": [
+  "PNEUMOCOCCAL": [
     {
       "code": "16814004",
       "term": "Pneumococcal infectious disease"