Resolved comments and updated the handler itself

Author: dlzhry2nhs

backend/src/models/errors.py

@@ -1,7 +1,7 @@
 import uuid
 from dataclasses import dataclass
 from enum import Enum
-from typing import Any, Union
+from typing import Any
 
 
 class Severity(str, Enum):
@@ -120,7 +120,7 @@ def to_operation_outcome(self) -> dict:
 class UnhandledResponseError(RuntimeError):
     """Use this error when the response from an external service (ex: dynamodb) can't be handled"""
 
-    response: Union[dict, str]
+    response: dict | str
     message: str
 
     def __str__(self):

backend/src/update_imms_handler.py

@@ -1,14 +1,10 @@
 import argparse
 import logging
 import pprint
-import uuid
 
-from constants import GENERIC_SERVER_ERROR_DIAGNOSTICS_MESSAGE
-from controller.aws_apig_response_utils import create_response
 from controller.fhir_controller import FhirController, make_controller
 from local_lambda import load_string
 from log_structure import function_info
-from models.errors import Code, Severity, create_operation_outcome
 
 logging.basicConfig(level="INFO")
 logger = logging.getLogger()
@@ -20,17 +16,7 @@ def update_imms_handler(event, _context):
 
 
 def update_imms(event, controller: FhirController):
-    try:
-        return controller.update_immunization(event)
-    except Exception:  # pylint: disable = broad-exception-caught
-        logger.exception("Unhandled exception")
-        exp_error = create_operation_outcome(
-            resource_id=str(uuid.uuid4()),
-            severity=Severity.error,
-            code=Code.server_error,
-            diagnostics=GENERIC_SERVER_ERROR_DIAGNOSTICS_MESSAGE,
-        )
-        return create_response(500, exp_error)
+    return controller.update_immunization(event)
 
 
 if __name__ == "__main__":

backend/tests/test_update_imms.py

@@ -1,23 +1,13 @@
 import unittest
-from unittest.mock import create_autospec, patch
+from unittest.mock import create_autospec
 
-from constants import GENERIC_SERVER_ERROR_DIAGNOSTICS_MESSAGE
 from controller.fhir_controller import FhirController
 from update_imms_handler import update_imms
 
 
 class TestUpdateImmunizations(unittest.TestCase):
     def setUp(self):
         self.controller = create_autospec(FhirController)
-        self.logger_exception_patcher = patch("logging.Logger.exception")
-        self.mock_logger_exception = self.logger_exception_patcher.start()
-        self.logger_info_patcher = patch("logging.Logger.info")
-        self.mock_logger_info = self.logger_info_patcher.start()
-        self.logger_exception_patcher = patch("logging.Logger.exception")
-        self.mock_logger_exception = self.logger_exception_patcher.start()
-
-    def tearDown(self):
-        patch.stopall()
 
     def test_update_immunization(self):
         """it should call service update method"""
@@ -32,46 +22,3 @@ def test_update_immunization(self):
         # Then
         self.controller.update_immunization.assert_called_once_with(lambda_event)
         self.assertDictEqual(exp_res, act_res)
-
-    @patch("update_imms_handler.create_response")
-    def test_update_imms_exception(self, mock_create_response):
-        """unhandled exceptions should result in 500"""
-        lambda_event = {"pathParameters": {"id": "an-id"}}
-        error_msg = "an unhandled error"
-        self.controller.update_immunization.side_effect = Exception(error_msg)
-
-        mock_response = "controller-response-error"
-        mock_create_response.return_value = mock_response
-
-        # When
-        act_res = update_imms(lambda_event, self.controller)
-
-        # Then
-        # check parameters used to call create_response
-        args, kwargs = mock_create_response.call_args
-        self.assertEqual(args[0], 500)
-        issue = args[1]["issue"][0]
-        severity = issue["severity"]
-        code = issue["code"]
-        diagnostics = issue["diagnostics"]
-        self.assertEqual(severity, "error")
-        self.assertEqual(code, "exception")
-        self.assertEqual(diagnostics, GENERIC_SERVER_ERROR_DIAGNOSTICS_MESSAGE)
-        self.assertEqual(act_res, mock_response)
-
-    def test_update_imms_with_duplicated_identifier_returns_error(self):
-        """Should return an IdentifierDuplication error"""
-        lambda_event = {"pathParameters": {"id": "an-id"}}
-        error_msg = {
-            "statusCode": 422,
-            "headers": {"Content-Type": "application/fhir+json"},
-            "body": '{"resourceType": "OperationOutcome", "id": "5c132d8a-a928-4e0e-8792-0c6456e625c2", "meta": {"profile": ["https://simplifier.net/guide/UKCoreDevelopment2/ProfileUKCore-OperationOutcome"]}, "issue": [{"severity": "error", "code": "exception", "details": {"coding": [{"system": "https://fhir.nhs.uk/Codesystem/http-error-codes","code": "DUPLICATE"}]}, "diagnostics": "The provided identifier: id-id is duplicated"}]}',
-        }
-        self.controller.update_immunization.return_value = error_msg
-
-        act_res = update_imms(lambda_event, self.controller)
-
-        # Then
-        self.controller.update_immunization.assert_called_once_with(lambda_event)
-        self.assertEqual(act_res["statusCode"], 422)
-        self.assertDictEqual(act_res, error_msg)