paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote-support: Improve search results in view code.

Browse Source 
Removes prefetch of remote realms on the remote server query
because, by excluding the system bot realm when this is referenced,
we end up hitting the database again.

Strips whitespace from query string and makes a few small updates
for readability.
This commit is contained in:
Lauryn Menard
2024-02-21 16:00:59 +01:00
committed by Tim Abbott
parent bd0b5d80ba
commit 8189b94a70
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
corporate/views/support.py
View File

@@ -466,20 +466,15 @@ def support(
def get_remote_servers_for_support( def get_remote_servers_for_support(
email_to_search: Optional[str], hostname_to_search: Optional[str] email_to_search: Optional[str], hostname_to_search: Optional[str]
) -> List["RemoteZulipServer"]: ) -> List["RemoteZulipServer"]:
if not email_to_search and not hostname_to_search: remote_servers_query = RemoteZulipServer.objects.order_by("id").exclude(deactivated=True)
return []
remote_servers_query = (
RemoteZulipServer.objects.order_by("id")
.exclude(deactivated=True)
.prefetch_related("remoterealm_set")
)
if email_to_search: if email_to_search:
remote_servers_query = remote_servers_query.filter(contact_email__iexact=email_to_search) return list(remote_servers_query.filter(contact_email__iexact=email_to_search))
elif hostname_to_search:
remote_servers_query = remote_servers_query.filter(hostname__icontains=hostname_to_search)
return list(remote_servers_query) if hostname_to_search:
return list(remote_servers_query.filter(hostname__icontains=hostname_to_search))
return []
@require_server_admin @require_server_admin
@@ -599,10 +594,11 @@ def remote_servers_support(
email_to_search = None email_to_search = None
hostname_to_search = None hostname_to_search = None
if query: if query:
if "@" in query: search_text = query.strip()
email_to_search = query if "@" in search_text:
email_to_search = search_text
else: else:
hostname_to_search = query hostname_to_search = search_text
remote_servers = get_remote_servers_for_support( remote_servers = get_remote_servers_for_support(
email_to_search=email_to_search, hostname_to_search=hostname_to_search email_to_search=email_to_search, hostname_to_search=hostname_to_search
@@ -618,7 +614,7 @@ def remote_servers_support(
) )
remote_realms[remote_server.id] = remote_realms_for_server remote_realms[remote_server.id] = remote_realms_for_server
# Get plan data for remote realms # Get plan data for remote realms
for remote_realm in remote_realms[remote_server.id]: for remote_realm in remote_realms_for_server:
realm_billing_session = RemoteRealmBillingSession(remote_realm=remote_realm) realm_billing_session = RemoteRealmBillingSession(remote_realm=remote_realm)
remote_realm_data = get_data_for_support_view(realm_billing_session) remote_realm_data = get_data_for_support_view(realm_billing_session)
realm_support_data[remote_realm.id] = remote_realm_data realm_support_data[remote_realm.id] = remote_realm_data