diff --git a/analytics/tests/test_views.py b/analytics/tests/test_views.py
index d027342d39..2fed3edbe5 100644
--- a/analytics/tests/test_views.py
+++ b/analytics/tests/test_views.py
@@ -440,6 +440,11 @@ class TestSupportEndpoint(ZulipTestCase):
'class="copy-button" data-copytext="desdemona@zulip.com, iago@zulip.com"',
], result)
+ def check_othello_user_query_result(result: HttpResponse) -> None:
+ self.assert_in_success_response(['user\n', '
Othello, the Moor of Venice
',
+ 'Email: othello@zulip.com', 'Is active: True
'
+ ], result)
+
def check_zulip_realm_query_result(result: HttpResponse) -> None:
zulip_realm = get_realm("zulip")
self.assert_in_success_response([f'"})
check_hamlet_user_query_result(result)
check_zulip_realm_query_result(result)
diff --git a/analytics/views.py b/analytics/views.py
index 6770ce4657..a118702357 100644
--- a/analytics/views.py
+++ b/analytics/views.py
@@ -1200,7 +1200,7 @@ def support(request: HttpRequest) -> HttpResponse:
if query:
key_words = get_invitee_emails_set(query)
- context["users"] = UserProfile.objects.filter(delivery_email__in=key_words)
+ users = set(UserProfile.objects.filter(delivery_email__in=key_words))
realms = set(Realm.objects.filter(string_id__in=key_words))
for key_word in key_words:
@@ -1217,7 +1217,7 @@ def support(request: HttpRequest) -> HttpResponse:
except Realm.DoesNotExist:
pass
except ValidationError:
- pass
+ users.update(UserProfile.objects.filter(full_name__iexact=key_word))
for realm in realms:
realm.customer = get_customer_by_realm(realm)
@@ -1233,6 +1233,10 @@ def support(request: HttpRequest) -> HttpResponse:
realm.current_plan.licenses = last_ledger_entry.licenses
realm.current_plan.licenses_used = get_latest_seat_count(realm)
+ # full_names can have , in them
+ users.update(UserProfile.objects.filter(full_name__iexact=query))
+
+ context["users"] = users
context["realms"] = realms
confirmations: List[Dict[str, Any]] = []
diff --git a/templates/analytics/support.html b/templates/analytics/support.html
index 4bd256c70b..477080fb22 100644
--- a/templates/analytics/support.html
+++ b/templates/analytics/support.html
@@ -12,7 +12,7 @@