From aac6d6cddb02fb581da14ccfc9c7a7840de6ffeb Mon Sep 17 00:00:00 2001 From: Sahil Batra Date: Fri, 24 May 2024 14:54:18 +0530 Subject: [PATCH] user_groups: Move get_group_setting_value_for_audit_log_data. This commit moves get_group_setting_value_for_audit_log_data to zerver.lib.user_groups. --- zerver/actions/user_groups.py | 11 +---------- zerver/lib/user_groups.py | 11 ++++++++++- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/zerver/actions/user_groups.py b/zerver/actions/user_groups.py index 3b03d5f0b6..58eb92d17c 100644 --- a/zerver/actions/user_groups.py +++ b/zerver/actions/user_groups.py @@ -1,4 +1,3 @@ -from dataclasses import asdict from datetime import datetime from typing import Dict, List, Mapping, Optional, Sequence, TypedDict, Union @@ -11,6 +10,7 @@ from zerver.lib.exceptions import JsonableError from zerver.lib.user_groups import ( AnonymousSettingGroupDict, get_group_setting_value_for_api, + get_group_setting_value_for_audit_log_data, get_role_based_system_groups_dict, set_defaults_for_group_settings, ) @@ -433,15 +433,6 @@ def check_delete_user_group(user_group: NamedUserGroup, *, acting_user: UserProf do_send_delete_user_group_event(acting_user.realm, user_group_id, acting_user.realm.id) -def get_group_setting_value_for_audit_log_data( - setting_value: Union[int, AnonymousSettingGroupDict], -) -> Union[int, Dict[str, List[int]]]: - if isinstance(setting_value, int): - return setting_value - - return asdict(setting_value) - - @transaction.atomic(savepoint=False) def do_change_user_group_permission_setting( user_group: NamedUserGroup, diff --git a/zerver/lib/user_groups.py b/zerver/lib/user_groups.py index a7dcce9e5e..ec6779463e 100644 --- a/zerver/lib/user_groups.py +++ b/zerver/lib/user_groups.py @@ -1,5 +1,5 @@ from contextlib import contextmanager -from dataclasses import dataclass +from dataclasses import asdict, dataclass from typing import Collection, Dict, Iterable, Iterator, List, Mapping, Optional, TypedDict, Union from django.conf import settings @@ -765,3 +765,12 @@ def validate_group_setting_value_change( raise PreviousSettingValueMismatchedError return not are_both_group_setting_values_equal(current_setting_api_value, new_setting_value) + + +def get_group_setting_value_for_audit_log_data( + setting_value: Union[int, AnonymousSettingGroupDict], +) -> Union[int, Dict[str, List[int]]]: + if isinstance(setting_value, int): + return setting_value + + return asdict(setting_value)