Merge branch 'master' into APM-000-AMP-3654-removed-interactive-product-backlog

Author: mfjarvis

backend/src/create_imms_handler.py

@@ -1,4 +1,5 @@
 import argparse
+import logging
 import pprint
 import uuid
 
@@ -9,16 +10,19 @@
 from log_structure import function_info
 from constants import GENERIC_SERVER_ERROR_DIAGNOSTICS_MESSAGE
 
+logging.basicConfig(level="INFO")
+logger = logging.getLogger()
 
 @function_info
-def create_imms_handler(event, context):
+def create_imms_handler(event, _context):
     return create_immunization(event, make_controller())
 
 
 def create_immunization(event, controller: FhirController):
     try:
         return controller.create_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,

backend/src/delete_imms_handler.py

@@ -1,4 +1,5 @@
 import argparse
+import logging
 import pprint
 import uuid
 
@@ -8,16 +9,19 @@
 from log_structure import function_info
 from constants import GENERIC_SERVER_ERROR_DIAGNOSTICS_MESSAGE
 
+logging.basicConfig(level="INFO")
+logger = logging.getLogger()
 
 @function_info
-def delete_imms_handler(event, context):
+def delete_imms_handler(event, _context):
     return delete_immunization(event, make_controller())
 
 
 def delete_immunization(event, controller: FhirController):
     try:
         return controller.delete_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,

backend/src/get_imms_handler.py

@@ -1,4 +1,5 @@
 import argparse
+import logging
 import pprint
 import uuid
 
@@ -8,16 +9,19 @@
 from log_structure import function_info
 from constants import GENERIC_SERVER_ERROR_DIAGNOSTICS_MESSAGE
 
+logging.basicConfig(level="INFO")
+logger = logging.getLogger()
 
 @function_info
