paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 23:43:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

analytics: Rename message count types to use standard Zulip casing.

Browse Source
This commit is contained in:
Tim Abbott
2017-03-20 11:38:58 -07:00
parent aa7e4fec35
commit 20a7609018
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
analytics/tests/test_views.py
View File

@@ -32,6 +32,8 @@ class TestStatsEndpoint(ZulipTestCase):
self.assert_in_response("Zulip Analytics for", result) self.assert_in_response("Zulip Analytics for", result)
class TestGetChartData(ZulipTestCase): class TestGetChartData(ZulipTestCase):
maxDiff = None
def setUp(self): def setUp(self):
# type: () -> None # type: () -> None
self.realm = get_realm('zulip') self.realm = get_realm('zulip')
@@ -116,11 +118,11 @@ class TestGetChartData(ZulipTestCase):
'end_times': [datetime_to_timestamp(dt) for dt in self.end_times_day], 'end_times': [datetime_to_timestamp(dt) for dt in self.end_times_day],
'frequency': CountStat.DAY, 'frequency': CountStat.DAY,
'interval': CountStat.DAY, 'interval': CountStat.DAY,
'realm': {'Public Streams': self.data(100), 'Private Streams': self.data(0), 'realm': {'Public streams': self.data(100), 'Private streams': self.data(0),
'Private Messages': self.data(101), 'Huddle Messages': self.data(0)}, 'Private messages': self.data(101), 'Group private messages': self.data(0)},
'user': {'Public Streams': self.data(200), 'Private Streams': self.data(201), 'user': {'Public streams': self.data(200), 'Private streams': self.data(201),
'Private Messages': self.data(0), 'Huddle Messages': self.data(0)}, 'Private messages': self.data(0), 'Group private messages': self.data(0)},
'display_order': ['Private Messages', 'Public Streams', 'Private Streams', 'Huddle Messages'], 'display_order': ['Private messages', 'Public streams', 'Private streams', 'Group private messages'],
'result': 'success', 'result': 'success',
}) })
@@ -179,9 +181,9 @@ class TestGetChartData(ZulipTestCase):
self.assert_json_success(result) self.assert_json_success(result)
data = ujson.loads(result.content) data = ujson.loads(result.content)
self.assertEqual(data['realm'], { self.assertEqual(data['realm'], {
'Public Streams': [0], 'Private Streams': [0], 'Private Messages': [0], 'Huddle Messages': [0]}) 'Public streams': [0], 'Private streams': [0], 'Private messages': [0], 'Group private messages': [0]})
self.assertEqual(data['user'], { self.assertEqual(data['user'], {
'Public Streams': [0], 'Private Streams': [0], 'Private Messages': [0], 'Huddle Messages': [0]}) 'Public streams': [0], 'Private streams': [0], 'Private messages': [0], 'Group private messages': [0]})
FillState.objects.create( FillState.objects.create(
property='messages_sent:client:day', end_time=self.end_times_day[0], state=FillState.DONE) property='messages_sent:client:day', end_time=self.end_times_day[0], state=FillState.DONE)

2
analytics/views.py
View File

@@ -69,7 +69,7 @@ def get_chart_data(request, user_profile, chart_name=REQ(),
stat = COUNT_STATS['messages_sent:message_type:day'] stat = COUNT_STATS['messages_sent:message_type:day']
tables = [RealmCount, UserCount] tables = [RealmCount, UserCount]
subgroups = ['public_stream', 'private_stream', 'private_message', 'huddle_message'] subgroups = ['public_stream', 'private_stream', 'private_message', 'huddle_message']
labels = ['Public Streams', 'Private Streams', 'Private Messages', 'Huddle Messages'] labels = ['Public streams', 'Private streams', 'Private messages', 'Group private messages']
labels_sort_function = lambda data: sort_by_totals(data['realm']) labels_sort_function = lambda data: sort_by_totals(data['realm'])
include_empty_subgroups = [True, True] include_empty_subgroups = [True, True]
elif chart_name == 'messages_sent_by_client': elif chart_name == 'messages_sent_by_client':