Example using FilterExpression

Author: dlzhry2nhs

lambdas/backend/src/repository/fhir_repository.py

@@ -301,18 +301,13 @@ def delete_immunization(self, imms_id: str, supplier_system: str) -> None:
 
     def search_immunizations(self, patient_identifier: str, vaccine_types: set) -> list[dict]:
         """Searches for immunisations by patient identifier (NHS Number) and the vaccination type"""
-        # vacc_type_condition = self._build_vacc_type_key_condition(vaccine_types)
-        is_not_deleted_condition = Attr("DeletedAt").not_exists() | Attr("DeletedAt").eq("reinstated")
-        patient_key_condition = Key("PatientPK").eq(_make_patient_pk(patient_identifier))
+        nhs_number_key_condition = Key("PatientPK").eq(_make_patient_pk(patient_identifier))
+        vacc_type_condition = self._build_vacc_type_key_condition(vaccine_types)
+        filter_condition = vacc_type_condition & (Attr("DeletedAt").not_exists() | Attr("DeletedAt").eq("reinstated"))
 
-        ieds_resources = []
+        ieds_resources = self.get_all_items(nhs_number_key_condition, filter_condition)
 
-        for vacc_type in vaccine_types:
-            # Should make these DB keys constants
-            key_condition = patient_key_condition & Key("PatientSK").begins_with(vacc_type)
-            ieds_resources.extend(self.get_all_items(key_condition, is_not_deleted_condition))
-
-        if len(ieds_resources) == 0:
+        if not ieds_resources:
             return []
 
         # Return a list of the FHIR immunization resource JSON items
@@ -353,15 +348,15 @@ def get_all_items(self, key_condition: ConditionBase, filter_condition: Conditio
 
         return all_items
 
-    # @staticmethod
-    # def _build_vacc_type_key_condition(vacc_types: set) -> ConditionBase:
-    #     vacc_type_condition = None
-    #
-    #     for vacc_type in vacc_types:
-    #         key_cond = Key("PatientSK").begins_with(vacc_type)
-    #         vacc_type_condition = key_cond if vacc_type_condition is None else vacc_type_condition | key_cond
-    #
-    #     return vacc_type_condition
+    @staticmethod
+    def _build_vacc_type_key_condition(vacc_types: set) -> ConditionBase:
+        vacc_type_condition = None
+
+        for vacc_type in vacc_types:
+            key_cond = Attr("PatientSK").begins_with(vacc_type)
+            vacc_type_condition = key_cond if vacc_type_condition is None else vacc_type_condition | key_cond
+
+        return vacc_type_condition
 
     @staticmethod
     def _vaccine_type(patient_sk: str) -> str:

lambdas/backend/tests/repository/test_fhir_repository.py

@@ -601,9 +601,9 @@ def test_find_immunizations_returns_empty_list_when_not_found(self):
         # Then
         self.table.query.assert_called_once_with(
             IndexName="PatientGSI",
-            KeyConditionExpression=Key("PatientPK").eq(_make_patient_pk(nhs_number))
-            & Key("PatientSK").begins_with("COVID"),
-            FilterExpression=Attr("DeletedAt").not_exists() | Attr("DeletedAt").eq("reinstated"),
+            KeyConditionExpression=Key("PatientPK").eq(_make_patient_pk(nhs_number)),
+            FilterExpression=Attr("PatientSK").begins_with("COVID")
+            & (Attr("DeletedAt").not_exists() | Attr("DeletedAt").eq("reinstated")),
         )
         self.assertEqual(result, [])
 
@@ -638,14 +638,12 @@ def test_find_immunizations_filters_any_vacc_types_not_in_the_request(self):
         imms1 = {"id": 1, "meta": {"versionId": 1}}
         imms2 = {"id": 2, "meta": {"versionId": 2}}
         imms3 = {"id": 3, "meta": {"versionId": 4}}
-        covid_items = [
+        items = [
             {
                 "Resource": json.dumps(imms1),
                 "PatientSK": "COVID#some_other_text",
                 "Version": "1",
-            }
-        ]
-        flu_items = [
+            },
             {
                 "Resource": json.dumps(imms2),
                 "PatientSK": "FLU#some_other_text",
@@ -658,9 +656,8 @@ def test_find_immunizations_filters_any_vacc_types_not_in_the_request(self):
             },
         ]
 
-        covid_dynamo_response = {"ResponseMetadata": {"HTTPStatusCode": 200}, "Items": covid_items}
-        flu_dynamo_response = {"ResponseMetadata": {"HTTPStatusCode": 200}, "Items": flu_items}
-        self.table.query = MagicMock(side_effect=[covid_dynamo_response, flu_dynamo_response])
+        dynamo_response = {"ResponseMetadata": {"HTTPStatusCode": 200}, "Items": items}
+        self.table.query = MagicMock(side_effect=[dynamo_response])
 
         # When
         results = self.repository.search_immunizations("an-id", {"COVID", "FLU"})