unread.js to typescript

.mailmap

@@ -97,6 +97,7 @@ Rishi Gupta <rishig@zulipchat.com> <rishig@users.noreply.github.com>
 Rixant Rokaha <rixantrokaha@gmail.com>
 Rixant Rokaha <rixantrokaha@gmail.com> <rishantrokaha@gmail.com>
 Rixant Rokaha <rixantrokaha@gmail.com> <rrokaha@caldwell.edu>
+Rohan Gudimetla <rohan.gudimetla07@gmail.com>
 Sahil Batra <sahil@zulip.com> <35494118+sahil839@users.noreply.github.com>
 Sahil Batra <sahil@zulip.com> <sahilbatra839@gmail.com>
 Satyam Bansal <sbansal1999@gmail.com>
@@ -120,6 +121,7 @@ Tim Abbott <tabbott@zulip.com> <tabbott@zulipchat.com>
 Ujjawal Modi <umodi2003@gmail.com> <99073049+Ujjawal3@users.noreply.github.com>
 umkay <ukhan@zulipchat.com> <umaimah.k@gmail.com>
 umkay <ukhan@zulipchat.com> <umkay@users.noreply.github.com>
+Viktor Illmer <1476338+v-ji@users.noreply.github.com>
 Vishnu KS <vishnu@zulip.com> <hackerkid@vishnuks.com>
 Vishnu KS <vishnu@zulip.com> <yo@vishnuks.com>
 Waseem Daher <wdaher@zulip.com> <wdaher@dropbox.com>

analytics/management/commands/populate_analytics_db.py

@@ -32,10 +32,10 @@
     Recipient,
     Stream,
     Subscription,
-    SystemGroups,
     UserGroup,
     UserProfile,
 )
+from zerver.models.groups import SystemGroups
 
 
 class Command(BaseCommand):

analytics/tests/test_activity_views.py

@@ -1,11 +1,18 @@
+import uuid
 from datetime import timedelta
 from unittest import mock
 
 from django.utils.timezone import now as timezone_now
 
+from corporate.lib.stripe import add_months
+from corporate.models import Customer, CustomerPlan, LicenseLedger
 from zerver.lib.test_classes import ZulipTestCase
 from zerver.models import Client, UserActivity, UserProfile
-from zilencer.models import RemoteRealmAuditLog, get_remote_server_guest_and_non_guest_count
+from zilencer.models import (
+    RemoteRealmAuditLog,
+    RemoteZulipServer,
+    get_remote_server_guest_and_non_guest_count,
+)
 
 event_time = timezone_now() - timedelta(days=3)
 data_list = [
@@ -99,8 +106,32 @@ def test_activity(self, unused_mock: mock.Mock) -> None:
             result = self.client_get("/activity")
             self.assertEqual(result.status_code, 200)
 
+        # Add data for remote activity page
         RemoteRealmAuditLog.objects.bulk_create([RemoteRealmAuditLog(**data) for data in data_list])
-        with self.assert_database_query_count(6):
+        remote_server = RemoteZulipServer.objects.get(id=1)
+        customer = Customer.objects.create(remote_server=remote_server)
+        plan = CustomerPlan.objects.create(
+            customer=customer,
+            billing_cycle_anchor=timezone_now(),
+            billing_schedule=CustomerPlan.BILLING_SCHEDULE_ANNUAL,
+            tier=CustomerPlan.TIER_SELF_HOSTED_BUSINESS,
+            price_per_license=8000,
+            next_invoice_date=add_months(timezone_now(), 12),
+        )
+        LicenseLedger.objects.create(
+            licenses=10,
+            licenses_at_next_renewal=10,
+            event_time=timezone_now(),
+            is_renewal=True,
+            plan=plan,
+        )
+        RemoteZulipServer.objects.create(
+            uuid=str(uuid.uuid4()),
+            api_key="magic_secret_api_key",
+            hostname="demo.example.com",
+            contact_email="email@example.com",
+        )
+        with self.assert_database_query_count(10):
             result = self.client_get("/activity/remote")
             self.assertEqual(result.status_code, 200)
 

analytics/tests/test_counts.py

@@ -68,20 +68,19 @@
     Client,
     Huddle,
     Message,
-    NotificationTriggers,
     PreregistrationUser,
     Realm,
     RealmAuditLog,
     Recipient,
     Stream,
-    SystemGroups,
     UserActivityInterval,
     UserGroup,
     UserProfile,
-    get_client,
-    get_user,
-    is_cross_realm_bot_email,
 )
