Merge pull request #2208 from cisagov/za/2185-add-user-fields

(on getgov-ab) Ticket #2185: Add middle_name and title to User

src/registrar/admin.py

@@ -594,7 +594,7 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
             None,
             {"fields": ("username", "password", "status", "verification_type")},
         ),
-        ("Personal Info", {"fields": ("first_name", "last_name", "email")}),
+        ("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "email", "title")}),
         (
             "Permissions",
             {
@@ -625,7 +625,7 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
                 )
             },
         ),
-        ("Personal Info", {"fields": ("first_name", "last_name", "email")}),
+        ("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "email", "title")}),
         (
             "Permissions",
             {
@@ -651,7 +651,9 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
     analyst_readonly_fields = [
         "Personal Info",
         "first_name",
+        "middle_name",
         "last_name",
+        "title",
         "email",
         "Permissions",
         "is_active",

src/registrar/migrations/0095_user_middle_name_user_title.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.10 on 2024-05-22 14:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0094_create_groups_v12"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="middle_name",
+            field=models.CharField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="title",
+            field=models.CharField(blank=True, null=True, verbose_name="title / role"),
+        ),
+    ]

src/registrar/models/user.py

@@ -80,6 +80,17 @@ class User(AbstractUser):
         db_index=True,
     )
 
+    middle_name = models.CharField(
+        null=True,
+        blank=True,
+    )
+
+    title = models.CharField(
+        null=True,
+        blank=True,
+        verbose_name="title / role",
+    )
+
     verification_type = models.CharField(
         choices=VerificationTypeChoices.choices,
         null=True,

src/registrar/tests/test_admin.py

@@ -3534,7 +3534,7 @@ class TestMyUserAdmin(TestCase):
                         )
                     },
                 ),
-                ("Personal Info", {"fields": ("first_name", "last_name", "email")}),
+                ("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "email", "title")}),
                 ("Permissions", {"fields": ("is_active", "groups")}),
                 ("Important dates", {"fields": ("last_login", "date_joined")}),
             )