From a45f581b0e966fdc490ab499cf0fcf6dba830ecd Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Thu, 11 Mar 2021 11:09:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=86=20user=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=B0=20default=20=E7=BB=84=E7=BB=87=E6=97=B6=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=87=86?= =?UTF-8?q?=E7=A1=AE=20(#5720)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: xinwen --- apps/orgs/migrations/0010_auto_20210219_1241.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/orgs/migrations/0010_auto_20210219_1241.py b/apps/orgs/migrations/0010_auto_20210219_1241.py index 5e561055b..9a9043f94 100644 --- a/apps/orgs/migrations/0010_auto_20210219_1241.py +++ b/apps/orgs/migrations/0010_auto_20210219_1241.py @@ -47,17 +47,18 @@ def add_all_user_to_default_org(apps, schema_editor): User = apps.get_model('users', 'User') Organization = apps.get_model('orgs', 'Organization') - users = User.objects.all() + users_qs = User.objects.all() default_org = Organization.objects.get(id=default_id) t_start = time.time() - count = users.count() - print(f'{count} users to add') + count = users_qs.count() + print(f'Will add users to default org: {count}') batch_size = 1000 for i in range(0, count, batch_size): - default_org.members.add(*users[i:i+batch_size]) - print(f'Add {i+1}-{i+batch_size} users') + users = list(users_qs[i:i + batch_size]) + default_org.members.add(*users) + print(f'Add users to default org: {i+1}-{i+len(users)}') interval = round((time.time() - t_start) * 1000, 2) print(f'done, use {interval} ms')