Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
default_streams: Batch group name lookups into single query.
Tim Abbott071f8908b317
diff --git a/zerver/actions/default_streams.py b/zerver/actions/default_streams.pyindex 0dcdf13871a..50d0418459d 100644--- a/zerver/actions/default_streams.py+++ b/zerver/actions/default_streams.py@@ -37,15 +37,19 @@ def check_default_stream_group_name(group_name: str) -> None:def lookup_default_stream_groups(default_stream_group_names: list[str], realm: Realm) -> list[DefaultStreamGroup]:+ groups_by_name = {+ group.name: group+ for group in DefaultStreamGroup.objects.filter(+ realm=realm, name__in=default_stream_group_names+ )+ }default_stream_groups = []for group_name in default_stream_group_names:- try:- default_stream_group = DefaultStreamGroup.objects.get(name=group_name, realm=realm)- except DefaultStreamGroup.DoesNotExist:+ if group_name not in groups_by_name:raise JsonableError(_("Invalid default channel group {group_name}").format(group_name=group_name))- default_stream_groups.append(default_stream_group)+ default_stream_groups.append(groups_by_name[group_name])return default_stream_groups