-def get_imms_handler(event, context):
+def get_imms_handler(event, _context):
     return get_immunization_by_id(event, make_controller())
 
 
 def get_immunization_by_id(event, controller: FhirController):
     try:
         return controller.get_immunization_by_id(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,

backend/src/get_status_handler.py

@@ -1,4 +1,4 @@
-def get_status_handler(event, context):
+def get_status_handler(_event, _context):
     response = {
         "statusCode": 200,  # HTTP status code
         "body": "OK"

backend/src/log_structure.py

@@ -1,10 +1,10 @@
-import logging
 import json
+import logging
 import time
 from datetime import datetime
 from functools import wraps
+
 from log_firehose import FirehoseLogger
-from models.utils.generic_utils import extract_file_key_elements
 
 logging.basicConfig()
 logger = logging.getLogger()

backend/src/not_found_handler.py

@@ -8,7 +8,7 @@ def not_found_handler(event, context):
     return not_found(event, context)
 
 
-def not_found(event, context):
+def not_found(event, _context):
 
     if event.get("httpMethod") not in ALLOWED_METHODS:
         response = {

backend/src/search_imms_handler.py

@@ -1,5 +1,6 @@
 import argparse
 import json
+import logging
 import pprint
 import traceback
 import uuid
@@ -14,9 +15,11 @@
 import base64
 import urllib.parse
 
+logging.basicConfig(level="INFO")
+logger = logging.getLogger()
 
 @function_info
-def search_imms_handler(event: events.APIGatewayProxyEventV1, context: context_):
+def search_imms_handler(event: events.APIGatewayProxyEventV1, _context: context_):
     return search_imms(event, make_controller())
 
 
@@ -67,6 +70,7 @@ def search_imms(event: events.APIGatewayProxyEventV1, controller: FhirController
             return FhirController.create_response(400, exp_error)
         return response
     except Exception:  # pylint: disable = broad-exception-caught
+        logger.exception("Unhandled exception")
         exp_error = create_operation_outcome(
             resource_id=str(uuid.uuid4()),
             severity=Severity.error,

backend/src/update_imms_handler.py

@@ -1,4 +1,5 @@
 import argparse
+import logging
 import pprint
 import uuid
 
@@ -9,16 +10,19 @@
 from log_structure import function_info
 from constants import GENERIC_SERVER_ERROR_DIAGNOSTICS_MESSAGE
 
+logging.basicConfig(level="INFO")
+logger = logging.getLogger()
 
 @function_info
-def update_imms_handler(event, context):
+def update_imms_handler(event, _context):
     return update_imms(event, make_controller())
 
 
 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,

backend/tests/test_log_structure_wrapper.py

@@ -3,27 +3,28 @@
 from unittest.mock import patch, MagicMock, ANY
 from src.log_structure import function_info
 
-"test"
+
+@patch('src.log_structure.firehose_logger')
+@patch('src.log_structure.logger')
 class TestFunctionInfoWrapper(unittest.TestCase):
 
     @staticmethod
-    def mock_success_function(event, context):
+    def mock_success_function(_event, _context):
         return "Success"
-    
+
     @staticmethod
-    def mock_function_raises(event, context):
+    def mock_function_raises(_event, _context):
         raise ValueError("Test error")
 
-    @patch('src.log_structure.logger')
-    def test_successful_execution(self, mock_logger):
+    def test_successful_execution(self, mock_logger, mock_firehose_logger):
         # Arrange
         wrapped_function = function_info(self.mock_success_function)
         event = {
             'headers': {
                 'X-Correlation-ID': 'test_correlation',
                 'X-Request-ID': 'test_request'
-            }, 
-            'path': '/test', 
+            },
+            'path': '/test',
             'requestContext': {'resourcePath': '/test'}
         }
 
@@ -33,6 +34,7 @@ def test_successful_execution(self, mock_logger):
         # Assert
         self.assertEqual(result, "Success")
         mock_logger.info.assert_called()
+        mock_firehose_logger.send_log.assert_called()
 
         args, kwargs = mock_logger.info.call_args
         logged_info = json.loads(args[0])
@@ -43,9 +45,8 @@ def test_successful_execution(self, mock_logger):
         self.assertEqual(logged_info['X-Request-ID'], 'test_request')
         self.assertEqual(logged_info['actual_path'], '/test')
         self.assertEqual(logged_info['resource_path'], '/test')
-    
-    @patch('src.log_structure.logger')
-    def test_exception_handling(self, mock_logger):        
+
+    def test_exception_handling(self, mock_logger, mock_firehose_logger):
 
         #Act
         decorated_function_raises = function_info(self.mock_function_raises)
@@ -55,20 +56,22 @@ def test_exception_handling(self, mock_logger):
             event = {'headers': {
                 'X-Correlation-ID': 'failed_test_correlation',
                 'X-Request-ID': 'failed_test_request'
-            }, 
+            },
                 'path': '/failed_test', 'requestContext': {'resourcePath': '/failed_test'}}
             context = {}
             decorated_function_raises(event, context)
 
         #Assert
         mock_logger.exception.assert_called()
+        mock_firehose_logger.send_log.assert_called()
+
         args, kwargs = mock_logger.exception.call_args
         logged_info = json.loads(args[0])
-        
+
         self.assertIn('function_name', logged_info)
         self.assertIn('time_taken', logged_info)
         self.assertEqual(logged_info['X-Correlation-ID'], 'failed_test_correlation')
         self.assertEqual(logged_info['X-Request-ID'], 'failed_test_request')
         self.assertEqual(logged_info['actual_path'], '/failed_test')
         self.assertEqual(logged_info['resource_path'], '/failed_test')
-        self.assertEqual(logged_info['error'], str(ValueError("Test error")))
+        self.assertEqual(logged_info['error'], str(ValueError("Test error")))

filenameprocessor/src/constants.py

@@ -17,6 +17,7 @@
 AUDIT_TABLE_FILENAME_GSI = "filename_index"
 
 PERMISSIONS_CONFIG_FILE_KEY = "permissions_config.json"
+VACCINE_TYPE_TO_DISEASES_HASH_KEY = "vacc_to_diseases"
 
 ERROR_TYPE_TO_STATUS_CODE_MAP = {
     VaccineTypePermissionsError: 403,
@@ -50,9 +51,6 @@ class AuditTableKeys:
 
 class Constants:
     """Constants for the filenameprocessor lambda"""
-
-    VALID_VACCINE_TYPES = ["FLU", "COVID19", "MMR", "RSV"]
-
     VALID_VERSIONS = ["V5"]
 
     # Mappings from ODS code to supplier name.