diff --git a/analytics/tests/test_activity_views.py b/analytics/tests/test_activity_views.py index 66cc5a3757..2a8261627d 100644 --- a/analytics/tests/test_activity_views.py +++ b/analytics/tests/test_activity_views.py @@ -32,7 +32,7 @@ class ActivityTest(ZulipTestCase): user_profile.save(update_fields=["is_staff"]) flush_per_request_caches() - with self.assert_database_query_count(19): + with self.assert_database_query_count(18): result = self.client_get("/activity") self.assertEqual(result.status_code, 200) diff --git a/analytics/views/installation_activity.py b/analytics/views/installation_activity.py index 05914c23ed..5dbd651503 100644 --- a/analytics/views/installation_activity.py +++ b/analytics/views/installation_activity.py @@ -26,7 +26,7 @@ from analytics.views.support import get_plan_name from zerver.decorator import require_server_admin from zerver.lib.request import has_request_variables from zerver.lib.timestamp import timestamp_to_datetime -from zerver.models import Realm, UserActivityInterval, UserProfile, get_org_type_display_name +from zerver.models import Realm, UserActivityInterval, get_org_type_display_name if settings.BILLING_ENABLED: from corporate.lib.stripe import ( @@ -187,19 +187,10 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str: rows = dictfetchall(cursor) cursor.close() - # Fetch all the realm administrator users - realm_owners: Dict[str, List[str]] = defaultdict(list) - for up in UserProfile.objects.select_related("realm").filter( - role=UserProfile.ROLE_REALM_OWNER, - is_active=True, - ): - 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["age_days"] = int((now - row["date_created"]).total_seconds() / 86400) row["is_new"] = row["age_days"] < 12 * 7 - row["realm_owner_emails"] = ", ".join(realm_owners[row["string_id"]]) # get messages sent per day counts = get_realm_day_counts() @@ -283,7 +274,6 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str: arr=total_arr, stats_link="", date_created_day="", - 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 07c3248a17..96822e24bb 100644 --- a/templates/analytics/realm_summary_table.html +++ b/templates/analytics/realm_summary_table.html @@ -9,7 +9,6 @@