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

user_groups: Improve bulk membership change logic.

Browse Source 
Adds support for bulk-adjusting a single user's membership in multiple
user groups in a single transaction in the low-level actions
functions, for future use by work on #9957.
This commit is contained in:
Tim Abbott
2023-09-28 16:45:53 -07:00
committed by Mateusz Mandera
parent c12d249627
commit ef5fee4778
4 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
zerver/actions/user_groups.py
View File

@@ -151,13 +151,13 @@ def update_users_in_full_members_system_group(
new_full_member_ids = [user["id"] for user in new_full_members]
if len(old_full_members) > 0:
remove_members_from_user_group(
full_members_system_group, old_full_member_ids, acting_user=acting_user
bulk_remove_members_from_user_groups(
[full_members_system_group], old_full_member_ids, acting_user=acting_user
)
if len(new_full_members) > 0:
bulk_add_members_to_user_group(
full_members_system_group, new_full_member_ids, acting_user=acting_user
bulk_add_members_to_user_groups(
[full_members_system_group], new_full_member_ids, acting_user=acting_user
)
@@ -269,12 +269,21 @@ def do_send_user_group_members_update_event(
@transaction.atomic(savepoint=False)
def bulk_add_members_to_user_group(
user_group: UserGroup, user_profile_ids: List[int], *, acting_user: Optional[UserProfile]
def bulk_add_members_to_user_groups(
user_groups: List[UserGroup],
user_profile_ids: List[int],
*,
acting_user: Optional[UserProfile],
) -> None:
# All intended callers of this function involve a single user
# being added to one or more groups, or many users being added to
# a single group; but it's easy enough for the implementation to
# support both.
memberships = [
UserGroupMembership(user_group_id=user_group.id, user_profile_id=user_id)
for user_id in user_profile_ids
for user_group in user_groups
]
UserGroupMembership.objects.bulk_create(memberships)
now = timezone_now()
@@ -288,17 +297,27 @@ def bulk_add_members_to_user_group(
acting_user=acting_user,
)
for user_id in user_profile_ids
for user_group in user_groups
)
do_send_user_group_members_update_event("add_members", user_group, user_profile_ids)
for user_group in user_groups:
do_send_user_group_members_update_event("add_members", user_group, user_profile_ids)
@transaction.atomic(savepoint=False)
def remove_members_from_user_group(
user_group: UserGroup, user_profile_ids: List[int], *, acting_user: Optional[UserProfile]
def bulk_remove_members_from_user_groups(
user_groups: List[UserGroup],
user_profile_ids: List[int],
*,
acting_user: Optional[UserProfile],
) -> None:
# All intended callers of this function involve a single user
# being added to one or more groups, or many users being added to
# a single group; but it's easy enough for the implementation to
# support both.
UserGroupMembership.objects.filter(
user_group_id=user_group.id, user_profile_id__in=user_profile_ids
user_group__in=user_groups, user_profile_id__in=user_profile_ids
).delete()
now = timezone_now()
RealmAuditLog.objects.bulk_create(
@@ -311,9 +330,11 @@ def remove_members_from_user_group(
acting_user=acting_user,
)
for user_id in user_profile_ids
for user_group in user_groups
)
do_send_user_group_members_update_event("remove_members", user_group, user_profile_ids)
for user_group in user_groups:
do_send_user_group_members_update_event("remove_members", user_group, user_profile_ids)
def do_send_subgroups_update_event(