supplier

Author: JamesW1-NHS

backend/src/log_structure.py

@@ -41,6 +41,7 @@ def wrapper(*args, **kwargs):
         headers = event.get("headers", {})
         correlation_id = headers.get("X-Correlation-ID", "X-Correlation-ID not passed")
         request_id = headers.get("X-Request-ID", "X-Request-ID not passed")
+        supplier_system = headers.get("SupplierSystem", "SupplierSystem not passed")
         actual_path = event.get("path", "Unknown")
         resource_path = event.get("requestContext", {}).get("resourcePath", "Unknown")
         logger.info(f"Starting {func.__name__} with X-Correlation-ID: {correlation_id} and X-Request-ID: {request_id}")
@@ -49,6 +50,7 @@ def wrapper(*args, **kwargs):
             "date_time": str(datetime.now()),
             "X-Correlation-ID": correlation_id,
             "X-Request-ID": request_id,
+            "supplier": supplier_system,
             "actual_path": actual_path,
             "resource_path": resource_path,
         }

backend/tests/test_log_structure_wrapper.py

@@ -32,7 +32,8 @@ def test_successful_execution(self, mock_logger, mock_firehose_logger):
         event = {
             'headers': {
                 'X-Correlation-ID': 'test_correlation',
-                'X-Request-ID': 'test_request'
+                'X-Request-ID': 'test_request',
+                'SupplierSystem': 'test_supplier'
             },
             'path': '/test',
             'requestContext': {'resourcePath': '/test'},
@@ -54,6 +55,7 @@ def test_successful_execution(self, mock_logger, mock_firehose_logger):
         self.assertIn('time_taken', logged_info)
         self.assertEqual(logged_info['X-Correlation-ID'], 'test_correlation')
         self.assertEqual(logged_info['X-Request-ID'], 'test_request')
+        self.assertEqual(logged_info['supplier'], 'test_supplier')
         self.assertEqual(logged_info['actual_path'], '/test')
         self.assertEqual(logged_info['resource_path'], '/test')
         self.assertEqual(logged_info['local_id'], '12345^http://test')
@@ -70,7 +72,8 @@ def test_exception_handling(self, mock_logger, mock_firehose_logger):
             #Assert
             event = {'headers': {
                 'X-Correlation-ID': 'failed_test_correlation',
-                'X-Request-ID': 'failed_test_request'
+                'X-Request-ID': 'failed_test_request',
+                'SupplierSystem': 'failed_test_supplier'
             },
                 'path': '/failed_test', 'requestContext': {'resourcePath': '/failed_test'},
                 '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\"}]}]}]}"}
@@ -89,6 +92,7 @@ def test_exception_handling(self, mock_logger, mock_firehose_logger):
         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['supplier'], 'failed_test_supplier')
         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")))