fix migrations

Author: mitchelljkotler

…_alter_user_email_alter_user_username.py …0001_squashed_0007_auto_20211102_1707.pydocumentcloud/users/migrations/0001_initial_squashed_0010_user_bio_alter_user_email_alter_user_username.py renamed to documentcloud/users/migrations/0001_squashed_0007_auto_20211102_1707.py documentcloud/users/migrations/0001_initial_squashed_0010_user_bio_alter_user_email_alter_user_username.py renamed to documentcloud/users/migrations/0001_squashed_0007_auto_20211102_1707.py

@@ -1,9 +1,5 @@
-# Generated by Django 5.2.13 on 2026-04-14 18:44
-
-import django.contrib.postgres.fields.citext
 import django.contrib.postgres.operations
 import django.utils.timezone
-import documentcloud.core.fields
 import documentcloud.users.managers
 import squarelet_auth.fields
 import uuid
@@ -20,16 +16,15 @@ class Migration(migrations.Migration):
         ("users", "0005_auto_20200523_1534"),
         ("users", "0006_auto_20200925_2001"),
         ("users", "0007_auto_20211102_1707"),
-        ("users", "0009_user_mailkey"),
-        ("users", "0010_user_bio_alter_user_email_alter_user_username"),
     ]
 
+    initial = True
+
     dependencies = [
         ("auth", "0011_update_proxy_permissions"),
     ]
 
     operations = [
-        django.contrib.postgres.operations.CITextExtension(),
         django.contrib.postgres.operations.CreateCollation(
             name="case_insensitive",
             locale="und-u-ks-level2",
@@ -146,7 +141,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "created_at",
-                    documentcloud.core.fields.AutoCreatedField(
+                    squarelet_auth.fields.AutoCreatedField(
                         default=django.utils.timezone.now,
                         editable=False,
                         help_text="Timestamp of when the user was created",
@@ -155,7 +150,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "updated_at",
-                    documentcloud.core.fields.AutoLastModifiedField(
+                    squarelet_auth.fields.AutoLastModifiedField(
                         default=django.utils.timezone.now,
                         editable=False,
                         help_text="Timestamp of when the user was last updated",
@@ -204,26 +199,6 @@ class Migration(migrations.Migration):
         migrations.RunSQL(
             sql="ALTER SEQUENCE users_user_id_seq RESTART WITH 100000",
         ),
-        migrations.AlterField(
-            model_name="user",
-            name="created_at",
-            field=squarelet_auth.fields.AutoCreatedField(
-                default=django.utils.timezone.now,
-                editable=False,
-                help_text="Timestamp of when the user was created",
-                verbose_name="created at",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="user",
-            name="updated_at",
-            field=squarelet_auth.fields.AutoLastModifiedField(
-                default=django.utils.timezone.now,
-                editable=False,
-                help_text="Timestamp of when the user was last updated",
-                verbose_name="updated at",
-            ),
-        ),
         migrations.AddField(
             model_name="user",
             name="document_language",
@@ -454,22 +429,4 @@ class Migration(migrations.Migration):
                 verbose_name="language",
             ),
         ),
-        migrations.AddField(
-            model_name="user",
-            name="mailkey",
-            field=models.UUIDField(
-                help_text="Mail key for uploading documents via email",
-                null=True,
-                verbose_name="mailkey",
-            ),
-        ),
-        migrations.AddField(
-            model_name="user",
-            name="bio",
-            field=models.TextField(
-                blank=True,
-                help_text="Public bio for the user, in Markdown",
-                verbose_name="bio",
-            ),
-        ),
-    ]
+    ]

documentcloud/users/migrations/0008_squashed_0010_user_bio_alter_user_email_alter_user_username.py

@@ -0,0 +1,46 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    replaces = [
+        ("users", "0008_user_active_addons"),
+        ("users", "0009_user_mailkey"),
+        ("users", "0010_user_bio_alter_user_email_alter_user_username"),
+    ]
+
+    dependencies = [
+        ("addons", "0005_auto_20220330_1908"),
+        ("users", "0001_squashed_0007_auto_20211102_1707"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="active_addons",
+            field=models.ManyToManyField(
+                help_text="Add-Ons shown for this user",
+                related_name="users",
+                to="addons.addon",
+                verbose_name="active add-ons",
+            ),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="mailkey",
+            field=models.UUIDField(
+                help_text="Mail key for uploading documents via email",
+                null=True,
+                verbose_name="mailkey",
+            ),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="bio",
+            field=models.TextField(
+                blank=True,
+                help_text="Public bio for the user, in Markdown",
+                verbose_name="bio",
+            ),
+        ),
+    ]

documentcloud/users/migrations/0008_user_active_addons.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.2.9 on 2022-03-30 19:14
+
+
+# Django
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("addons", "0005_auto_20220330_1908"),
+        ("users", "0007_auto_20211102_1707"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="active_addons",
+            field=models.ManyToManyField(
+                help_text="Add-Ons shown for this user",
+                related_name="users",
+                to="addons.AddOn",
+                verbose_name="active add-ons",
+            ),
+        ),
+    ]

documentcloud/users/migrations/0009_user_mailkey.py

@@ -1,18 +1,23 @@
 # Generated by Django 3.2.9 on 2022-05-27 13:30
 
+# Django
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('users', '0007_auto_20211102_1707'),
+        ("users", "0008_user_active_addons"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='user',
-            name='mailkey',
-            field=models.UUIDField(help_text='Mail key for uploading documents via email', null=True, verbose_name='mailkey'),
+            model_name="user",
+            name="mailkey",
+            field=models.UUIDField(
+                help_text="Mail key for uploading documents via email",
+                null=True,
+                verbose_name="mailkey",
+            ),
         ),
     ]