Merge pull request #4 from madeiramadeirabr/hotfix_sqs_examples

tratativas e correcoes de sqs

Author: andersoncontreira

examples/lambda_api/scripts/localstack/sqs/sample.json

@@ -1,3 +1,6 @@
 {
-   "sample": "json"
+   "chavenfe": "32210206107255000134550010001712551245826554",
+   "ocor": "MOTIVO DO CANCELAMENTO",
+   "origem": "SAC/EAGLE",
+   "pedido": "Z1223321"
 }

examples/lambda_api/scripts/localstack/sqs/send-message.sh

@@ -56,9 +56,13 @@ MESSAGE=$2
 if [ -z "$MESSAGE" ]
 then
   MESSAGE=$(cat ${current_file_path}sample.json)
+else
+  if test -f $2 ; then
+    MESSAGE=$(cat $2)
+  fi
 fi
 
 # cat ${current_file_path}sample.json
-# echo $MESSAGE
+#echo $MESSAGE
 echo "aws --endpoint-url=http://$HOST:4566 sqs send-message --queue-url $QUEUE --message-body '$MESSAGE'"
-aws --endpoint-url=http://$HOST:4566 sqs send-message --queue-url $QUEUE --message-body "'$MESSAGE'"
+aws --endpoint-url=http://$HOST:4566 sqs send-message --queue-url $QUEUE --message-body "$MESSAGE"

examples/lambda_sqs/README.md

@@ -69,16 +69,31 @@ Execute the follow command:
 ./scripts/runenv.sh
 ```
 
-### Boot the lambda
-Execute the follow command:
-```
-./scripts/boot.sh
-```
+[//]: # (### Boot the lambda)
+
+[//]: # (Execute the follow command:)
+
+[//]: # (```)
+
+[//]: # (./scripts/boot.sh)
+
+[//]: # (```)
 
 ### Running the app
+
+
+[//]: # (```)
+
+[//]: # (./scripts/localstack/lambda/invoke-sqs-function.sh lambda_sqs)
+
+[//]: # (```)
 Execute the follow command:
 ```
-./scripts/localstack/lambda/invoke-sqs-function.sh lambda_sqs
+./scripts/localstack/sqs/send-message.sh
+```
+Execute the follow command to send specific file:
+```
+./scripts/localstack/sqs/send-message.sh test-queue ./samples/ocorens/cancelamento.json
 ```
 
 ## Samples

examples/lambda_sqs/lambda_app/services/v1/carrier_notifier_service.py

@@ -1,4 +1,5 @@
 import json
+import ast
 
 from lambda_app import APP_NAME, APP_VERSION, APP_ARCH_VERSION, helper
 from lambda_app.decorators import SQSEvent
@@ -70,16 +71,28 @@ def process(self, sqs_event):
         return result
 
     def _read_event(self, record):
+        self.logger.info('try to reading event form record: {}'.format(record))
+        self.logger.info('Getting type of data: {}'.format(type(record)))
+        self.logger.info('dump: {}'.format(json.dumps(record)))
         event_body = None
         try:
             if isinstance(record, dict):
-                event_body = json.loads(record['body'])
+                try:
+                    event_body = json.loads(record['body'])
+                except Exception as err:
+                    self.logger.error(err)
+                    unescaped_str = ast.literal_eval(record['body'])
+                    event_body = json.loads(unescaped_str)
+            elif isinstance(record, str):
+                record = json.loads(record)
+                event_body = json.loads(record.body)
             elif isinstance(record.body, str):
                 event_body = json.loads(record.body)
             else:
                 event_body = record.body
         except Exception as err:
             self.logger.error(err)
+            self.logger.info('event_body: {}'.format(event_body))
         return event_body
 
     def get_records_from_sqs_event(self, sqs_event):

examples/lambda_sqs/samples/ocorens/cancelamento.json

@@ -2,5 +2,5 @@
    "chavenfe": "32210206107255000134550010001712551245826554",
    "ocor": "MOTIVO DO CANCELAMENTO",
    "origem": "SAC/EAGLE",
-   "pedido": "Z1223321"
+   "pedido": "Z1223322"
 }

examples/lambda_sqs/scripts/localstack/sqs/sample.json

@@ -1,3 +1,6 @@
 {
-   "sample": "json"
+   "chavenfe": "32210206107255000134550010001712551245826554",
+   "ocor": "MOTIVO DO CANCELAMENTO",
+   "origem": "SAC/EAGLE",
+   "pedido": "Z1223321"
 }

examples/lambda_sqs/scripts/localstack/sqs/send-message.sh

@@ -56,9 +56,13 @@ MESSAGE=$2
 if [ -z "$MESSAGE" ]
 then
   MESSAGE=$(cat ${current_file_path}sample.json)
+else
+  if test -f $2 ; then
+    MESSAGE=$(cat $2)
+  fi
 fi
 
 # cat ${current_file_path}sample.json
-# echo $MESSAGE
+#echo $MESSAGE
 echo "aws --endpoint-url=http://$HOST:4566 sqs send-message --queue-url $QUEUE --message-body '$MESSAGE'"
-aws --endpoint-url=http://$HOST:4566 sqs send-message --queue-url $QUEUE --message-body "'$MESSAGE'"
+aws --endpoint-url=http://$HOST:4566 sqs send-message --queue-url $QUEUE --message-body "$MESSAGE"

examples/lambda_sqs/tests/component/test_lambda_app/services/v1/test_carrier_notifier_service.py

@@ -12,7 +12,8 @@
 from tests.component.componenttestutils import BaseComponentTestCase
 from tests.component.helpers.events.aws.sqs_helper import SQSHelper
 from tests.unit.helpers.aws.sqs_helper import create_chalice_sqs_event, get_sqs_event_sample
-from tests.unit.helpers.events_helper import get_cancelamento_event
+from tests.unit.helpers.events_helper import get_cancelamento_event, get_cancelamento_error_event, \
+    get_cancelamento_quote_error_event
 from tests.unit.testutils import get_function_name
 
 
@@ -29,6 +30,12 @@ def get_queue_events_samples():
 
     return (sqs_event,),
 
+def get_queue_events_error_samples():
+    event = get_cancelamento_error_event()
+    qevent = get_cancelamento_quote_error_event()
+
+    return (create_chalice_sqs_event(event),), (create_chalice_sqs_event(qevent),),
+
 
 class CarrierNotifierServiceTestCase(BaseComponentTestCase):
     EXECUTE_FIXTURE = True
@@ -91,6 +98,14 @@ def test_process_by_events(self, sqs_event):
 
         self.assertTrue(result)
 
+    @data_provider(get_queue_events_error_samples)
+    def test_process_by_error_events(self, sqs_event):
+        self.logger.info('Running test: %s', get_function_name(__name__))
+
+        result = self.service.process(sqs_event=sqs_event)
+
+        self.assertTrue(result)
+
 
 if __name__ == '__main__':
     unittest.main()

examples/lambda_sqs/tests/datasources/events/sqs/ocorens/cancelamento.event.json

@@ -20,4 +20,4 @@
             "awsRegion": "us-east-2"
         }
     ]
-}
+}