+from zerver.models.clients import get_client
+from zerver.models.groups import SystemGroups
+from zerver.models.scheduled_jobs import NotificationTriggers
+from zerver.models.users import get_user, is_cross_realm_bot_email
 from zilencer.models import (
     RemoteInstallationCount,
     RemotePushDeviceToken,
@@ -1459,8 +1458,9 @@ def test_mobile_pushes_received_count(self) -> None:
         now = timezone_now()
         with time_machine.travel(now, tick=False), mock.patch(
             "zilencer.views.send_android_push_notification", return_value=1
-        ), mock.patch(
-            "zilencer.views.send_apple_push_notification", return_value=1
+        ), mock.patch("zilencer.views.send_apple_push_notification", return_value=1), mock.patch(
+            "corporate.lib.stripe.RemoteServerBillingSession.current_count_for_billed_licenses",
+            return_value=10,
         ), self.assertLogs(
             "zilencer.views", level="INFO"
         ):
@@ -1519,8 +1519,9 @@ def test_mobile_pushes_received_count(self) -> None:
         }
         with time_machine.travel(now, tick=False), mock.patch(
             "zilencer.views.send_android_push_notification", return_value=1
-        ), mock.patch(
-            "zilencer.views.send_apple_push_notification", return_value=1
+        ), mock.patch("zilencer.views.send_apple_push_notification", return_value=1), mock.patch(
+            "corporate.lib.stripe.RemoteServerBillingSession.current_count_for_billed_licenses",
+            return_value=10,
         ), self.assertLogs(
             "zilencer.views", level="INFO"
         ):
@@ -1578,8 +1579,9 @@ def test_mobile_pushes_received_count(self) -> None:
 
         with time_machine.travel(now, tick=False), mock.patch(
             "zilencer.views.send_android_push_notification", return_value=1
-        ), mock.patch(
-            "zilencer.views.send_apple_push_notification", return_value=1
+        ), mock.patch("zilencer.views.send_apple_push_notification", return_value=1), mock.patch(
+            "corporate.lib.stripe.RemoteServerBillingSession.current_count_for_billed_licenses",
+            return_value=10,
         ), self.assertLogs(
             "zilencer.views", level="INFO"
         ):

analytics/tests/test_stats_views.py

@@ -10,7 +10,8 @@
 from analytics.views.stats import rewrite_client_arrays, sort_by_totals, sort_client_labels
 from zerver.lib.test_classes import ZulipTestCase
 from zerver.lib.timestamp import ceiling_to_day, ceiling_to_hour, datetime_to_timestamp
-from zerver.models import Client, get_realm
+from zerver.models import Client
+from zerver.models.realms import get_realm
 
 
 class TestStatsEndpoint(ZulipTestCase):

analytics/tests/test_support_views.py

@@ -13,6 +13,8 @@
     Customer,
     CustomerPlan,
     LicenseLedger,
+    SponsoredPlanTypes,
+    ZulipSponsorshipRequest,
     get_current_plan_by_realm,
     get_customer_by_realm,
 )
@@ -21,15 +23,8 @@
 from zerver.actions.user_settings import do_change_user_setting
 from zerver.lib.test_classes import ZulipTestCase
 from zerver.lib.test_helpers import reset_email_visibility_to_everyone_in_zulip_realm
-from zerver.models import (
-    MultiuseInvite,
-    PreregistrationUser,
-    Realm,
-    UserMessage,
-    UserProfile,
-    get_org_type_display_name,
-    get_realm,
-)
+from zerver.models import MultiuseInvite, PreregistrationUser, Realm, UserMessage, UserProfile
+from zerver.models.realms import OrgTypeEnum, get_org_type_display_name, get_realm
 from zilencer.lib.remote_counts import MissingDataError
 
 if TYPE_CHECKING:
