finalsa-common-models 0.0.1__tar.gz → 0.0.3__tar.gz

{finalsa-common-models-0.0.1/finalsa_common_models.egg-info → finalsa-common-models-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: finalsa-common-models
-Version: 0.0.1
+Version: 0.0.3
 Summary: An utils package for using finalsa common models.
 Home-page: https://github.com/finalsa/finalsa-common-models
 Author: Luis Jimenez

finalsa-common-models-0.0.3/finalsa/common/models/__init__.py

@@ -0,0 +1,15 @@
+from finalsa.common.models.models import (
+    SqsMessage,
+    SqsReponse,
+    parse_message_attributes,
+    to_message_attributes
+)
+
+__version__ = "0.0.3"
+
+__all__ = [
+    "SqsMessage",
+    "SqsReponse",
+    "parse_message_attributes",
+    "to_message_attributes",
+]

{finalsa-common-models-0.0.1 → finalsa-common-models-0.0.3}/finalsa/common/models/models/__init__.py

@@ -1,3 +1,3 @@
-from .functions import parse_message_attributes
+from .functions import parse_message_attributes, to_message_attributes
 from .sqs_message import SqsMessage
 from .sqs_response import SqsReponse

{finalsa-common-models-0.0.1 → finalsa-common-models-0.0.3}/finalsa/common/models/models/functions.py

@@ -1,4 +1,7 @@
 from typing import Dict
+from datetime import datetime
+from decimal import Decimal
+from uuid import UUID
 
 
 def parse_message_attributes(attributes: Dict) -> Dict:
@@ -21,6 +24,18 @@ def to_message_attributes(attributes: Dict) -> Dict:
         if isinstance(value, str):
             att_dict[key] = {
                 'DataType': 'String', 'StringValue': value}
+        elif isinstance(value, Decimal):
+            att_dict[key] = {
+                'DataType': 'Number', 'StringValue': str(value)}
+        elif isinstance(value, UUID):
+            att_dict[key] = {
+                'DataType': 'String', 'StringValue': str(value)}
+        elif isinstance(value, datetime):
+            att_dict[key] = {
+                'DataType': 'String', 'StringValue': value.isoformat()}
+        elif isinstance(value, int):
+            att_dict[key] = {
+                'DataType': 'Number', 'StringValue': str(value)}
         elif isinstance(value, bytes):
             att_dict[key] = {
                 'DataType': 'Binary', 'BinaryValue': value}

{finalsa-common-models-0.0.1 → finalsa-common-models-0.0.3}/finalsa/common/models/models/sqs_response.py

@@ -71,7 +71,7 @@ class SqsReponse(BaseModel):
                 topic=sns_payload['topic'],
                 payload=sns_payload['payload'],
                 correlation_id=sns_payload['correlation_id'],
-                timestamp=datetime.fromisoformat(sns_payload['timestamp'])
+                timestamp=sns_payload['timestamp']
             )
         payload = self.get_payload()
         if 'correlation_id' not in payload:
@@ -81,7 +81,7 @@ class SqsReponse(BaseModel):
             topic=payload['topic'],
             payload=payload['payload'],
             correlation_id=payload['correlation_id'],
-            timestamp=datetime.fromisoformat(payload['timestamp'])
+            timestamp=payload['timestamp']
         )
 
     @classmethod

{finalsa-common-models-0.0.1 → finalsa-common-models-0.0.3/finalsa_common_models.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: finalsa-common-models
-Version: 0.0.1
+Version: 0.0.3
 Summary: An utils package for using finalsa common models.
 Home-page: https://github.com/finalsa/finalsa-common-models
 Author: Luis Jimenez

{finalsa-common-models-0.0.1 → finalsa-common-models-0.0.3}/tests/test_client.py

@@ -1,7 +1,11 @@
 from finalsa.common.models import (
-    SqsMessage, SqsReponse, parse_message_attributes, __version__)
+    SqsMessage, SqsReponse, parse_message_attributes,
+    to_message_attributes, __version__)
 import os
 import sys
+import uuid
+import datetime
+import decimal
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../../')))
 
@@ -77,8 +81,10 @@ def test_sqs_response_from_boto_response():
     assert response.body == 'test'
     assert str(response.get_correlation_id()) == '123e4567-e89b-12d3-a456-426614174000'
     assert response.topic == ''
-    assert response.message_attributes == {'correlation_id' : "123e4567-e89b-12d3-a456-426614174000"}
-    assert response.attributes == {'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'}
+    assert response.message_attributes == {
+        'correlation_id': "123e4567-e89b-12d3-a456-426614174000"}
+    assert response.attributes == {
+        'test': 'test', 'correlation_id': '123e4567-e89b-12d3-a456-426614174000'}
 
 
 def test_sqs_response_no_correlation_id():
@@ -109,3 +115,27 @@ def test_sqs_message_from_dict():
     assert message.topic == message_dict['topic']
     assert message.get_payload() == {'test': 'test'}
     assert message.correlation_id == message_dict['correlation_id']
+
+
+def test_to_message_attributes():
+    attributes = {
+        'string': 'test',
+        'number': 1,
+        'binary': b'test',
+        'uuid': uuid.uuid4(),
+        'datetime': datetime.datetime.now(),
+        'decimal': decimal.Decimal('1.0')
+    }
+    result = to_message_attributes(attributes)
+    assert result['string']['DataType'] == 'String'
+    assert result['string']['StringValue'] == 'test'
+    assert result['number']['DataType'] == 'Number'
+    assert result['number']['StringValue'] == '1'
+    assert result['binary']['DataType'] == 'Binary'
+    assert result['binary']['BinaryValue'] == b'test'
+    assert result['uuid']['DataType'] == 'String'
+    assert result['uuid']['StringValue'] == str(attributes['uuid'])
+    assert result['datetime']['DataType'] == 'String'
+    assert result['datetime']['StringValue'] == attributes['datetime'].isoformat()
+    assert result['decimal']['DataType'] == 'Number'
+    assert result['decimal']['StringValue'] == '1.0'

finalsa-common-models-0.0.1/finalsa/common/models/__init__.py

@@ -1,13 +0,0 @@
-from finalsa.common.models.models import (
-    SqsMessage,
-    SqsReponse,
-    parse_message_attributes
-)
-
-__version__ = "0.0.1"
-
-__all__ = [
-    "SqsMessage",
-    "SqsReponse",
-    "parse_message_attributes"
-]