paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 12:03:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

user_groups: Rename get_user_group_direct_members function.

Browse Source 
This commit renames get_user_group_direct_members function to
get_user_group_direct_member_ids as it returns a list of ids
and to avoid it being parallel to get_recursive_group_members,
which returns a QuerySet.
This commit is contained in:
Sahil Batra
2022-04-27 15:29:25 +05:30
committed by Tim Abbott
parent 0f01e3d327
commit d9d27b459d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/email_notifications.py
View File

@@ -32,7 +32,7 @@ from zerver.lib.url_encoding import (
stream_narrow_url, stream_narrow_url,
topic_narrow_url, topic_narrow_url,
) )
from zerver.lib.user_groups import get_user_group_direct_members from zerver.lib.user_groups import get_user_group_direct_member_ids
from zerver.models import ( from zerver.models import (
Message, Message,
Recipient, Recipient,
@@ -372,7 +372,7 @@ def get_mentioned_user_group_name(
smallest_user_group_name = None smallest_user_group_name = None
for user_group_id in mentioned_user_group_ids: for user_group_id in mentioned_user_group_ids:
current_user_group = UserGroup.objects.get(id=user_group_id, realm=user_profile.realm) current_user_group = UserGroup.objects.get(id=user_group_id, realm=user_profile.realm)
current_user_group_size = len(get_user_group_direct_members(current_user_group)) current_user_group_size = len(get_user_group_direct_member_ids(current_user_group))
if current_user_group_size < smallest_user_group_size: if current_user_group_size < smallest_user_group_size:
# If multiple user groups are mentioned, we prefer the # If multiple user groups are mentioned, we prefer the

6
zerver/lib/user_groups.py
View File

@@ -23,7 +23,7 @@ def access_user_group_by_id(
return user_group return user_group
if user_group.is_system_group: if user_group.is_system_group:
raise JsonableError(_("Insufficient permission")) raise JsonableError(_("Insufficient permission"))
group_member_ids = get_user_group_direct_members(user_group) group_member_ids = get_user_group_direct_member_ids(user_group)
if ( if (
not user_profile.is_realm_admin not user_profile.is_realm_admin
and not user_profile.is_moderator and not user_profile.is_moderator
@@ -114,7 +114,7 @@ def create_user_group(
return user_group return user_group
def get_user_group_direct_members(user_group: UserGroup) -> List[int]: def get_user_group_direct_member_ids(user_group: UserGroup) -> List[int]:
return UserGroupMembership.objects.filter(user_group=user_group).values_list( return UserGroupMembership.objects.filter(user_group=user_group).values_list(
"user_profile_id", flat=True "user_profile_id", flat=True
) )
@@ -172,7 +172,7 @@ def get_user_group_member_ids(
user_group: UserGroup, *, direct_member_only: bool = False user_group: UserGroup, *, direct_member_only: bool = False
) -> List[int]: ) -> List[int]:
if direct_member_only: if direct_member_only:
member_ids = get_user_group_direct_members(user_group) member_ids = get_user_group_direct_member_ids(user_group)
else: else:
member_ids = get_recursive_group_members(user_group).values_list("id", flat=True) member_ids = get_recursive_group_members(user_group).values_list("id", flat=True)

4
zerver/views/user_groups.py
View File

@@ -22,7 +22,7 @@ from zerver.lib.user_groups import (
access_user_groups_as_potential_subgroups, access_user_groups_as_potential_subgroups,
get_direct_memberships_of_users, get_direct_memberships_of_users,
get_subgroup_ids, get_subgroup_ids,
get_user_group_direct_members, get_user_group_direct_member_ids,
get_user_group_member_ids, get_user_group_member_ids,
is_user_in_group, is_user_in_group,
user_groups_in_realm_serialized, user_groups_in_realm_serialized,
@@ -145,7 +145,7 @@ def remove_members_from_group_backend(
user_profiles = user_ids_to_users(members, user_profile.realm) user_profiles = user_ids_to_users(members, user_profile.realm)
user_group = access_user_group_by_id(user_group_id, user_profile) user_group = access_user_group_by_id(user_group_id, user_profile)
group_member_ids = get_user_group_direct_members(user_group) group_member_ids = get_user_group_direct_member_ids(user_group)
for member in members: for member in members:
if member not in group_member_ids: if member not in group_member_ids:
raise JsonableError(_("There is no member '{}' in this user group").format(member)) raise JsonableError(_("There is no member '{}' in this user group").format(member))