coverage

Author: nhsdevws

lambdas/shared/src/common/aws_lambda_event.py

@@ -1,7 +1,6 @@
 from typing import Dict, Any
 from enum import Enum
 from common.aws_lambda_sqs_event_record import AwsLambdaSqsEventRecord
-from common.clients import logger
 
 
 class AwsEventType(Enum):
@@ -13,25 +12,17 @@ class AwsEventType(Enum):
 
 class AwsLambdaEvent:
 
-    def __init__(self):
+    def __init__(self, event: Dict[str, Any]):
         self.event_source = None
-        self.records = []
         self.event_type = AwsEventType.UNKNOWN
-
-    def load_event(self, event: Dict[str, Any]) -> None:
         self.event_source = event.get('eventSource')
         if self.event_source in [e.value for e in AwsEventType]:
             self.event_type = AwsEventType(self.event_source)
-        else:
-            self.event_type = AwsEventType.UNKNOWN
 
+        self.records = []
         if "Records" in event:
             records_dict = event.get('Records', [])
             if self.event_type == AwsEventType.SQS:
                 self.records = [AwsLambdaSqsEventRecord(record) for record in records_dict]
             else:
-                # not handled retain as Dict
                 self.records = records_dict
-        else:
-            self.records = []
-            logger.info("No records found in event")

lambdas/shared/tests/test_common/test_aws_lambda_event.py

@@ -1,5 +1,4 @@
 import unittest
-from unittest.mock import patch
 from common.aws_lambda_event import AwsLambdaEvent, AwsEventType
 from common.aws_lambda_sqs_event_record import AwsLambdaSqsEventRecord
 
@@ -23,72 +22,20 @@ def setUp(self):
             'awsRegion': 'us-east-1'
         }
 
-        self.s3_record_dict = {
-            'eventVersion': '2.1',
-            'eventSource': 'aws:s3',
-            'eventName': 'ObjectCreated:Put',
-            'eventTime': '2023-01-01T12:00:00.000Z',
-            's3': {
-                'bucket': {'name': 'test-bucket'},
-                'object': {'key': 'test-file.txt'}
-            }
-        }
-
-        self.sns_record_dict = {
-            'eventSource': 'aws:sns',
-            'eventVersion': '1.0',
-            'eventSubscriptionArn': 'arn:aws:sns:us-east-1:123456789012:test-topic',
-            'Sns': {
-                'Message': 'Test message',
-                'Subject': 'Test subject'
-            }
-        }
-
     def test_init_with_sqs_event(self):
         """Test initialization with SQS event"""
         event = {
             'Records': [self.sqs_record_dict],
             'eventSource': 'aws:sqs'
         }
 
-        lambda_event = AwsLambdaEvent()
-        lambda_event.load_event(event)
+        lambda_event = AwsLambdaEvent(event)
 
         self.assertEqual(lambda_event.event_type, AwsEventType.SQS)
         self.assertEqual(len(lambda_event.records), 1)
         self.assertIsInstance(lambda_event.records[0], AwsLambdaSqsEventRecord)
         self.assertEqual(lambda_event.records[0].message_id, '12345-abcde-67890')
 
-    def test_init_with_s3_event(self):
-        """Test initialization with S3 event"""
-        event = {
-            'Records': [self.s3_record_dict],
-            'eventSource': 'aws:s3'
-        }
-
-        lambda_event = AwsLambdaEvent()
-        lambda_event.load_event(event)
-
-        self.assertEqual(lambda_event.event_type, AwsEventType.S3)
-        self.assertEqual(len(lambda_event.records), 1)
-        self.assertIsInstance(lambda_event.records[0], dict)
-        self.assertEqual(lambda_event.records[0]['eventSource'], 'aws:s3')
-
-    def test_init_with_sns_event(self):
-        """Test initialization with SNS event"""
-        event = {
-            'Records': [self.sns_record_dict],
-            'eventSource': 'aws:sns'
-        }
-
-        lambda_event = AwsLambdaEvent()
-        lambda_event.load_event(event)
-
-        self.assertEqual(lambda_event.event_type, AwsEventType.SNS)
-        self.assertEqual(len(lambda_event.records), 1)
-        self.assertIsInstance(lambda_event.records[0], dict)
-        self.assertEqual(lambda_event.records[0]['eventSource'], 'aws:sns')
-
     def test_init_with_multiple_sqs_records(self):
         """Test initialization with multiple SQS records"""
         sqs_record_2 = self.sqs_record_dict.copy()
