merge: with v3

apps/applications/migrations/0010_appaccount_historicalappaccount.py

@@ -71,6 +71,6 @@ class Migration(migrations.Migration):
                 'verbose_name': 'Account',
                 'unique_together': {('username', 'app', 'systemuser')},
             },
-            bases=(models.Model, assets.models.base.AuthMixin),
+            bases=(models.Model,),
         ),
     ]

apps/applications/migrations/0022_auto_20220714_1046.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.2.12 on 2022-07-14 02:46
-
-from django.db import migrations
-
-
-def migrate_db_oracle_version_to_attrs(apps, schema_editor):
-    db_alias = schema_editor.connection.alias
-    model = apps.get_model("applications", "Application")
-    oracles = list(model.objects.using(db_alias).filter(type='oracle'))
-    for o in oracles:
-        o.attrs['version'] = '12c'
-    model.objects.using(db_alias).bulk_update(oracles, ['attrs'])
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('applications', '0021_auto_20220629_1826'),
-    ]
-
-    operations = [
-        migrations.RunPython(migrate_db_oracle_version_to_attrs)
-    ]

apps/applications/migrations/0022_auto_20220817_1346.py

@@ -0,0 +1,50 @@
+# Generated by Django 3.2.14 on 2022-08-17 05:46
+
+from django.db import migrations
+
+
+def migrate_db_oracle_version_to_attrs(apps, schema_editor):
+    db_alias = schema_editor.connection.alias
+    model = apps.get_model("applications", "Application")
+    oracles = list(model.objects.using(db_alias).filter(type='oracle'))
+    for o in oracles:
+        o.attrs['version'] = '12c'
+    model.objects.using(db_alias).bulk_update(oracles, ['attrs'])
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('applications', '0021_auto_20220629_1826'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_db_oracle_version_to_attrs),
+        migrations.AlterUniqueTogether(
+            name='account',
+            unique_together=None,
+        ),
+        migrations.RemoveField(
+            model_name='account',
+            name='app',
+        ),
+        migrations.RemoveField(
+            model_name='account',
+            name='systemuser',
+        ),
+        migrations.RemoveField(
+            model_name='application',
+            name='domain',
+        ),
+        migrations.RemoveField(
+            model_name='historicalaccount',
+            name='app',
+        ),
+        migrations.RemoveField(
+            model_name='historicalaccount',
+            name='history_user',
+        ),
+        migrations.RemoveField(
+            model_name='historicalaccount',
+            name='systemuser',
+        ),
+    ]

apps/applications/migrations/0023_auto_20220817_1716.py

@@ -1,6 +1,5 @@
-# Generated by Django 3.1.14 on 2022-07-15 07:56
+# Generated by Django 3.2.14 on 2022-08-17 09:16
 import time
-from collections import defaultdict
 
 from django.db import migrations
 
@@ -40,9 +39,22 @@ def migrate_account_dirty_data(apps, schema_editor):
 
 class Migration(migrations.Migration):
     dependencies = [
-        ('applications', '0022_auto_20220714_1046'),
+        ('applications', '0022_auto_20220817_1346'),
+        ('perms', '0031_auto_20220816_1600'),
+        ('ops', '0022_auto_20220817_1346'),
+        ('assets', '0105_auto_20220817_1544'),
+        ('tickets', '0020_auto_20220817_1346'),
     ]
 
     operations = [
         migrations.RunPython(migrate_account_dirty_data),
+        migrations.DeleteModel(
+            name='Account',
+        ),
+        migrations.DeleteModel(
+            name='HistoricalAccount',
+        ),
+        migrations.DeleteModel(
+            name='ApplicationUser',
+        ),
     ]

apps/applications/migrations/0024_auto_20220818_1057.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.14 on 2022-08-18 02:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('applications', '0023_auto_20220817_1716'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='application',
+            name='category',
+            field=models.CharField(max_length=16, verbose_name='Category'),
+        ),
+        migrations.AlterField(
+            model_name='application',
+            name='type',
+            field=models.CharField(max_length=16, verbose_name='Type'),
+        ),
+    ]