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

import: Fix import related code for user groups.

Browse Source 
We change the import order to import UserGroup objects before
Stream such that we can set can_remove_subscribers_group correctly.

We do not import UserGroupMembership objects here along with
UserGroup since UserProfile objects are not imported and
GroupGroupMembership are also imported later as these are not
required before.
This commit is contained in:
Sahil Batra
2022-07-20 22:28:32 +05:30
committed by Tim Abbott
parent 49d61d19f4
commit 941bb5a372
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
zerver/lib/import_realm.py
View File

@@ -898,6 +898,7 @@ def import_uploads(
#
# * Client [no deps]
# * Realm [-notifications_stream]
# * UserGroup
# * Stream [only depends on realm]
# * Realm's notifications_stream
# * Now can do all realm_tables
@@ -960,6 +961,17 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int = 1) -> Rea
realm.signup_notifications_stream_id = None
realm.save()
if "zerver_usergroup" in data:
update_model_ids(UserGroup, data, "usergroup")
re_map_foreign_keys(data, "zerver_usergroup", "realm", related_table="realm")
bulk_import_model(data, UserGroup)
# We expect Zulip server exports to contain these system groups,
# this logic here is needed to handle the imports from other services.
role_system_groups_dict: Optional[Dict[int, UserGroup]] = None
if "zerver_usergroup" not in data:
role_system_groups_dict = create_system_user_groups_for_realm(realm)
# Email tokens will automatically be randomly generated when the
# Stream objects are created by Django.
fix_datetime_fields(data, "zerver_stream")
@@ -1170,10 +1182,6 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int = 1) -> Rea
bulk_import_model(data, Service)
if "zerver_usergroup" in data:
re_map_foreign_keys(data, "zerver_usergroup", "realm", related_table="realm")
update_model_ids(UserGroup, data, "usergroup")
bulk_import_model(data, UserGroup)
re_map_foreign_keys(
data, "zerver_usergroupmembership", "user_group", related_table="usergroup"
)
@@ -1192,10 +1200,10 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int = 1) -> Rea
update_model_ids(GroupGroupMembership, data, "groupgroupmembership")
bulk_import_model(data, GroupGroupMembership)
# We expect Zulip server exports to contain these system groups,
# this logic here is needed to handle the imports from other services.
if not UserGroup.objects.filter(realm=realm, is_system_group=True).exists():
role_system_groups_dict = create_system_user_groups_for_realm(realm)
# We expect Zulip server exports to contain UserGroupMembership objects
# for system groups, this logic here is needed to handle the imports from
# other services.
if role_system_groups_dict is not None:
add_users_to_system_user_groups(realm, user_profiles, role_system_groups_dict)
if "zerver_botstoragedata" in data: