Remove support for direct use of user_accont from publish_account_met…

…ric (first argument is now the user account key).

go/apps/jsbox/metrics.py

@@ -79,7 +79,7 @@ class MetricsResource(SandboxResource):
 
     def _publish_event(self, api, ev):
         conversation = self.app_worker.conversation_for_api(api)
-        self.app_worker.publish_account_metric(conversation.user_account,
+        self.app_worker.publish_account_metric(conversation.user_account.key,
                                                ev.store, ev.metric, ev.value,
                                                ev.agg)
 

go/apps/jsbox/tests/test_metrics.py

@@ -109,7 +109,7 @@ def check_reply(self, reply, cmd, success):
 
     def check_publish(self, store, metric, value, agg):
         self.app_worker.publish_account_metric.assert_called_once_with(
-            self.conversation.user_account, store, metric, value, agg)
+            self.conversation.user_account.key, store, metric, value, agg)
 
     def check_not_published(self):
         self.assertFalse(self.app_worker.publish_account_metric.called)

go/vumitools/app_worker.py

@@ -230,14 +230,9 @@ def publish_conversation_metric(self, conversation, name, value, agg=None):
             conversation.user_account.key, conversation.key, name)
         self.publish_metric(name, value, agg)
 
-    def publish_account_metric(self, user_account, store, name, value,
+    def publish_account_metric(self, user_account_key, store, name, value,
                                agg=None):
-        if isinstance(user_account, basestring):
-            user_account_key = user_account
-        else:
-            user_account_key = user_account.key
-        name = "%s.%s.%s" % (
-            user_account_key, store, name)
+        name = "%s.%s.%s" % (user_account_key, store, name)
         self.publish_metric(name, value, agg)
 
     @inlineCallbacks