vaccine_type

Author: JamesW1-NHS

backend/src/log_structure.py

@@ -6,6 +6,8 @@
 
 from log_firehose import FirehoseLogger
 
+from models.utils.validation_utils import get_vaccine_type
+
 logging.basicConfig()
 logger = logging.getLogger()
 logger.setLevel("INFO")
@@ -38,6 +40,8 @@ def wrapper(*args, **kwargs):
 
         if event.get("body"):
             imms = json.loads(event["body"])
+            vaccine_type = get_vaccine_type(imms)
+            log_data["vaccine_type"] = vaccine_type
             local_id = imms["identifier"][0]["value"] + "^" + imms["identifier"][0]["system"]
             log_data["local_id"] = local_id
 

backend/tests/test_log_structure_wrapper.py

@@ -8,6 +8,15 @@
 @patch('log_structure.logger')
 class TestFunctionInfoWrapper(unittest.TestCase):
 
+    def setUp(self):
+        super().setUp()
+        self.redis_patcher = patch("models.utils.validation_utils.redis_client")
+        self.mock_redis_client = self.redis_patcher.start()
+
+    def tearDown(self):
+        self.redis_patcher.stop()
+        super().tearDown()
+
     @staticmethod
     def mock_success_function(_event, _context):
         return "Success"
@@ -18,6 +27,7 @@ def mock_function_raises(_event, _context):
 
     def test_successful_execution(self, mock_logger, mock_firehose_logger):
         # Arrange
+        self.mock_redis_client.hget.return_value = "FLU"
         wrapped_function = function_info(self.mock_success_function)
         event = {
             'headers': {
@@ -26,7 +36,7 @@ def test_successful_execution(self, mock_logger, mock_firehose_logger):
             },
             'path': '/test',
             'requestContext': {'resourcePath': '/test'},
-            'body': "{\"identifier\": [{\"system\": \"http://test\", \"value\": \"12345\"}]}"
+            'body': "{\"identifier\": [{\"system\": \"http://test\", \"value\": \"12345\"}], \"protocolApplied\": [{\"targetDisease\": [{\"coding\": [{\"system\": \"http://snomed.info/sct\", \"code\": \"840539006\", \"display\": \"Disease caused by severe acute respiratory syndrome coronavirus 2\"}]}]}]}"
         }
 
         # Act
@@ -47,8 +57,11 @@ def test_successful_execution(self, mock_logger, mock_firehose_logger):
         self.assertEqual(logged_info['actual_path'], '/test')
         self.assertEqual(logged_info['resource_path'], '/test')
         self.assertEqual(logged_info['local_id'], '12345^http://test')
+        self.assertEqual(logged_info['vaccine_type'], 'FLU')
 
     def test_exception_handling(self, mock_logger, mock_firehose_logger):
+        # Arrange
+        self.mock_redis_client.hget.return_value = "FLU"
 
         #Act
         decorated_function_raises = function_info(self.mock_function_raises)
@@ -60,7 +73,7 @@ def test_exception_handling(self, mock_logger, mock_firehose_logger):
                 'X-Request-ID': 'failed_test_request'
             },
                 'path': '/failed_test', 'requestContext': {'resourcePath': '/failed_test'},
-                'body': "{\"identifier\": [{\"system\": \"http://test\", \"value\": \"12345\"}]}"}
+                'body': "{\"identifier\": [{\"system\": \"http://test\", \"value\": \"12345\"}], \"protocolApplied\": [{\"targetDisease\": [{\"coding\": [{\"system\": \"http://snomed.info/sct\", \"code\": \"840539006\", \"display\": \"Disease caused by severe acute respiratory syndrome coronavirus 2\"}]}]}]}"}
 
             context = {}
             decorated_function_raises(event, context)
@@ -80,3 +93,4 @@ def test_exception_handling(self, mock_logger, mock_firehose_logger):
         self.assertEqual(logged_info['resource_path'], '/failed_test')
         self.assertEqual(logged_info['error'], str(ValueError("Test error")))
         self.assertEqual(logged_info['local_id'], '12345^http://test')
+        self.assertEqual(logged_info['vaccine_type'], 'FLU')