examples/lambda_sqs/tests/datasources/events/sqs/ocorens/cancelamento.event.with.error.json

@@ -0,0 +1,23 @@
+{
+    "Records": [
+        {
+            "messageId": "11d6ee51-4cc7-4302-9e22-7cd8afdaadf5",
+            "receiptHandle": "AQEBBX8nesZEXmkhsmZeyIE8iQAMig7qw...",
+            "body": "\"{\n   \"chavenfe\": \"32210206107255000134550010001712551245826554\",\n   \"ocor\": \"MOTIVO DO CANCELAMENTO\",\n   \"origem\": \"SAC/EAGLE\",\n   \"pedido\": \"Z1223321\"\n}\"",
+            "attributes": {
+                "ApproximateReceiveCount": "1",
+                "SentTimestamp": "1573251510774",
+                "SequenceNumber": "18849496460467696128",
+                "MessageGroupId": "1",
+                "SenderId": "AIDAIO23YVJENQZJOL4VO",
+                "MessageDeduplicationId": "1",
+                "ApproximateFirstReceiveTimestamp": "1573251510774"
+            },
+            "messageAttributes": {},
+            "md5OfBody": "e4e68fb7bd0e697a0ae8f1bb342846b3",
+            "eventSource": "aws:sqs",
+            "eventSourceARN": "arn:aws:sqs:us-east-2:683720833731:fretzy-delivery-time-simulator-queue.fifo",
+            "awsRegion": "us-east-2"
+        }
+    ]
+}