@@ -43,6 +38,24 @@
 class TestRemoteServerSupportEndpoint(ZulipTestCase):
     @override
     def setUp(self) -> None:
+        def add_sponsorship_request(
+            hostname: str, org_type: int, website: str, paid_users: str, plan: str
+        ) -> None:
+            remote_server = RemoteZulipServer.objects.get(hostname=hostname)
+            customer = Customer.objects.create(
+                remote_server=remote_server, sponsorship_pending=True
+            )
+            ZulipSponsorshipRequest.objects.create(
+                customer=customer,
+                org_type=org_type,
+                org_website=website,
+                org_description="We help people.",
+                expected_total_users="20-35",
+                paid_users_count=paid_users,
+                paid_users_description="",
+                requested_plan=plan,
+            )
+
         super().setUp()
 
         # Set up some initial example data.
@@ -52,6 +65,23 @@ def setUp(self) -> None:
                 hostname=hostname, contact_email=f"admin@{hostname}", plan_type=1, uuid=uuid.uuid4()
             )
 
+        # Add example sponsorship request data
+        add_sponsorship_request(
+            hostname="zulip-1.example.com",
+            org_type=OrgTypeEnum.Community.value,
+            website="",
+            paid_users="None",
+            plan=SponsoredPlanTypes.BUSINESS.value,
+        )
+
+        add_sponsorship_request(
+            hostname="zulip-2.example.com",
+            org_type=OrgTypeEnum.OpenSource.value,
+            website="example.org",
+            paid_users="",
+            plan=SponsoredPlanTypes.COMMUNITY.value,
+        )
+
     def test_search(self) -> None:
         self.login("cordelia")
 
@@ -77,6 +107,19 @@ def test_search(self) -> None:
         self.assert_in_success_response(["<b>Max monthly messages</b>: 1000"], result)
         self.assert_not_in_success_response(["<h3>zulip-2.example.com</h3>"], result)
 
+        # Sponsorship request information
+        self.assert_in_success_response(["<li><b>Organization type</b>: Community</li>"], result)
+        self.assert_in_success_response(
+            ["<li><b>Organization website</b>: No website submitted</li>"], result
+        )
+        self.assert_in_success_response(["<li><b>Paid users</b>: None</li>"], result)
+        self.assert_in_success_response(["<li><b>Requested plan</b>: Business</li>"], result)
+        self.assert_in_success_response(
+            ["<li><b>Organization description</b>: We help people.</li>"], result
+        )
+        self.assert_in_success_response(["<li><b>Estimated total users</b>: 20-35</li>"], result)
+        self.assert_in_success_response(["<li><b>Description of paid users</b>: </li>"], result)
+
         with mock.patch(
             "analytics.views.support.compute_max_monthly_messages", side_effect=MissingDataError
         ):
@@ -96,6 +139,35 @@ def test_search(self) -> None:
         self.assert_in_success_response(["<b>Contact email</b>: admin@zulip-2.example.com"], result)
         self.assert_not_in_success_response(["<h3>zulip-1.example.com</h3>"], result)
 
+        # Sponsorship request information
+        self.assert_in_success_response(
+            ["<li><b>Organization type</b>: Open-source project</li>"], result
+        )
+        self.assert_in_success_response(
+            ["<li><b>Organization website</b>: example.org</li>"], result
+        )
+        self.assert_in_success_response(["<li><b>Paid users</b>: </li>"], result)
+        self.assert_in_success_response(["<li><b>Requested plan</b>: Community</li>"], result)
+        self.assert_in_success_response(
+            ["<li><b>Organization description</b>: We help people.</li>"], result
+        )
+        self.assert_in_success_response(["<li><b>Estimated total users</b>: 20-35</li>"], result)
+        self.assert_in_success_response(["<li><b>Description of paid users</b>: </li>"], result)
+
+        result = self.client_get("/activity/remote/support", {"q": "admin@zulip-3.example.com"})
+        self.assert_in_success_response(["<h3>zulip-3.example.com</h3>"], result)
+        self.assert_in_success_response(["<b>Contact email</b>: admin@zulip-3.example.com"], result)
+        self.assert_not_in_success_response(["<h3>zulip-1.example.com</h3>"], result)
+
+        # Sponsorship request information
+        self.assert_not_in_success_response(
+            ["<li><b>Organization description</b>: We help people.</li>"], result
+        )
+        self.assert_not_in_success_response(
+            ["<li><b>Estimated total users</b>: 20-35</li>"], result
+        )
+        self.assert_not_in_success_response(["<li><b>Description of paid users</b>: </li>"], result)
+
 
 class TestSupportEndpoint(ZulipTestCase):
     def test_search(self) -> None:

