s3_event/s3_reader

Author: JamesW1-NHS

lambdas/redis_sync/src/record_processor.py

@@ -1,6 +1,6 @@
-from common.clients import logger
-from s3_event import S3EventRecord
 from redis_cacher import RedisCacher
+from common.clients import logger
+from common.s3_event import S3EventRecord
 '''
     Record Processor
     This module processes individual S3 records from an event.

lambdas/redis_sync/src/redis_cacher.py

@@ -1,9 +1,9 @@
 "Upload the content from a config file in S3 to ElastiCache (Redis)"
 
 import json
-from common.clients import redis_client, logger
 from transform_map import transform_map
-from s3_reader import S3Reader
+from common.clients import redis_client, logger
+from common.s3_reader import S3Reader
 
 
 class RedisCacher:

lambdas/redis_sync/src/redis_sync.py

@@ -1,8 +1,8 @@
-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 record_processor import process_record
+from common.clients import redis_client, STREAM_NAME, logger
 from common.log_decorator import logging_decorator
+from common.s3_event import S3Event
 '''
     Event Processor
     The Business Logic for the Redis Sync Lambda Function.

lambdas/redis_sync/src/transform_map.py

@@ -1,6 +1,6 @@
 from constants import RedisCacheKey
-from common.clients import logger
 from transform_configs import transform_vaccine_map, transform_supplier_permissions
+from common.clients import logger
 '''
 Transform config file to format required in REDIS cache.
 '''

lambdas/redis_sync/tests/test_handler.py

@@ -27,7 +27,7 @@ def setUp(self):
         self.mock_logger_error = self.logger_error_patcher.start()
         self.logger_exception_patcher = patch("logging.Logger.exception")
         self.mock_logger_exception = self.logger_exception_patcher.start()
-        self.get_s3_records_patcher = patch("s3_event.S3Event.get_s3_records")
+        self.get_s3_records_patcher = patch("common.s3_event.S3Event.get_s3_records")
         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()

lambdas/redis_sync/tests/test_handler_decorator.py

@@ -3,8 +3,8 @@
 import json
 from unittest.mock import patch
 from redis_sync import handler
-from s3_event import S3EventRecord
 from constants import RedisCacheKey
+from common.s3_event import S3EventRecord
 
 
 class TestHandlerDecorator(unittest.TestCase):
@@ -33,7 +33,7 @@ def setUp(self):
         self.mock_logger_error = self.logger_error_patcher.start()
         self.logger_exception_patcher = patch("logging.Logger.exception")
         self.mock_logger_exception = self.logger_exception_patcher.start()
-        self.get_s3_records_patcher = patch("s3_event.S3Event.get_s3_records")
+        self.get_s3_records_patcher = patch("common.s3_event.S3Event.get_s3_records")
         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()

lambdas/redis_sync/tests/test_record_processor.py

@@ -2,8 +2,8 @@
 import unittest
 from unittest.mock import patch
 
-from s3_event import S3EventRecord
 from constants import RedisCacheKey
+from common.s3_event import S3EventRecord
 
 
 class TestRecordProcessor(unittest.TestCase):

lambdas/redis_sync/tests/test_s3_reader.py

@@ -1,6 +1,6 @@
 import unittest
 from unittest.mock import patch, MagicMock
-from s3_reader import S3Reader
+from common.s3_reader import S3Reader
 
 
 class TestS3Reader(unittest.TestCase):
@@ -10,7 +10,7 @@ def setUp(self):
         self.key = "test.json"
 
         # Patch s3_client
-        self.s3_client_patcher = patch("s3_reader.s3_client")
+        self.s3_client_patcher = patch("common.s3_reader.s3_client")
         self.mock_s3_client = self.s3_client_patcher.start()
 
         self.logger_info_patcher = patch("logging.Logger.info")

lambdas/redis_sync/src/s3_event.py lambdas/shared/src/common/s3_event.pylambdas/redis_sync/src/s3_event.py renamed to lambdas/shared/src/common/s3_event.py

@@ -1,3 +1,5 @@
+from common.aws_lambda_event import AwsLambdaEvent
+
 class S3EventRecord:
     """
     S3 Event Parsing Utilities
@@ -18,10 +20,10 @@ def get_object_key(self):
         return ret
 
 
-class S3Event:
+class S3Event(AwsLambdaEvent):
     def __init__(self, event):
-        self.event = event
+        super().__init__(event)
 
     def get_s3_records(self):
         # return a list of S3EventRecord objects - stripping out the s3 key
-        return [S3EventRecord(record['s3']) for record in self.event['Records']]
+        return [S3EventRecord(record['s3']) for record in self.records]