perf: 删除一部分 system user

apps/authentication/migrations/0012_auto_20220816_1629.py

@@ -0,0 +1,53 @@
+# Generated by Django 3.2.14 on 2022-08-16 08:29
+
+from django.db import migrations, models
+
+
+def migrate_system_user_to_accounts(apps, schema_editor):
+    connection_token_model = apps.get_model("perms", "ConnectionToken")
+    count = 0
+    bulk_size = 10000
+
+    while True:
+        connection_tokens = connection_token_model.objects \
+            .prefect_related('system_users')[count:bulk_size]
+        if not connection_tokens:
+            break
+        count += len(connection_tokens)
+        updated = []
+        for connection_token in connection_tokens:
+            connection_token.account = connection_token.system_user.username
+            updated.append(connection_token)
+        connection_token_model.objects.bulk_update(updated, ['account'])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0011_auto_20220705_1940'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='connectiontoken',
+            name='application',
+        ),
+        migrations.RemoveField(
+            model_name='connectiontoken',
+            name='application_display',
+        ),
+        migrations.RemoveField(
+            model_name='connectiontoken',
+            name='system_user_display',
+        ),
+        migrations.AddField(
+            model_name='connectiontoken',
+            name='account',
+            field=models.CharField(default='', max_length=128, verbose_name='Account'),
+        ),
+        migrations.RunPython(migrate_system_user_to_accounts),
+        migrations.RemoveField(
+            model_name='connectiontoken',
+            name='system_user',
+        )
+    ]

apps/authentication/models.py

@@ -80,25 +80,12 @@ class ConnectionToken(OrgModelMixin, JMSBaseModel):
         related_name='connection_tokens', null=True, blank=True
     )
     user_display = models.CharField(max_length=128, default='', verbose_name=_("User display"))
-    system_user = models.ForeignKey(
-        'assets.SystemUser', on_delete=models.SET_NULL, verbose_name=_('System user'),
-        related_name='connection_tokens', null=True, blank=True
-    )
-    system_user_display = models.CharField(
-        max_length=128, default='', verbose_name=_("System user display")
-    )
     asset = models.ForeignKey(
         'assets.Asset', on_delete=models.SET_NULL, verbose_name=_('Asset'),
         related_name='connection_tokens', null=True, blank=True
     )
     asset_display = models.CharField(max_length=128, default='', verbose_name=_("Asset display"))
-    application = models.ForeignKey(
-        'applications.Application', on_delete=models.SET_NULL, verbose_name=_('Application'),
-        related_name='connection_tokens', null=True, blank=True
-    )
-    application_display = models.CharField(
-        max_length=128, default='', verbose_name=_("Application display")
-    )
+    account = models.CharField(max_length=128, default='', verbose_name=_("Account"))
 
     class Meta:
         ordering = ('-date_expired',)

apps/authentication/serializers/connection_token.py

@@ -7,7 +7,6 @@ from common.utils import pretty_string
 from common.utils.random import random_string
 from assets.models import Asset, SystemUser, Gateway, Domain, CommandFilterRule
 from users.models import User
-from applications.models import Application
 from perms.serializers.base import ActionsField
 
 
@@ -66,9 +65,6 @@ class ConnectionTokenSerializer(OrgResourceModelSerializerMixin):
         if isinstance(asset, Asset):
             tp = ConnectionToken.Type.asset
             org_id = asset.org_id
-        elif isinstance(application, Application):
-            tp = ConnectionToken.Type.application
-            org_id = application.org_id
         else:
             raise serializers.ValidationError(_('Asset or application required'))
 
@@ -148,14 +144,6 @@ class ConnectionTokenRemoteAppSerializer(serializers.Serializer):
     parameters = serializers.CharField(allow_null=True, allow_blank=True)
 
 
-class ConnectionTokenApplicationSerializer(serializers.ModelSerializer):
-    attrs = serializers.JSONField(read_only=True)
-
-    class Meta:
-        model = Application
-        fields = ['id', 'name', 'category', 'type', 'attrs', 'org_id']
-
-
 class ConnectionTokenDomainSerializer(serializers.ModelSerializer):
     gateways = ConnectionTokenGatewaySerializer(many=True, read_only=True)
 
@@ -176,7 +164,6 @@ class ConnectionTokenCmdFilterRuleSerializer(serializers.ModelSerializer):
 class ConnectionTokenSecretSerializer(OrgResourceModelSerializerMixin):
     user = ConnectionTokenUserSerializer(read_only=True)
     asset = ConnectionTokenAssetSerializer(read_only=True)
-    application = ConnectionTokenApplicationSerializer(read_only=True)
     remote_app = ConnectionTokenRemoteAppSerializer(read_only=True)
     system_user = ConnectionTokenSystemUserSerializer(read_only=True)
     gateway = ConnectionTokenGatewaySerializer(read_only=True)