From eae0ef4c0e557bb95bface6f844a01f0ebc670b8 Mon Sep 17 00:00:00 2001 From: Zixuan James Li Date: Sun, 20 Nov 2022 18:43:48 -0800 Subject: [PATCH] user_groups: Track acting user for do_update_user_group_name. This is a prep-commit for populating RealmAuditLogs for changes made to UserGroup. Signed-off-by: Zixuan James Li --- zerver/actions/user_groups.py | 4 +++- zerver/tests/test_events.py | 4 +++- zerver/views/user_groups.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/zerver/actions/user_groups.py b/zerver/actions/user_groups.py index a7c68787bf..a34b7f59e3 100644 --- a/zerver/actions/user_groups.py +++ b/zerver/actions/user_groups.py @@ -134,7 +134,9 @@ def do_send_user_group_update_event(user_group: UserGroup, data: Dict[str, str]) send_event(user_group.realm, event, active_user_ids(user_group.realm_id)) -def do_update_user_group_name(user_group: UserGroup, name: str) -> None: +def do_update_user_group_name( + user_group: UserGroup, name: str, *, acting_user: Optional[UserProfile] +) -> None: try: user_group.name = name user_group.save(update_fields=["name"]) diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py index 5ab20f6c13..e60b7327b4 100644 --- a/zerver/tests/test_events.py +++ b/zerver/tests/test_events.py @@ -1286,7 +1286,9 @@ class NormalActionsTest(BaseAction): # Test name update backend = UserGroup.objects.get(name="backend") - events = self.verify_action(lambda: do_update_user_group_name(backend, "backendteam")) + events = self.verify_action( + lambda: do_update_user_group_name(backend, "backendteam", acting_user=None) + ) check_user_group_update("events[0]", events[0], "name") # Test description update diff --git a/zerver/views/user_groups.py b/zerver/views/user_groups.py index 2e035ca925..414a39c887 100644 --- a/zerver/views/user_groups.py +++ b/zerver/views/user_groups.py @@ -71,7 +71,7 @@ def edit_user_group( user_group = access_user_group_by_id(user_group_id, user_profile) if name != user_group.name: - do_update_user_group_name(user_group, name) + do_update_user_group_name(user_group, name, acting_user=user_profile) if description != user_group.description: do_update_user_group_description(user_group, description)