Construct vumi_username correctly in RapidSMS vumi_app.

go/apps/rapidsms/tests/test_vumi_app.py

@@ -63,6 +63,9 @@ class RapidSMSApplicationTestCase(VumiTestCase):
     def setUp(self):
         self.app_helper = self.add_helper(AppWorkerHelper(RapidSMSApplication))
 
+    def _username_for_conv(self, conv):
+        return RapidSMSApplication.vumi_username_for_conversation(conv)
+
     @inlineCallbacks
     def test_setup_application(self):
         app = yield self.app_helper.get_app_worker(self.APP_CONFIG)
@@ -82,6 +85,7 @@ def test_get_config_for_message(self):
         msg = yield self.app_helper.make_stored_inbound(conv, "foo")
         config = yield app.get_config(msg)
         self.assertTrue(isinstance(config, RapidSMSConfig))
+        self.assertEqual(config.vumi_username, self._username_for_conv(conv))
 
     @inlineCallbacks
     def test_get_config_for_username(self):
@@ -92,6 +96,7 @@ def test_get_config_for_username(self):
             username="%s:%s" % (conv.user_account.key, conv.key))
         config = yield app.get_config(None, ctxt=ctxt)
         self.assertTrue(isinstance(config, RapidSMSConfig))
+        self.assertEqual(config.vumi_username, self._username_for_conv(conv))
 
     @inlineCallbacks
     def test_process_command_start(self):

go/apps/rapidsms/vumi_app.py

@@ -32,10 +32,15 @@ def teardown_application(self):
         yield super(RapidSMSApplication, self).teardown_application()
         yield self._go_teardown_worker()
 
+    @staticmethod
+    def vumi_username_for_conversation(conversation):
+        return "%s:%s" % (conversation.user_account.key, conversation.key)
+
     def get_config_data_for_conversation(self, conversation):
         dynamic_config = conversation.config.get('rapidsms', {}).copy()
         dynamic_config["vumi_auth_method"] = "basic"
-        dynamic_config["vumi_username"] = conversation.key
+        dynamic_config["vumi_username"] = self.vumi_username_for_conversation(
+            conversation)
         auth_config = conversation.config.get('auth_tokens', {})
         api_tokens = auth_config.get("api_tokens", [])
         dynamic_config["vumi_password"] = api_tokens[0] if api_tokens else None