From 038582a8c1eef2ac165239bd97e3fef57e66317a Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 27 Oct 2020 16:42:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(applications):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BA=94=E7=94=A8/=E5=BA=94=E7=94=A8=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E7=9A=84=E8=BF=81=E7=A7=BB=E6=96=87=E4=BB=B6=EF=BC=8C=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E5=A4=9A=E7=A7=8D=E5=BA=94=E7=94=A8/=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E6=8E=88=E6=9D=83name=E5=AD=97=E6=AE=B5=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/applications/migrations/0006_application.py | 8 ++++---- apps/perms/migrations/0016_applicationpermission.py | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/applications/migrations/0006_application.py b/apps/applications/migrations/0006_application.py index 2ff518883..fbe629873 100644 --- a/apps/applications/migrations/0006_application.py +++ b/apps/applications/migrations/0006_application.py @@ -102,10 +102,10 @@ def migrate_and_integrate_applications(apps, schema_editor): for application_json in applications_json if application_json['category'] in CATEGORY_LIST ] - applications_created = application_model.objects.bulk_create(applications) - print('Migrate and integrate applications count: {}/{}'.format( - len(applications_created), len(applications_json) - )) + for application in applications: + if application_model.objects.using(db_alias).filter(name=application.name).exists(): + application.name = '{}-{}'.format(application.name, application.type) + application.save() class Migration(migrations.Migration): diff --git a/apps/perms/migrations/0016_applicationpermission.py b/apps/perms/migrations/0016_applicationpermission.py index d11162b3d..640022c6b 100644 --- a/apps/perms/migrations/0016_applicationpermission.py +++ b/apps/perms/migrations/0016_applicationpermission.py @@ -156,7 +156,10 @@ def migrate_and_integrate_application_permissions(apps, schema_editor): ] # create - new_app_perm_model.objects.using(db_alias).bulk_create(new_app_perm_objects) + for new_app_perm_object in new_app_perm_objects: + if new_app_perm_model.objects.using(db_alias).filter(name=new_app_perm_object.name).exists(): + new_app_perm_object.name = '{}-{}'.format(new_app_perm_object.name, str(new_app_perm_object.id)[:4]) + new_app_perm_object.save() new_app_perm_relation_app_model.objects.using(db_alias).bulk_create(new_app_perm_relation_app_objects) new_app_perm_relation_system_user_model.objects.using(db_alias).bulk_create(new_app_perm_relation_system_user_objects) new_app_perm_relation_user_group_model.objects.using(db_alias).bulk_create(new_app_perm_relation_user_group_objects)