From d24936cbe346b1b1e536a62f0cfb035182c66a9c Mon Sep 17 00:00:00 2001 From: Mateusz Mandera Date: Mon, 27 Jan 2020 18:55:11 +0100 Subject: [PATCH] server_initialization: Use tos_version argument in create_users. --- zerver/lib/server_initialization.py | 2 +- zerver/management/commands/initialize_voyager_db.py | 6 ++++-- zilencer/management/commands/populate_db.py | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/zerver/lib/server_initialization.py b/zerver/lib/server_initialization.py index 2f3a42dd64..f963ddaa9f 100644 --- a/zerver/lib/server_initialization.py +++ b/zerver/lib/server_initialization.py @@ -23,11 +23,11 @@ def create_internal_realm() -> None: do_change_is_admin(email_gateway_bot, True, permission="api_super_user") def create_users(realm: Realm, name_list: Iterable[Tuple[str, str]], + tos_version: Optional[str]=None, bot_type: Optional[int]=None, bot_owner: Optional[UserProfile]=None) -> None: user_set = set() # type: Set[Tuple[str, str, str, bool]] for full_name, email in name_list: short_name = email_to_username(email) user_set.add((email, full_name, short_name, True)) - tos_version = settings.TOS_VERSION if bot_type is None else None bulk_create_users(realm, user_set, bot_type=bot_type, bot_owner=bot_owner, tos_version=tos_version) diff --git a/zerver/management/commands/initialize_voyager_db.py b/zerver/management/commands/initialize_voyager_db.py index eab2f58f9f..78e6d5798f 100644 --- a/zerver/management/commands/initialize_voyager_db.py +++ b/zerver/management/commands/initialize_voyager_db.py @@ -11,12 +11,14 @@ from zerver.models import Realm, UserProfile, email_to_username, get_client, \ settings.TORNADO_SERVER = None -def create_users(realm: Realm, name_list: Iterable[Tuple[str, str]], bot_type: Optional[int]=None) -> None: +def create_users(realm: Realm, name_list: Iterable[Tuple[str, str]], + tos_version: Optional[str]=None, + bot_type: Optional[int]=None) -> None: user_set = set() for full_name, email in name_list: short_name = email_to_username(email) user_set.add((email, full_name, short_name, True)) - bulk_create_users(realm, user_set, bot_type) + bulk_create_users(realm, user_set, bot_type=bot_type, tos_version=tos_version) class Command(BaseCommand): help = "Populate an initial database for Zulip Voyager" diff --git a/zilencer/management/commands/populate_db.py b/zilencer/management/commands/populate_db.py index 68726fb751..3ba6cc2971 100644 --- a/zilencer/management/commands/populate_db.py +++ b/zilencer/management/commands/populate_db.py @@ -262,7 +262,7 @@ class Command(BaseCommand): email = fname.lower() + '@zulip.com' names.append((full_name, email)) - create_users(zulip_realm, names) + create_users(zulip_realm, names, tos_version=settings.TOS_VERSION) iago = get_user("iago@zulip.com", zulip_realm) do_change_is_admin(iago, True) @@ -510,13 +510,13 @@ class Command(BaseCommand): ("Athena Consulting Exchange User (MIT)", "starnine@mit.edu"), ("Esp Classroom (MIT)", "espuser@mit.edu"), ] - create_users(mit_realm, testsuite_mit_users) + create_users(mit_realm, testsuite_mit_users, tos_version=settings.TOS_VERSION) testsuite_lear_users = [ ("King Lear", "king@lear.org"), ("Cordelia Lear", "cordelia@zulip.com"), ] - create_users(lear_realm, testsuite_lear_users) + create_users(lear_realm, testsuite_lear_users, tos_version=settings.TOS_VERSION) if not options["test_suite"]: # To keep the messages.json fixtures file for the test