test for new perms and imms batch removel

Author: Akol125

backend/src/fhir_controller.py

@@ -209,9 +209,9 @@ def create_immunization(self, aws_event):
     def update_immunization(self, aws_event):
         try:
             if aws_event.get("headers"):
-                    if response := self.authorize_request(EndpointOperation.UPDATE, aws_event):
-                        return response
-                    imms_id = aws_event["pathParameters"]["id"]
+                if response := self.authorize_request(EndpointOperation.UPDATE, aws_event):
+                    return response
+                imms_id = aws_event["pathParameters"]["id"]
             else:
                 raise UnauthorizedError()
         except UnauthorizedError as unauthorized:

backend/src/fhir_service.py

@@ -58,7 +58,7 @@ def __init__(
         self.validator = validator
 
     def get_immunization_by_identifier(
-        self, identifier_pk: str, imms_vax_type_perms: str, identifier: str, element: str, is_imms_batch_app
+        self, identifier_pk: str, imms_vax_type_perms: str, identifier: str, element: str
     ) -> Optional[dict]:
         """
         Get an Immunization by its ID. Return None if not found. If the patient doesn't have an NHS number,

backend/tests/test_fhir_controller.py

@@ -5,6 +5,7 @@
 import unittest
 import uuid
 
+from unittest.mock import patch
 from fhir.resources.R4B.bundle import Bundle
 from fhir.resources.R4B.immunization import Immunization
 from unittest.mock import create_autospec, ANY, patch, Mock
@@ -70,12 +71,14 @@ def setUp(self):
         self.authorizer = create_autospec(Authorization)
         self.controller = FhirController(self.authorizer, self.service)
 
-    def test_get_imms_by_identifer(self):
+    @patch("fhir_controller.get_supplier_permissions")
+    def test_get_imms_by_identifer(self, mock_get_permissions):
         """it should return Immunization Id if it exists"""
         # Given
+        mock_get_permissions.return_value = ["COVID19:search"]
         self.service.get_immunization_by_identifier.return_value = {"id": "test", "Version": 1}
         lambda_event = {
-            "headers": {"VaccineTypePermissions": "COVID19:search", "SupplierSystem": "test"},
+            "headers": {"SupplierSystem": "test"},
             "queryStringParameters": {
                 "immunization.identifier": "https://supplierABC/identifiers/vacc|f10b59b3-fc73-4616-99c9-9e882ab31184",
                 "_element": "id,meta",
@@ -89,19 +92,22 @@ def test_get_imms_by_identifer(self):
         # When
         response = self.controller.get_immunization_by_identifier(lambda_event)
         # Then
+        mock_get_permissions.assert_called_once_with("test")
         self.service.get_immunization_by_identifier.assert_called_once_with(
-            identifiers, "COVID19:search", identifier, _element, False
+            identifiers, ["COVID19:search"], identifier, _element
         )
 
         self.assertEqual(response["statusCode"], 200)
         body = json.loads(response["body"])
         self.assertEqual(body["id"], "test")
 
-    def test_get_imms_by_identifer_no_vax_permission(self):
+    @patch("fhir_controller.get_supplier_permissions")
+    def test_get_imms_by_identifer_no_vax_permission(self, mock_get_permissions):
         """it should return Immunization Id if it exists"""
         # Given
+        mock_get_permissions.return_value = []
         lambda_event = {
-            "headers": {"VaccineTypePermissions": "", "SupplierSystem": "test"},
+            "headers": {"SupplierSystem": "test"},
             "queryStringParameters": {
                 "immunization.identifier": "https://supplierABC/identifiers/vacc|f10b59b3-fc73-4616-99c9-9e882ab31184",
                 "_element": "id,meta",
@@ -111,6 +117,7 @@ def test_get_imms_by_identifer_no_vax_permission(self):
         # When
         response = self.controller.get_immunization_by_identifier(lambda_event)
         # Then
+        mock_get_permissions.assert_called_once_with("test")
         self.assertEqual(response["statusCode"], 403)
 
     def test_get_imms_by_identifer_header_missing(self):
@@ -126,37 +133,12 @@ def test_get_imms_by_identifer_header_missing(self):
         response = self.controller.get_immunization_by_identifier(lambda_event)
 
         self.assertEqual(response["statusCode"], 403)
-
-    def test_get_imms_by_identifer_for_batch(self):
-        """it should return Immunization Id if it exists"""
-        # Given
-        self.service.get_immunization_by_identifier.return_value = {"id": "test", "Version": 1}
-        lambda_event = {
-            "headers": {"VaccineTypePermissions": "COVID19:search", "SupplierSystem": "Imms-Batch-App"},
-            "queryStringParameters": {
-                "immunization.identifier": "https://supplierABC/identifiers/vacc|f10b59b3-fc73-4616-99c9-9e882ab31184",
-                "_element": "id,meta",
-            },
-            "body": None,
-        }
-        identifier = lambda_event.get("queryStringParameters", {}).get("immunization.identifier")
-        _element = lambda_event.get("queryStringParameters", {}).get("_element")
-
-        identifiers = identifier.replace("|", "#")
-        # When
-        response = self.controller.get_immunization_by_identifier(lambda_event)
-        # Then
-        self.service.get_immunization_by_identifier.assert_called_once_with(
-            identifiers, None, identifier, _element, True
-        )
-
-        self.assertEqual(response["statusCode"], 200)
-        body = json.loads(response["body"])
-        self.assertEqual(body["id"], "test")
-
-    def test_not_found_for_identifier(self):
+    
+    @patch("fhir_controller.get_supplier_permissions")
+    def test_not_found_for_identifier(self, mock_get_permissions):
         """it should return not-found OperationOutcome if it doesn't exist"""
         # Given
+        mock_get_permissions.return_value = ["COVID19:search"]
         self.service.get_immunization_by_identifier.return_value = {
             "resourceType": "Bundle",
             "type": "searchset",
@@ -170,7 +152,7 @@ def test_not_found_for_identifier(self):
             "total": 0,
         }
         lambda_event = {
-            "headers": {"VaccineTypePermissions": "COVID19:search", "SupplierSystem": "test"},
+            "headers": {"SupplierSystem": "test"},
             "queryStringParameters": {
                 "immunization.identifier": "https://supplierABC/identifiers/vacc|f10b59b3-fc73-4616-99c9-9e882ab31184",
                 "_element": "id,meta",
@@ -183,11 +165,13 @@ def test_not_found_for_identifier(self):
 
         imms = identifier.replace("|", "#")
         # When
+        
         response = self.controller.get_immunization_by_identifier(lambda_event)
 
         # Then
+        mock_get_permissions.assert_called_once_with("test")
         self.service.get_immunization_by_identifier.assert_called_once_with(
-            imms, "COVID19:search", identifier, _element, False
+            imms, ["COVID19:search"], identifier, _element
         )
 
         self.assertEqual(response["statusCode"], 200)
@@ -419,13 +403,15 @@ def test_validate_immunization_identifier_having_whitespace(self):
         self.assertEqual(response["statusCode"], 400)
         outcome = json.loads(response["body"])
         self.assertEqual(outcome["resourceType"], "OperationOutcome")
-
-    def test_validate_imms_id_invalid_vaccinetype(self):
+    
+    @patch("fhir_controller.get_supplier_permissions")
+    def test_validate_imms_id_invalid_vaccinetype(self, mock_get_permissions):
         """it should validate lambda's Immunization id"""
         # Given
+        mock_get_permissions.return_value = ["COVID19:search"]
         self.service.get_immunization_by_identifier.side_effect = UnauthorizedVaxError()
         lambda_event = {
-            "headers": {"VaccineTypePermissions": "COVID19:search", "SupplierSystem": "test"},
+            "headers": {"SupplierSystem": "test"},
             "queryStringParameters": {
                 "immunization.identifier": "https://supplierABC/identifiers/vacc|f10b59b3-fc73-4616-99c9-9e882ab31184",
                 "_element": "id",
@@ -439,8 +425,9 @@ def test_validate_imms_id_invalid_vaccinetype(self):
         response = self.controller.get_immunization_by_identifier(lambda_event)
 
         # Then
+        mock_get_permissions.assert_called_once_with("test")
         self.service.get_immunization_by_identifier.assert_called_once_with(
-            identifiers, "COVID19:search", identifier, _element, False
+            identifiers, ["COVID19:search"], identifier, _element
         )
 
         self.assertEqual(response["statusCode"], 403)