including endpoints in export + test

go/conversation/tasks.py

@@ -25,6 +25,7 @@
     'network_handover_status',
     'network_handover_reason',
     'delivery_status',
+    'endpoint',
 ]
 
 
@@ -46,6 +47,7 @@ def row_for_inbound_message(message):
                for field in conversation_export_field_names
                if field in message)
     row['direction'] = 'inbound'
+    row['endpoint'] = message.get_routing_endpoint()
     return row
 
 
@@ -65,6 +67,7 @@ def row_for_outbound_message(message, mdb):
     status, reason = get_network_status(network_events)
     row['network_handover_status'] = status
     row['network_handover_reason'] = reason
+    row['endpoint'] = message.get_routing_endpoint()
     return row
 
 

go/conversation/tests.py

@@ -990,3 +990,27 @@ def test_export_conversation_nack(self):
         [row] = list(reader)
         self.assertEqual(row['network_handover_status'], 'nack')
         self.assertEqual(row['network_handover_reason'], 'foo')
+
+    def test_export_conversation_endpoints(self):
+        conv = self.create_conversation(reply_count=0)
+
+        msg = self.msg_helper.make_outbound(
+            "outbound", conv=conv, to_addr='from-1')
+        msg.set_routing_endpoint('foo')
+        self.msg_helper.store_outbound(conv, msg)
+
+        msg = self.msg_helper.make_outbound(
+            "inbound", conv=conv, from_addr='from-1')
+        msg.set_routing_endpoint('bar')
+        self.msg_helper.store_inbound(conv, msg)
+
+        export_conversation_messages_unsorted(conv.user_account.key, conv.key)
+        [email] = mail.outbox
+        fp = self.get_zipfile_attachment(
+            email, 'messages-export.zip', 'messages-export.csv')
+        reader = csv.DictReader(fp)
+        [row1, row2] = list(reader)
+        self.assertEqual(row1['direction'], 'inbound')
+        self.assertEqual(row1['endpoint'], 'bar')
+        self.assertEqual(row2['direction'], 'outbound')
+        self.assertEqual(row2['endpoint'], 'foo')