@@ -99,8 +46,7 @@ def test_init_with_multiple_sqs_records(self):
             'eventSource': 'aws:sqs'
         }
 
-        lambda_event = AwsLambdaEvent()
-        lambda_event.load_event(event)
+        lambda_event = AwsLambdaEvent(event)
 
         self.assertEqual(lambda_event.event_type, AwsEventType.SQS)
         self.assertEqual(len(lambda_event.records), 2)
@@ -115,39 +61,23 @@ def test_init_with_empty_records(self):
             'Records': []
         }
 
-        lambda_event = AwsLambdaEvent()
-        lambda_event.load_event(event)
+        lambda_event = AwsLambdaEvent(event)
 
         self.assertEqual(lambda_event.event_type, AwsEventType.UNKNOWN)
         self.assertEqual(len(lambda_event.records), 0)
 
-    @patch('common.aws_lambda_event.logger')
-    def test_init_without_records(self, mock_logger):
+    def test_init_without_records(self):
         """Test initialization without Records key"""
         event = {
             'some_other_key': 'value'
         }
 
-        lambda_event = AwsLambdaEvent()
-        lambda_event.load_event(event)
+        lambda_event = AwsLambdaEvent(event)
 
         self.assertEqual(lambda_event.event_type, AwsEventType.UNKNOWN)
         self.assertEqual(len(lambda_event.records), 0)
 
-    def test_init_with_top_level_event_source(self):
-        """Test initialization with eventSource at top level"""
-        event = {
-            'eventSource': 'aws:s3',
-            'Records': [self.s3_record_dict]
-        }
-
-        lambda_event = AwsLambdaEvent()
-        lambda_event.load_event(event)
-
-        self.assertEqual(lambda_event.event_type, AwsEventType.S3)
-
-    @patch('common.aws_lambda_event.logger')
-    def test_init_with_unknown_event_source(self, mock_logger):
+    def test_init_with_unknown_event_source(self):
         """Test initialization with unknown event source"""
         unknown_record = {
             'eventSource': 'aws:unknown-service',
@@ -157,8 +87,7 @@ def test_init_with_unknown_event_source(self, mock_logger):
             'Records': [unknown_record]
         }
 
-        lambda_event = AwsLambdaEvent()
-        lambda_event.load_event(event)
+        lambda_event = AwsLambdaEvent(event)
 
         self.assertEqual(lambda_event.event_type, AwsEventType.UNKNOWN)
         self.assertEqual(len(lambda_event.records), 1)
@@ -173,8 +102,7 @@ def test_init_with_missing_event_source(self):
             'Records': [record_without_source]
         }
 
-        lambda_event = AwsLambdaEvent()
-        lambda_event.load_event(event)
+        lambda_event = AwsLambdaEvent(event)
 
         self.assertEqual(lambda_event.event_type, AwsEventType.UNKNOWN)
 
@@ -187,11 +115,10 @@ def test_enum_values(self):
 
     def test_mixed_multiple_records(self):
         """Test that mixed event sources uses the first record's type"""
-        mixed_records = [self.sqs_record_dict, self.s3_record_dict]
+        mixed_records = [self.sqs_record_dict, {}]
         event = {'Records': mixed_records, 'eventSource': 'aws:sqs'}
 
-        lambda_event = AwsLambdaEvent()
-        lambda_event.load_event(event)
+        lambda_event = AwsLambdaEvent(event)
 
         self.assertEqual(lambda_event.event_type, AwsEventType.SQS)
         self.assertEqual(len(lambda_event.records), 2)
@@ -200,8 +127,7 @@ def test_empty_records(self):
         """Test empty records"""
         event = {'Records': []}
 
-        lambda_event = AwsLambdaEvent()
-        lambda_event.load_event(event)
+        lambda_event = AwsLambdaEvent(event)
 
         self.assertEqual(lambda_event.event_type, AwsEventType.UNKNOWN)
         self.assertEqual(len(lambda_event.records), 0)