fix: revert #4817 (#4850)

Flagsmith · Nov 21, 2024 · 793a110 · 793a110
1 parent 8fe4d41
commit 793a110
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 150 deletions.
diff --git a/api/tests/unit/users/test_unit_users_migrations.py b/api/tests/unit/users/test_unit_users_migrations.py
diff --git a/api/users/migrations/0039_alter_ffadminuser_first_name.py b/api/users/migrations/0039_alter_ffadminuser_first_name.py
@@ -1,21 +1,5 @@
 # Generated by Django 4.2.16 on 2024-11-04 17:09
-from django.apps.registry import Apps
 from django.db import migrations, models
-from django.db.backends.base.schema import BaseDatabaseSchemaEditor
-from django.db.models import F
-from django.db.models.functions import Left
-
-
-def populate_new_first_name_field(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None:
-    FFAdminUser = apps.get_model("users", "FFAdminUser")
-
-    FFAdminUser.objects.update(first_name_v2=F("first_name"))
-
-
-def populate_old_first_name_field(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None:
-    FFAdminUser = apps.get_model("users", "FFAdminUser")
-
-    FFAdminUser.objects.update(first_name=Left("first_name_v2", 30))
 
 
 class Migration(migrations.Migration):
@@ -25,38 +9,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.AddField(
+        migrations.AlterField(
             model_name="ffadminuser",
-            name="first_name_v2",
-            field=models.CharField(max_length=150, default=""),
+            name="first_name",
+            field=models.CharField(max_length=150, verbose_name="first name"),
         ),
-        migrations.RunPython(populate_new_first_name_field, reverse_code=populate_old_first_name_field),
-        migrations.SeparateDatabaseAndState(
-            state_operations=[
-                migrations.RenameField(
-                    model_name="ffadminuser",
-                    old_name="first_name",
-                    new_name="_first_name_old",
-                ),
-                migrations.RenameField(
-                    model_name="ffadminuser",
-                    old_name="first_name_v2",
-                    new_name="first_name",
-                ),
-                migrations.AlterField(
-                    model_name="ffadminuser",
-                    name="_first_name_old",
-                    field=models.CharField(
-                        db_column="first_name", max_length=30, verbose_name="first name"
-                    ),
-                ),
-                migrations.AlterField(
-                    model_name="ffadminuser",
-                    name="first_name",
-                    field=models.CharField(
-                        db_column="first_name_v2", max_length=150, verbose_name="first name"
-                    ),
-                ),
-            ]
-        )
     ]
diff --git a/api/users/migrations/0040_alter_ffadminuser_first_name_fix.py b/api/users/migrations/0040_alter_ffadminuser_first_name_fix.py
diff --git a/api/users/models.py b/api/users/models.py
@@ -99,9 +99,7 @@ class FFAdminUser(LifecycleModel, AbstractUser):
     email = models.EmailField(unique=True, null=False)
     objects = UserManager()
     username = models.CharField(unique=True, max_length=150, null=True, blank=True)
-    first_name = models.CharField(
-        "first name", max_length=150, db_column="first_name_v2"
-    )
+    first_name = models.CharField("first name", max_length=150)
     last_name = models.CharField("last name", max_length=150)
     google_user_id = models.CharField(max_length=50, null=True, blank=True)
     github_user_id = models.CharField(max_length=50, null=True, blank=True)
@@ -113,10 +111,6 @@ class FFAdminUser(LifecycleModel, AbstractUser):
         choices=SignUpType.choices, max_length=100, blank=True, null=True
     )
 
-    _first_name_old = models.CharField(
-        "first name", max_length=30, db_column="first_name"
-    )
-
     uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
 
     USERNAME_FIELD = "email"