Completed final tests

Author: dlzhry2nhs

backend/src/repository/fhir_repository.py

@@ -15,7 +15,6 @@
 
 from models.constants import Constants
 from models.errors import (
-    IdentifierDuplicationError,
     ResourceNotFoundError,
     UnhandledResponseError,
 )
@@ -175,6 +174,7 @@ def update_immunization(
         existing_record_meta: ImmunizationRecordMetadata,
         supplier_system: str,
     ) -> int:
+        # VED-898 - consider refactoring to pass FHIR Immunization object rather than dict between Service -> Repository
         patient = get_contained_patient(immunization)
         attr = RecordAttributes(immunization, patient)
         reinstate_operation_required = existing_record_meta.is_deleted
@@ -206,15 +206,6 @@ def _build_update_expression(is_reinstate: bool) -> str:
                 "Operation = :operation, Version = :version, SupplierSystem = :supplier_system "
             )
 
-    def _check_duplicate_identifier(self, attr: RecordAttributes) -> dict:
-        queryresponse = _query_identifier(self.table, "IdentifierGSI", "IdentifierPK", attr.identifier)
-        if queryresponse is not None:
-            items = queryresponse.get("Items", [])
-            resource_dict = json.loads(items[0]["Resource"])
-            if resource_dict["id"] != attr.resource["id"]:
-                raise IdentifierDuplicationError(identifier=attr.identifier)
-        return queryresponse
-
     def _perform_dynamo_update(
         self,
         imms_id: str,

backend/tests/repository/test_fhir_repository.py

@@ -644,69 +644,59 @@ def test_decimal_on_create(self):
 
         self.table.put_item.assert_called_once()
 
-    # def run_update_immunization_test(self, imms_id, imms, resource, updated_dose_quantity=None):
-    #     dynamo_response = {
-    #         "ResponseMetadata": {"HTTPStatusCode": 200},
-    #         "Attributes": {"Resource": json.dumps(resource)},
-    #     }
-    #     self.table.update_item = MagicMock(return_value=dynamo_response)
-    #     self.table.query = MagicMock(return_value={})
-    #     now_epoch = 123456
-    #     with patch("time.time") as mock_time:
-    #         mock_time.return_value = now_epoch
-    #         act_resource, act_version = self.repository.update_immunization(imms_id, imms, self.patient, 1, "Test")
-    #     self.assertDictEqual(act_resource, resource)
-    #     self.assertEqual(act_version, 2)
-    #
-    #     update_exp = (
-    #         "SET UpdatedAt = :timestamp, PatientPK = :patient_pk, "
-    #         "PatientSK = :patient_sk, #imms_resource = :imms_resource_val, "
-    #         "Operation = :operation, Version = :version, SupplierSystem = :supplier_system "
-    #     )
-    #     patient_id = self.patient["identifier"]["value"]
-    #     patient_id = imms["contained"][1]["identifier"][0]["value"]
-    #     vaccine_type = get_vaccine_type(imms)
-    #     patient_sk = f"{vaccine_type}#{imms_id}"
-    #
-    #     self.table.update_item.assert_called_once_with(
-    #         Key={"PK": _make_immunization_pk(imms_id)},
-    #         UpdateExpression=update_exp,
-    #         ExpressionAttributeNames={"#imms_resource": "Resource"},
-    #         ExpressionAttributeValues={
-    #             ":timestamp": now_epoch,
-    #             ":patient_pk": _make_patient_pk(patient_id),
-    #             ":patient_sk": patient_sk,
-    #             ":imms_resource_val": json.dumps(imms, use_decimal=True),
-    #             ":operation": "UPDATE",
-    #             ":version": 2,
-    #             ":supplier_system": "Test",
-    #         },
-    #         ReturnValues=ANY,
-    #         ConditionExpression=ANY,
-    #     )
-    #
-    #     if updated_dose_quantity is not None:
-    #         imms_resource_val = json.loads(
-    #             self.table.update_item.call_args.kwargs["ExpressionAttributeValues"][":imms_resource_val"]
-    #         )
-    #         self.assertEqual(imms_resource_val["doseQuantity"], updated_dose_quantity)
-    #
-    # def test_decimal_on_update(self):
-    #     """it should update record when replacing doseQuantity and keep decimal precision"""
-    #     imms_id = "an-imms-id"
-    #     imms = create_covid_19_immunization_dict(imms_id)
-    #     imms["doseQuantity"] = 1.5556
-    #     updated_dose_quantity = 0.7566
-    #     imms["doseQuantity"] = updated_dose_quantity
-    #     imms["patient"] = self.patient
-    #     resource = imms
-    #     self.run_update_immunization_test(imms_id, imms, resource, updated_dose_quantity)
-    #
-    # def test_decimal_on_update_patient(self):
-    #     """it should update record by replacing both Immunization and Patient and dose quantity"""
-    #     imms_id = "an-imms-id"
-    #     imms = create_covid_19_immunization_dict(imms_id)
-    #     imms["doseQuantity"] = 1.590
-    #     imms["patient"] = self.patient
-    #     resource = {"doseQuantity": 1.590, "foo": "bar"}
-    #     self.run_update_immunization_test(imms_id, imms, resource)
+    def run_update_immunization_test(self, imms_id, imms, updated_dose_quantity=None):
+        dynamo_response = {"ResponseMetadata": {"HTTPStatusCode": 200}}
+        self.table.update_item = MagicMock(return_value=dynamo_response)
+        existing_record_metadata = ImmunizationRecordMetadata(resource_version=1, is_deleted=False, is_reinstated=False)
+
+        # When
+        updated_version = self.repository.update_immunization(imms_id, imms, existing_record_metadata, "Test")
+        self.assertEqual(updated_version, 2)
+
+        update_exp = (
+            "SET UpdatedAt = :timestamp, PatientPK = :patient_pk, "
+            "PatientSK = :patient_sk, #imms_resource = :imms_resource_val, "
+            "Operation = :operation, Version = :version, SupplierSystem = :supplier_system "
+        )
+        patient_id = imms["contained"][1]["identifier"][0]["value"]
+        vaccine_type = get_vaccine_type(imms)
+        patient_sk = f"{vaccine_type}#{imms_id}"
+
+        self.table.update_item.assert_called_once_with(
+            Key={"PK": _make_immunization_pk(imms_id)},
+            UpdateExpression=update_exp,
+            ExpressionAttributeNames={"#imms_resource": "Resource"},
+            ExpressionAttributeValues={
+                ":timestamp": ANY,
+                ":patient_pk": _make_patient_pk(patient_id),
+                ":patient_sk": patient_sk,
+                ":imms_resource_val": json.dumps(imms, use_decimal=True),
+                ":operation": "UPDATE",
+                ":version": 2,
+                ":supplier_system": "Test",
+            },
+            ConditionExpression=ANY,
+        )
+
+        if updated_dose_quantity is not None:
+            imms_resource_val = json.loads(
+                self.table.update_item.call_args.kwargs["ExpressionAttributeValues"][":imms_resource_val"]
+            )
+            self.assertEqual(imms_resource_val["doseQuantity"]["value"], updated_dose_quantity)
+
+    def test_decimal_on_update(self):
+        """it should update record when replacing doseQuantity and keep decimal precision"""
+        imms_id = "an-imms-id"
+        imms = create_covid_19_immunization_dict(imms_id, VALID_NHS_NUMBER)
+        updated_dose_quantity = 0.7566
+        imms["doseQuantity"]["value"] = updated_dose_quantity
+        self.run_update_immunization_test(imms_id, imms, updated_dose_quantity)
+
+    def test_decimal_on_update_patient(self):
+        """it should update record by replacing both Immunization and Patient and dose quantity"""
+        imms_id = "an-imms-id"
+        imms = create_covid_19_immunization_dict(imms_id, VALID_NHS_NUMBER)
+        updated_dose_quantity = 0.7566
+        imms["doseQuantity"]["value"] = updated_dose_quantity
+        imms["patient"] = self.patient
+        self.run_update_immunization_test(imms_id, imms, updated_dose_quantity)