analytics/views/installation_activity.py

@@ -25,7 +25,8 @@
 from analytics.views.support import get_plan_type_string
 from zerver.decorator import require_server_admin
 from zerver.lib.request import has_request_variables
-from zerver.models import Realm, get_org_type_display_name
+from zerver.models import Realm
+from zerver.models.realms import get_org_type_display_name
 
 if settings.BILLING_ENABLED:
     from corporate.lib.analytics import (

analytics/views/remote_activity.py

@@ -10,6 +10,7 @@
     remote_installation_stats_link,
     remote_installation_support_link,
 )
+from corporate.lib.analytics import get_plan_data_by_remote_server
 from zerver.decorator import require_server_admin
 from zilencer.models import get_remote_server_guest_and_non_guest_count
 
@@ -69,6 +70,7 @@ def get_remote_server_activity(request: HttpRequest) -> HttpResponse:
         left join icount on icount.server_id = rserver.id
         left join mobile_push_forwarded_count on mobile_push_forwarded_count.server_id = rserver.id
         left join remote_push_devices on remote_push_devices.server_id = rserver.id
+        where not deactivated
         order by latest_value DESC NULLS LAST, push_user_count DESC NULLS LAST
     """
     )
@@ -82,6 +84,9 @@ def get_remote_server_activity(request: HttpRequest) -> HttpResponse:
         "Mobile users",
         "Last update time",
         "Mobile pushes forwarded",
+        "Plan name",
+        "Plan status",
+        "ARR",
         "Non guest users",
         "Guest users",
         "Links",
@@ -90,13 +95,27 @@ def get_remote_server_activity(request: HttpRequest) -> HttpResponse:
     rows = get_query_data(query)
     total_row = []
     totals_columns = [4, 5]
+    plan_data_by_remote_server = get_plan_data_by_remote_server()
+
     for row in rows:
-        stats = remote_installation_stats_link(row[0])
-        support = remote_installation_support_link(row[1])
-        links = stats + " " + support
+        # Add estimated revenue for server
+        server_plan_data = plan_data_by_remote_server.get(row[0])
+        if server_plan_data is None:
+            row.append("---")
+            row.append("---")
+            row.append("---")
+        else:
+            row.append(server_plan_data.current_plan_name)
+            row.append(server_plan_data.current_status)
+            row.append(server_plan_data.annual_revenue)
+        # Add user counts
         remote_server_counts = get_remote_server_guest_and_non_guest_count(row[0])
         row.append(remote_server_counts.non_guest_user_count)
         row.append(remote_server_counts.guest_user_count)
+        # Add links
+        stats = remote_installation_stats_link(row[0])
+        support = remote_installation_support_link(row[1])
+        links = stats + " " + support
         row.append(links)
     for i, col in enumerate(cols):
         if col == "Last update time":

analytics/views/stats.py

@@ -36,7 +36,8 @@
 from zerver.lib.streams import access_stream_by_id
 from zerver.lib.timestamp import convert_to_UTC
 from zerver.lib.validator import to_non_negative_int
-from zerver.models import Client, Realm, Stream, UserProfile, get_realm
+from zerver.models import Client, Realm, Stream, UserProfile
+from zerver.models.realms import get_realm
 
 if settings.ZILENCER_ENABLED:
     from zilencer.models import RemoteInstallationCount, RemoteRealmCount, RemoteZulipServer