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

analytics: Support DM groups in count message type query.

Browse Source 
To maintain API compatibility during and after the migration to direct
message groups for 1:1 and self messages, update the analytics count
query to treat DM groups of size 2 or less as private messages.
This commit is contained in:
Mohammad Reza Kianifar
2025-07-20 00:54:00 +00:00
committed by Tim Abbott
parent 021d6cb169
commit 2aad468807
2 changed files with 57 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
analytics/lib/counts.py
View File

@@ -631,9 +631,9 @@ def count_message_type_by_user_query(realm: Realm | None) -> QueryFn:
(
SELECT zerver_userprofile.realm_id, zerver_userprofile.id, count(*),
CASE WHEN
zerver_recipient.type = 1 THEN 'private_message'
zerver_recipient.type = 1 OR (zerver_recipient.type = 3 AND zerver_huddle.group_size <= 2) THEN 'private_message'
WHEN
zerver_recipient.type = 3 THEN 'huddle_message'
zerver_recipient.type = 3 AND zerver_huddle.group_size > 2 THEN 'huddle_message'
WHEN
zerver_stream.invite_only = TRUE THEN 'private_stream'
ELSE 'public_stream'
@@ -650,12 +650,15 @@ def count_message_type_by_user_query(realm: Realm | None) -> QueryFn:
JOIN zerver_recipient
ON
zerver_message.recipient_id = zerver_recipient.id
LEFT JOIN zerver_huddle
ON
zerver_recipient.type_id = zerver_huddle.id
LEFT JOIN zerver_stream
ON
zerver_recipient.type_id = zerver_stream.id
GROUP BY
zerver_userprofile.realm_id, zerver_userprofile.id,
zerver_recipient.type, zerver_stream.invite_only
zerver_recipient.type, zerver_stream.invite_only, zerver_huddle.group_size
) AS subquery
GROUP BY realm_id, id, message_type
"""