log_decorator

Author: JamesW1-NHS

lambdas/redis_sync/src/log_decorator.py

@@ -1,15 +1,15 @@
-from common.clients import redis_client, logger
+from common.clients import redis_client, STREAM_NAME, logger
 from s3_event import S3Event
 from record_processor import process_record
 from event_read import read_event
-from log_decorator import logging_decorator
+from common.log_decorator import logging_decorator
 '''
     Event Processor
     The Business Logic for the Redis Sync Lambda Function.
     This module processes S3 events and iterates through each record to process them individually.'''
 
 
-@logging_decorator(prefix="redis_sync")
+@logging_decorator(prefix="redis_sync", stream_name=STREAM_NAME)
 def handler(event, _):
 
     try:

lambdas/redis_sync/src/redis_sync.py

@@ -40,7 +40,7 @@ def tearDown(self):
         self.logger_exception_patcher.stop()
 
     def test_handler_success(self):
-        with patch("log_decorator.logging_decorator", lambda prefix=None: (lambda f: f)):
+        with patch("common.log_decorator.logging_decorator", lambda prefix=None, stream_name=None: (lambda f: f)):
             importlib.reload(redis_sync)
             mock_event = {'Records': [self.s3_vaccine]}
             self.mock_get_s3_records.return_value = [self.s3_vaccine]
@@ -53,7 +53,7 @@ def test_handler_success(self):
                 self.assertEqual(result["file_keys"], ['test-key'])
 
     def test_handler_failure(self):
-        with patch("log_decorator.logging_decorator", lambda prefix=None: (lambda f: f)):
+        with patch("common.log_decorator.logging_decorator", lambda prefix=None, stream_name=None: (lambda f: f)):
             importlib.reload(redis_sync)
 
             mock_event = {'Records': [self.s3_vaccine]}
@@ -66,15 +66,15 @@ def test_handler_failure(self):
                 self.assertEqual(result, {'status': 'error', 'message': 'Error processing S3 event'})
 
     def test_handler_no_records(self):
-        with patch("log_decorator.logging_decorator", lambda prefix=None: (lambda f: f)):
+        with patch("common.log_decorator.logging_decorator", lambda prefix=None, stream_name=None: (lambda f: f)):
             importlib.reload(redis_sync)
             mock_event = {'Records': []}
             self.mock_get_s3_records.return_value = []
             result = redis_sync.handler(mock_event, None)
             self.assertEqual(result, {'status': 'success', 'message': 'No records found in event'})
 
     def test_handler_exception(self):
-        with patch("log_decorator.logging_decorator", lambda prefix=None: (lambda f: f)):
+        with patch("common.log_decorator.logging_decorator", lambda prefix=None, stream_name=None: (lambda f: f)):
             importlib.reload(redis_sync)
             mock_event = {'Records': [self.s3_vaccine]}
             self.mock_get_s3_records.return_value = [self.s3_vaccine]
@@ -84,14 +84,14 @@ def test_handler_exception(self):
                 self.assertEqual(result, {'status': 'error', 'message': 'Error processing S3 event'})
 
     def test_handler_with_empty_event(self):
-        with patch("log_decorator.logging_decorator", lambda prefix=None: (lambda f: f)):
+        with patch("common.log_decorator.logging_decorator", lambda prefix=None, stream_name=None: (lambda f: f)):
             importlib.reload(redis_sync)
             self.mock_get_s3_records.return_value = []
             result = redis_sync.handler({}, None)
             self.assertEqual(result, {'status': 'success', 'message': 'No records found in event'})
 
     def test_handler_multi_record(self):
-        with patch("log_decorator.logging_decorator", lambda prefix=None: (lambda f: f)):
+        with patch("common.log_decorator.logging_decorator", lambda prefix=None, stream_name=None: (lambda f: f)):
             importlib.reload(redis_sync)
             mock_event = {'Records': [self.s3_vaccine, self.s3_supplier]}
             # If you need S3EventRecord, uncomment the import and use it here
@@ -112,7 +112,7 @@ def test_handler_multi_record(self):
                 self.assertEqual(result['file_keys'][1], 'test-key2')
 
     def test_handler_read_event(self):
-        with patch("log_decorator.logging_decorator", lambda prefix=None: (lambda f: f)):
+        with patch("common.log_decorator.logging_decorator", lambda prefix=None, stream_name=None: (lambda f: f)):
             importlib.reload(redis_sync)
             mock_event = {'read': 'myhash'}
             mock_read_event_response = {'field1': 'value1'}

lambdas/redis_sync/tests/test_handler.py

@@ -37,7 +37,7 @@ def setUp(self):
         self.mock_get_s3_records = self.get_s3_records_patcher.start()
         self.record_processor_patcher = patch("redis_sync.process_record")
         self.mock_record_processor = self.record_processor_patcher.start()
-        self.firehose_patcher = patch("log_decorator.firehose_client")
+        self.firehose_patcher = patch("common.log_decorator.firehose_client")
         self.mock_firehose_client = self.firehose_patcher.start()
         self.mock_firehose_client.put_record.return_value = True