Merge branch 'master' into VED-901-extended-attribute

Author: Akol125

config/dev/permissions_config.json

@@ -56,8 +56,8 @@
       "MENACWY.CRUDS",
       "MMR.CRUDS",
       "MMRV.CRUDS",
-      "PNEUMOCOCCAL.CRUDS",
       "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
       "RSV.CRUDS",
       "SHINGLES.CRUDS"
     ],
@@ -73,8 +73,8 @@
       "MENACWY.CRUDS",
       "MMR.CRUDS",
       "MMRV.CRUDS",
-      "PNEUMOCOCCAL.CRUDS",
       "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
       "RSV.CRUDS",
       "SHINGLES.CRUDS"
     ],
@@ -84,12 +84,14 @@
     "supplier": "TPP",
     "permissions": [
       "3IN1.CRUDS",
+      "COVID.CRUDS",
+      "FLU.CRUDS",
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
       "MMRV.CRUDS",
-      "PNEUMOCOCCAL.CRUDS",
       "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
       "RSV.CRUDS",
       "SHINGLES.CRUDS"
     ],
@@ -99,10 +101,16 @@
     "supplier": "MEDICUS",
     "permissions": [
       "3IN1.CRUDS",
+      "COVID.CRUDS",
+      "FLU.CRUDS",
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
-      "RSV.CRUDS"
+      "MMRV.CRUDS",
+      "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
+      "RSV.CRUDS",
+      "SHINGLES.CRUDS"
     ],
     "ods_codes": ["YGMYW"]
   },
@@ -164,8 +172,8 @@
       "MENACWY.CRUDS",
       "MMR.CRUDS",
       "MMRV.CRUDS",
-      "PNEUMOCOCCAL.CRUDS",
       "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
       "RSV.CRUDS",
       "SHINGLES.CRUDS"
     ]
@@ -180,8 +188,8 @@
       "MENACWY.CRUDS",
       "MMR.CRUDS",
       "MMRV.CRUDS",
-      "PNEUMOCOCCAL.CRUDS",
       "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
       "RSV.CRUDS",
       "SHINGLES.CRUDS"
     ]

config/preprod/permissions_config.json

@@ -46,8 +46,8 @@
       "MENACWY.CRUDS",
       "MMR.CRUDS",
       "MMRV.CRUDS",
-      "PNEUMOCOCCAL.CRUDS",
       "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
       "RSV.CRUDS",
       "SHINGLES.CRUDS"
     ],
@@ -63,8 +63,8 @@
       "MENACWY.CRUDS",
       "MMR.CRUDS",
       "MMRV.CRUDS",
-      "PNEUMOCOCCAL.CRUDS",
       "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
       "RSV.CRUDS",
       "SHINGLES.CRUDS"
     ],
@@ -74,12 +74,14 @@
     "supplier": "TPP",
     "permissions": [
       "3IN1.CRUDS",
+      "COVID.CRUDS",
+      "FLU.CRUDS",
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
       "MMRV.CRUDS",
-      "PNEUMOCOCCAL.CRUDS",
       "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
       "RSV.CRUDS",
       "SHINGLES.CRUDS"
     ],
@@ -89,10 +91,16 @@
     "supplier": "MEDICUS",
     "permissions": [
       "3IN1.CRUDS",
+      "COVID.CRUDS",
+      "FLU.CRUDS",
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
-      "RSV.CRUDS"
+      "MMRV.CRUDS",
+      "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
+      "RSV.CRUDS",
+      "SHINGLES.CRUDS"
     ],
     "ods_codes": ["YGMYW"]
   },
@@ -110,8 +118,8 @@
       "MENACWY.CRUDS",
       "MMR.CRUDS",
       "MMRV.CRUDS",
-      "PNEUMOCOCCAL.CRUDS",
       "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
       "RSV.CRUDS",
       "SHINGLES.CRUDS"
     ]
@@ -126,8 +134,8 @@
       "MENACWY.CRUDS",
       "MMR.CRUDS",
       "MMRV.CRUDS",
-      "PNEUMOCOCCAL.CRUDS",
       "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
       "RSV.CRUDS",
       "SHINGLES.CRUDS"
     ]

infrastructure/instance/oas.yaml

@@ -128,28 +128,6 @@ paths:
         httpMethod: "POST"
         timeoutInMillis: 30000
         type: "AWS_PROXY"
-      parameters:
-        - name: patient.identifier
-          in: query
-          required: true
-          schema:
-            type: string
-        - name: -immunization.target
-          in: query
-          schema:
-            type: string
-        - name: -date.from
-          in: query
-          schema:
-            type: string
-        - name: -date.to
-          in: query
-          schema:
-            type: string
-        - name: _include
-          in: query
-          schema:
-            type: string
       responses:
         "201":
           description: An Immunisation search event

lambdas/backend/src/controller/aws_apig_event_utils.py

@@ -9,6 +9,10 @@
 from utils import dict_utils
 
 
+def get_multi_value_query_params(event: APIGatewayProxyEventV1) -> dict:
+    return dict_utils.get_field(dict(event), "multiValueQueryStringParameters", default={})
+
+
 def get_path_parameter(event: APIGatewayProxyEventV1, param_name: str) -> str:
     return dict_utils.get_field(event["pathParameters"], param_name, default="")
 

lambdas/backend/src/controller/constants.py

@@ -1,4 +1,31 @@
 """FHIR Controller constants"""
 
+from enum import StrEnum
+
 SUPPLIER_SYSTEM_HEADER_NAME = "SupplierSystem"
 E_TAG_HEADER_NAME = "E-Tag"
+
+SEARCH_IMMS_POST_PATH = "/Immunization/_search"
+
+
+class IdentifierSearchParameterName(StrEnum):
+    IDENTIFIER = "identifier"
+    ELEMENTS = "_elements"
+
+
+class ImmunizationSearchParameterName(StrEnum):
+    PATIENT_IDENTIFIER = "patient.identifier"
+    IMMUNIZATION_TARGET = "-immunization.target"
+    DATE_FROM = "-date.from"
+    DATE_TO = "-date.to"
+    INCLUDE = "_include"
+
+
+class IdentifierSearchElement(StrEnum):
+    """Valid elements which can be requested to include in the identifier search response"""
+
+    ID = "id"
+    META = "meta"
+
+
+IMMUNIZATION_TARGET_LEGACY_KEY_NAME = "immunization.target"

lambdas/backend/src/controller/fhir_api_exception_handler.py

@@ -21,8 +21,10 @@
     InvalidJsonError,
     InvalidResourceVersionError,
     InvalidStoredDataError,
+    ParameterExceptionError,
     ResourceVersionNotProvidedError,
     Severity,
+    TooManyResultsError,
     UnauthorizedError,
     UnauthorizedVaxError,
     UnhandledResponseError,
@@ -38,6 +40,8 @@
     InvalidResourceVersionError: 400,
     CustomValidationError: 400,
     ResourceVersionNotProvidedError: 400,
+    ParameterExceptionError: 400,
+    TooManyResultsError: 400,
     UnauthorizedError: 403,
     UnauthorizedVaxError: 403,
     ResourceNotFoundError: 404,