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

analytics: Remove HuddleCount for now.

Browse Source 
Planned changes to the underlying analytics model will require potentially
complicated changes to huddle queries.
This commit is contained in:
umkay
2016-10-11 19:05:17 -07:00
committed by Tim Abbott
parent 7787b780bc
commit 721529b782
5 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
analytics/lib/counts.py
View File

@@ -2,7 +2,7 @@ from django.db import connection, models
from datetime import timedelta, datetime
from analytics.models import InstallationCount, RealmCount, \
UserCount, StreamCount, HuddleCount, BaseCount
UserCount, StreamCount, BaseCount
from analytics.lib.interval import TimeInterval, timeinterval_range, subintervals
from zerver.models import Realm, UserProfile, Message, Stream, models
@@ -237,25 +237,6 @@ count_stream_by_realm_query = """
"""
zerver_count_stream_by_realm = ZerverCountQuery(Stream, RealmCount, count_stream_by_realm_query)
count_message_by_huddle_query = """
INSERT INTO analytics_huddlecount
(huddle_id, user_id, value, property, end_time, interval)
SELECT
zerver_message.recipient_id, zerver_message.sender_id, count(*), '%(property)s', %%(time_end)s, '%(interval)s'
FROM zerver_message
INNER JOIN zerver_recipient
ON
(
zerver_recipient.type = 3 AND
zerver_message.recipient_id = zerver_recipient.id AND
zerver_message.pub_date >= %%(time_start)s AND
zerver_message.pub_date < %%(time_end)s
%(join_args)s
)
GROUP BY zerver_message.recipient_id, zerver_message.sender_id
"""
zerver_count_message_by_huddle = ZerverCountQuery(Message, HuddleCount, count_message_by_huddle_query)
COUNT_STATS = {
'active_humans': CountStat('active_humans', zerver_count_user_by_realm,
{'is_bot': False, 'is_active': True}, 'gauge', 'day'),