VED-350: making _elements optional, removing pre-validation to see response without the params

Author: Akol125

backend/src/fhir_controller.py

@@ -490,8 +490,8 @@ def _validate_identifier_system(self, _id: str, _element: str) -> Optional[dict]
                 severity=Severity.error,
                 code=Code.invalid,
                 diagnostics=(
-                    "Search parameter immunization.identifier must have one value and must be in the format of "
-                    '"immunization.identifier.system|immunization.identifier.value" '
+                    "Search parameter identifier must have one value and must be in the format of "
+                    '"identifier.system|identifier.value" '
                     'e.g. "http://xyz.org/vaccs|2345-gh3s-r53h7-12ny"'
                 ),
             )
@@ -501,18 +501,12 @@ def _validate_identifier_system(self, _id: str, _element: str) -> Optional[dict]
                 severity=Severity.error,
                 code=Code.invalid,
                 diagnostics=(
-                    "Search parameter immunization.identifier must be in the format of "
-                    '"immunization.identifier.system|immunization.identifier.value" '
+                    "Search parameter identifier must be in the format of "
+                    '"identifier.system|identifier.value" '
                     'e.g. "http://xyz.org/vaccs|2345-gh3s-r53h7-12ny"'
                 ),
             )
-        if not _element:
-            return create_operation_outcome(
-                resource_id=str(uuid.uuid4()),
-                severity=Severity.error,
-                code=Code.invalid,
-                diagnostics="_element must be one or more of the following: id,meta",
-            )
+        
         element_lower = _element.lower()
         result = element_lower.split(",")
         is_present = all(key in ["id", "meta"] for key in result)
@@ -521,7 +515,7 @@ def _validate_identifier_system(self, _id: str, _element: str) -> Optional[dict]
                 resource_id=str(uuid.uuid4()),
                 severity=Severity.error,
                 code=Code.invalid,
-                diagnostics="_element must be one or more of the following: id,meta",
+                diagnostics="_elements must be one or more of the following: id,meta",
             )
 
     def _create_bad_request(self, message):

backend/src/fhir_service.py

@@ -62,7 +62,7 @@ def get_immunization_by_identifier(
     ) -> Optional[dict]:
         """
         Get an Immunization by its ID. Return None if not found. If the patient doesn't have an NHS number,
-        return the Immunization without calling PDS or checking S flag.
+        return the Immunization.
         """
         imms_resp = self.immunization_repo.get_immunization_by_identifier(
             identifier_pk, imms_vax_type_perms
@@ -79,7 +79,7 @@ def get_immunization_by_identifier(
     def get_immunization_by_id(self, imms_id: str, imms_vax_type_perms: list[str]) -> Optional[dict]:
         """
         Get an Immunization by its ID. Return None if it is not found. If the patient doesn't have an NHS number,
-        return the Immunization without calling PDS or checking S flag.
+        return the Immunization.
         """
         if not (imms_resp := self.immunization_repo.get_immunization_by_id(imms_id, imms_vax_type_perms)):
             return None
@@ -95,7 +95,7 @@ def get_immunization_by_id(self, imms_id: str, imms_vax_type_perms: list[str]) -
     def get_immunization_by_id_all(self, imms_id: str, imms: dict) -> Optional[dict]:
         """
         Get an Immunization by its ID. Return None if not found. If the patient doesn't have an NHS number,
-        return the Immunization without calling PDS or checking S flag.
+        return the Immunization.
         """
         imms["id"] = imms_id
         try: