Completed tests for get by identifier

Author: dlzhry2nhs

backend/src/fhir_service.py

@@ -12,6 +12,7 @@
     BundleEntrySearch,
 )
 from fhir.resources.R4B.immunization import Immunization
+from poetry.console.commands import self
 from pydantic import ValidationError
 
 import parameter_parser
@@ -51,9 +52,10 @@ class FhirService:
     def __init__(
         self,
         imms_repo: ImmunizationRepository,
+        authoriser: Authoriser = Authoriser(),
         validator: ImmunizationValidator = ImmunizationValidator(),
     ):
-        self.authoriser = Authoriser()
+        self.authoriser = authoriser
         self.immunization_repo = imms_repo
         self.validator = validator
 
@@ -71,7 +73,7 @@ def get_immunization_by_identifier(
             return form_json(imms_resp, None, None, base_url)
 
         if not self.authoriser.authorise(supplier_name, ApiOperationCode.SEARCH, {vaccination_type}):
-            raise UnauthorizedVaxError
+            raise UnauthorizedVaxError()
 
         return form_json(imms_resp, element, identifier, base_url)
 

backend/tests/test_fhir_controller.py

@@ -112,7 +112,7 @@ def test_get_imms_by_identifer(self, mock_get_permissions):
         # Then
         mock_get_permissions.assert_called_once_with("test")
         self.service.get_immunization_by_identifier.assert_called_once_with(
-            identifiers, ["COVID19.CUDS"], identifier, _element
+            identifiers, "test", identifier, _element
         )
 
         self.assertEqual(response["statusCode"], 200)
@@ -187,7 +187,7 @@ def test_not_found_for_identifier(self, mock_get_permissions):
         # Then
         mock_get_permissions.assert_called_once_with("test")
         self.service.get_immunization_by_identifier.assert_called_once_with(
-            imms, ["COVID19.S"], identifier, _element
+            imms, "test", identifier, _element
         )
 
         self.assertEqual(response["statusCode"], 200)
@@ -460,7 +460,7 @@ def test_validate_imms_id_invalid_vaccinetype(self, mock_get_permissions):
         # Then
         mock_get_permissions.assert_called_once_with("test")
         self.service.get_immunization_by_identifier.assert_called_once_with(
-            identifiers, ["COVID19.CRUDS"], identifier, _element
+            identifiers, "test", identifier, _element
         )
 
         self.assertEqual(response["statusCode"], 403)
@@ -510,7 +510,7 @@ def test_get_imms_by_identifier(self,mock_get_permissions):
         # Then
         mock_get_permissions.assert_called_once_with("test")
         self.service.get_immunization_by_identifier.assert_called_once_with(
-            identifiers, ["COVID19.CRUDS"], converted_identifier, converted_element
+            identifiers, "test", converted_identifier, converted_element
         )
         self.assertEqual(response["statusCode"], 200)
         body = json.loads(response["body"])
@@ -543,7 +543,7 @@ def test_not_found_for_identifier(self, mock_get_permissions):
         # Then
         mock_get_permissions.assert_called_once_with("test")
         self.service.get_immunization_by_identifier.assert_called_once_with(
-            identifiers, ["COVID19.CRUDS"], converted_identifier, converted_element
+            identifiers, "test", converted_identifier, converted_element
         )
         self.assertEqual(response["statusCode"], 200)
         body = json.loads(response["body"])
@@ -779,7 +779,7 @@ def test_validate_imms_id_invalid_vaccinetype(self, mock_get_permissions):
         # Then
         mock_get_permissions.assert_called_once_with("test")
         self.service.get_immunization_by_identifier.assert_called_once_with(
-            identifiers, ["COVID19.CRUDS"], converted_identifer, converted_element
+            identifiers, "test", converted_identifer, converted_element
         )
 
         self.assertEqual(response["statusCode"], 403)
@@ -893,10 +893,10 @@ def setUp(self):
         self.controller = FhirController(self.authorizer, self.service)
         self.logger_info_patcher = patch("logging.Logger.info")
         self.mock_logger_info = self.logger_info_patcher.start()
-        
+
     def tearDown(self):
         patch.stopall()
-        
+
     @patch("fhir_controller.get_supplier_permissions")
     def test_create_immunization(self,mock_get_permissions):
         """it should create Immunization and return resource's location"""
@@ -1050,7 +1050,7 @@ def setUp(self):
         self.controller = FhirController(self.authorizer, self.service)
         self.logger_info_patcher = patch("logging.Logger.info")
         self.mock_logger_info = self.logger_info_patcher.start()
-        
+
     def tearDown(self):
         patch.stopall()
 
@@ -1495,7 +1495,7 @@ def test_update_immunization_for_batch_with_invalid_json(self, mock_get_supplier
         self.assertEqual(response["statusCode"], 400)
         outcome = json.loads(response["body"])
         self.assertEqual(outcome["resourceType"], "OperationOutcome")
-    
+
     @patch("fhir_controller.get_supplier_permissions")
     def test_update_immunization_when_reinstated_true(self, mock_get_permissions):
         """it should update reinstated Immunization"""
@@ -1533,7 +1533,7 @@ def test_update_immunization_missing_id(self):
         }
         with self.assertRaises(KeyError):
             self.controller.update_immunization(aws_event)
-    
+
     @patch("fhir_controller.get_supplier_permissions")
     def test_update_reinstated_immunization_with_diagnostics_error(self, mock_get_permissions):
         """it should return 400 if patient validation error is present"""
@@ -1570,10 +1570,10 @@ def setUp(self):
         self.controller = FhirController(self.authorizer, self.service)
         self.logger_info_patcher = patch("logging.Logger.info")
         self.mock_logger_info = self.logger_info_patcher.start()
-        
+
     def tearDown(self):
         patch.stopall()
-        
+
     def test_validate_imms_id(self):
         """it should validate lambda's Immunization id"""
         invalid_id = {"pathParameters": {"id": "invalid %$ id"}, "headers": {"SupplierSystem": "Test"}}

backend/tests/test_fhir_repository.py

@@ -45,7 +45,7 @@ def setUp(self):
         self.repository = ImmunizationRepository(table=self.table)
         self.logger_info_patcher = patch("logging.Logger.info")
         self.mock_logger_info = self.logger_info_patcher.start()
-        
+
     def tearDown(self):
         patch.stopall()
 
@@ -66,44 +66,25 @@ def test_get_immunization_by_identifier(self):
             }
         )
 
-        imms = self.repository.get_immunization_by_identifier(imms_id, ["COVID19.CRUDS"])
+        immunisation, immunisation_type = self.repository.get_immunization_by_identifier(imms_id)
 
         # Validate the results
-        self.assertDictEqual(resource["Resource"], imms)
-        # self.table.get_item.assert_called_once_with(Key={"PK": (imms_id)})
         self.table.query.assert_called_once_with(
             IndexName="IdentifierGSI",
             KeyConditionExpression=Key("IdentifierPK").eq(imms_id),
         )
-
-    def test_unauthorized_get_immunization_by_identifier(self):
-        """it should not get an Immunization by id if vax perms do not exist"""
-        imms_id = "a-id#an-id"
-        resource = dict()
-        resource["Resource"] = {"foo": "bar"}
-        resource["Version"] = 1
-        self.table.query = MagicMock(
-            return_value={
-                "Items": [
-                    {
-                        "Resource": json.dumps({"foo": "bar", "id": "test"}),
-                        "Version": 1,
-                        "PatientSK": "COVID19#2516525251",
-                    }
-                ]
-            }
-        )
-        with self.assertRaises(UnauthorizedVaxError) as e:
-            # When
-            self.repository.get_immunization_by_identifier(imms_id, ["FLU.CRUD"])
+        # TODO - update this when resolving conflicts
+        self.assertDictEqual(immunisation, resource["Resource"])
+        self.assertEqual(immunisation_type, "covid19")
 
     def test_immunization_not_found(self):
         """it should return None if Immunization doesn't exist"""
         imms_id = "non-existent-id"
         self.table.query = MagicMock(return_value={})
 
-        imms = self.repository.get_immunization_by_identifier(imms_id, ["COVID19.CRUD"])
-        self.assertIsNone(imms)
+        immunisation, immunisation_type = self.repository.get_immunization_by_identifier(imms_id)
+        self.assertIsNone(immunisation)
+        self.assertIsNone(immunisation_type)
 
 
 class TestGetImmunization(unittest.TestCase):
@@ -112,7 +93,7 @@ def setUp(self):
         self.repository = ImmunizationRepository(table=self.table)
         self.logger_info_patcher = patch("logging.Logger.info")
         self.mock_logger_info = self.logger_info_patcher.start()
-        
+
     def tearDown(self):
         patch.stopall()
 
@@ -382,7 +363,7 @@ def test_create_patient_with_unauthorised_vaccine_type_permissions(self):
         with self.assertRaises(UnauthorizedVaxError) as e:
             # When
             self.repository.create_immunization(imms, self.patient, ["COVID19.CRUD"], "Test")
-            
+
 
 
 class TestUpdateImmunization(TestFhirRepositoryBase):
@@ -484,7 +465,7 @@ def test_update_throws_error_when_identifier_already_in_dynamodb(self):
             self.repository.update_immunization(imms_id, imms, self.patient, 1, ["COVID19.CRUD"], "Test")
 
         self.assertEqual(str(e.exception), f"The provided identifier: {identifier} is duplicated")
-    
+
     def test_reinstate_immunization_success(self):
         """it should reinstate an immunization successfully"""
         self.mock_redis_client.hget.return_value = "COVID19"
@@ -506,7 +487,7 @@ def test_reinstate_immunization_success(self):
 
         self.assertEqual(result, resource)
         self.assertEqual(version, 2)
-    
+
     def test_update_reinstated_immunization_success(self):
         """it should update a reinstated immunization successfully"""
         self.mock_redis_client.hget.return_value = "COVID19"
@@ -536,10 +517,10 @@ def setUp(self):
         self.repository = ImmunizationRepository(table=self.table)
         self.logger_info_patcher = patch("logging.Logger.info")
         self.mock_logger_info = self.logger_info_patcher.start()
-        
+
     def tearDown(self):
         patch.stopall()
-        
+
     def test_get_deleted_immunization(self):
         """it should return None if Immunization is logically deleted"""
         imms_id = "a-deleted-id"