paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split humans/bots in History tab for realm reports.

Browse Source 
(imported from commit 02e398590f4f844ce30e76703006262296301b97)
This commit is contained in:
Steve Howell
2013-11-14 15:28:31 -05:00
parent 4d7b351b07
commit 6e19f8b86f
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
analytics/views.py
View File

@@ -238,13 +238,15 @@ def sent_messages_report(realm):
cols = [
'Date',
'Count'
'Humans',
'Bots'
]
query = '''
select
series.day::date,
q.cnt
humans.cnt,
bots.cnt
from (
select generate_series(
(now()::date - interval '2 week'),
@@ -261,17 +263,38 @@ def sent_messages_report(realm):
join zerver_realm r on r.id = up.realm_id
where
r.domain = %s
and
(not up.is_bot)
and
pub_date > now() - interval '2 week'
group by
pub_date::date
order by
pub_date::date
) q on
series.day = q.pub_date
) humans on
series.day = humans.pub_date
left join (
select
pub_date::date pub_date,
count(*) cnt
from zerver_message m
join zerver_userprofile up on up.id = m.sender_id
join zerver_realm r on r.id = up.realm_id
where
r.domain = %s
and
up.is_bot
and
pub_date > now() - interval '2 week'
group by
pub_date::date
order by
pub_date::date
) bots on
series.day = bots.pub_date
'''
cursor = connection.cursor()
cursor.execute(query, [realm])
cursor.execute(query, [realm, realm])
rows = cursor.fetchall()
cursor.close()