From 6b1ca15ba7894637f3e49c79e31bb4d60cb2719f Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Thu, 8 Apr 2021 17:29:05 -0700
Subject: [PATCH] activity: Use realm owners, not realm administrators.

The analytics system was not properly updated when we replaced realm
owners with realm administrators.
---
 analytics/management/commands/populate_analytics_db.py |  4 ++--
 analytics/views.py                                     | 10 +++++-----
 templates/analytics/realm_summary_table.html           |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/analytics/management/commands/populate_analytics_db.py b/analytics/management/commands/populate_analytics_db.py
index 98a079bbb0..747e022b2c 100644
--- a/analytics/management/commands/populate_analytics_db.py
+++ b/analytics/management/commands/populate_analytics_db.py
@@ -83,9 +83,9 @@ class Command(BaseCommand):
                 "Shylock",
                 realm,
                 full_name="Shylock",
-                role=UserProfile.ROLE_REALM_ADMINISTRATOR,
+                role=UserProfile.ROLE_REALM_OWNER,
             )
-        do_change_user_role(shylock, UserProfile.ROLE_REALM_ADMINISTRATOR, acting_user=None)
+        do_change_user_role(shylock, UserProfile.ROLE_REALM_OWNER, acting_user=None)
         stream = Stream.objects.create(name="all", realm=realm, date_created=installation_time)
         recipient = Recipient.objects.create(type_id=stream.id, type=Recipient.STREAM)
         stream.recipient = recipient
diff --git a/analytics/views.py b/analytics/views.py
index 81d67c35cd..43d0931c40 100644
--- a/analytics/views.py
+++ b/analytics/views.py
@@ -736,19 +736,19 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
     cursor.close()
 
     # Fetch all the realm administrator users
-    realm_admins: Dict[str, List[str]] = defaultdict(list)
+    realm_owners: Dict[str, List[str]] = defaultdict(list)
     for up in UserProfile.objects.select_related("realm").filter(
-        role=UserProfile.ROLE_REALM_ADMINISTRATOR,
+        role=UserProfile.ROLE_REALM_OWNER,
         is_active=True,
     ):
-        realm_admins[up.realm.string_id].append(up.delivery_email)
+        realm_owners[up.realm.string_id].append(up.delivery_email)
 
     for row in rows:
         row["date_created_day"] = row["date_created"].strftime("%Y-%m-%d")
         row["plan_type_string"] = get_plan_name(row["plan_type"])
         row["age_days"] = int((now - row["date_created"]).total_seconds() / 86400)
         row["is_new"] = row["age_days"] < 12 * 7
-        row["realm_admin_email"] = ", ".join(realm_admins[row["string_id"]])
+        row["realm_owner_emails"] = ", ".join(realm_owners[row["string_id"]])
 
     # get messages sent per day
     counts = get_realm_day_counts()
@@ -810,7 +810,7 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
         amount=total_amount,
         stats_link="",
         date_created_day="",
-        realm_admin_email="",
+        realm_owner_emails="",
         dau_count=total_dau_count,
         user_profile_count=total_user_profile_count,
         bot_count=total_bot_count,
diff --git a/templates/analytics/realm_summary_table.html b/templates/analytics/realm_summary_table.html
index eae0d32807..1552251128 100644
--- a/templates/analytics/realm_summary_table.html
+++ b/templates/analytics/realm_summary_table.html
@@ -62,7 +62,7 @@
 
             <td>
                 {% if not loop.last %}
-                <a class="envelope-link" data-admin-emails="{{ row.realm_admin_email }}">
+                <a class="envelope-link" data-admin-emails="{{ row.realm_owner_emails }}">
                     <i class="fa fa-envelope"></i>
                 </a>
                 {% endif %}