Merge pull request rapidpro#201 from praekelt/feature/MOMZA-819-send-…

…blank-channel-id Default channel_id to empty string
BlueRidgeLabs · Oct 25, 2017 · 18e1020 · 18e1020
2 parents 48a48f0 + 0feac3d
commit 18e1020
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/casepro/backend/junebug.py b/casepro/backend/junebug.py
@@ -46,12 +46,12 @@ def build_outgoing_message_json(self, outgoing, to_addr):
             reply_to = ''
             label = ''
             inbound_created_on = outgoing.created_on
-            inbound_channel_id = None
+            inbound_channel_id = ""
         else:
             reply_to = outgoing.reply_to.text
             label = ','.join([str(l) for l in outgoing.reply_to.labels.all()])
             inbound_created_on = outgoing.reply_to.created_on
-            inbound_channel_id = outgoing.reply_to.metadata.get('channel_id', None)
+            inbound_channel_id = outgoing.reply_to.metadata.get('channel_id', "")
 
         return {
             'to': to_addr,

diff --git a/casepro/backend/tests/test_junebug.py b/casepro/backend/tests/test_junebug.py
@@ -690,7 +690,7 @@ def hub_outgoing_callback(request):
                 'content': "That's great", 'inbound_created_on': '2016-11-17T10:30:00+00:00',
                 'outbound_created_on': '2016-11-17T10:30:00+00:00',
                 'label': '', 'reply_to': '', 'to': '+1234', 'user_id': 'C-002', 'helpdesk_operator_id': self.user1.id,
-                'inbound_channel_id': None})
+                'inbound_channel_id': ''})
             headers = {'Content-Type': "application/json"}
             resp = {
                 'status': 201,