Merge branch 'release/0.5.6'

praekeltfoundation · Jun 20, 2018 · 8176609 · 8176609
2 parents 095d84e + 46471b0
commit 8176609
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="vxaat",
-    version="0.5.4",
+    version="0.5.6",
     url='http://github.com/praekelt/vumi-aat',
     license='BSD',
     description="An AAT USSD transport for Vumi.",

diff --git a/vxaat/__init__.py b/vxaat/__init__.py
@@ -1,6 +1,6 @@
 """Vumi AAT USSD transport."""
 from .ussd import AatUssdTransport
 
-__version__ = "0.5.4"
+__version__ = "0.5.6"
 
 __all__ = ['AatUssdTransport']
diff --git a/vxaat/tests/test_ussd.py b/vxaat/tests/test_ussd.py
@@ -333,6 +333,9 @@ def test_metadata_handled(self):
             msg,
             session_event=TransportUserMessage.SESSION_NEW,
             content=None,
+            helper_metadata={
+                'session_id': ussd_session_id,
+            },
             transport_metadata={
                 'aat_ussd': {
                     'provider': 'mtn',

diff --git a/vxaat/ussd.py b/vxaat/ussd.py
@@ -102,8 +102,8 @@ def handle_raw_inbound_message(self, message_id, request):
             content = None
 
         self.log.info(
-            'AatUssdTransport receiving inbound message from %s to %s.' % (
-                from_addr, to_addr))
+            'AatUssdTransport receiving inbound message (%s) from %s to %s.'
+            % (message_id, from_addr, to_addr))
 
         yield self.publish_message(
             message_id=message_id,
@@ -112,6 +112,9 @@ def handle_raw_inbound_message(self, message_id, request):
             from_addr=from_addr,
             session_event=session_event,
             transport_type=self.transport_type,
+            helper_metadata={
+                'session_id': ussd_session_id,
+            },
             transport_metadata={
                 'aat_ussd': {
                     'provider': provider,
@@ -154,8 +157,8 @@ def handle_outbound_message(self, message):
             self.get_callback_url(message['from_addr']),
             message['session_event']
         )
-        self.log.info('AatUssdTransport outbound message with content: %r'
-                      % (body,))
+        self.log.info('AatUssdTransport outbound message (%s) with content: %r'
+                      % (message_id, body,))
 
         # Errors
         if not message['content']: