Merge pull request #54 from codersforcauses/issue-41-Update_user_model

Issue 41 update user model

Author: SafetyInObscurity

server/.env.example

@@ -12,6 +12,5 @@ POSTGRES_PORT=5432
 
 DJANGO_SUPERUSER_PASSWORD=Password123
 DJANGO_SUPERUSER_EMAIL=admin@test.com
-DJANGO_SUPERUSER_USERNAME=admin
 
 FRONTEND_URL="http://localhost:3000"

server/event_registration/admin.py

@@ -6,11 +6,11 @@
 @admin.register(User)
 class UserAdmin(BaseUserAdmin):
     ordering = ["email"]
-    list_display = ["email", "role", "is_staff", "is_active", "last_login"]
-    search_fields = ["email"]
+    list_display = ["email", "first_name", "middle_name", "last_name", "is_staff", "is_superuser", "is_active", "last_login"]
+    search_fields = ["email", "first_name", "last_name"]
     fieldsets = (
         (None, {"fields": ("email", "password")}),
-        ("Personal info", {"fields": ("role",)}),
+        ("Personal info", {"fields": ("first_name", "middle_name", "last_name")}),
         ("Permissions", {"fields": ("is_active", "is_staff", "is_superuser", "groups", "user_permissions")}),
         ("Important dates", {"fields": ("last_login", "created_at")}),
     )

server/event_registration/migrations/0005_remove_user_role_user_first_name_user_last_name_and_more.py

@@ -0,0 +1,82 @@
+# Generated by Django 5.1.10 on 2025-07-12 03:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("event_registration", "0004_registrantdetail"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="user",
+            name="role",
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="first_name",
+            field=models.CharField(blank=True, max_length=100),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="last_name",
+            field=models.CharField(blank=True, max_length=100),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="middle_name",
+            field=models.CharField(blank=True, max_length=100),
+        ),
+        migrations.AlterField(
+            model_name="registrantdetail",
+            name="date_of_birth",
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="registrantdetail",
+            name="has_dietary_requirements",
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name="registrantdetail",
+            name="has_pre_existing_conditions",
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name="registrantdetail",
+            name="has_travel_insurance",
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name="registrantdetail",
+            name="requires_wheelchair_assistance",
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name="registrantdetail",
+            name="speaks_english",
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name="registrantdetail",
+            name="transplant_date",
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="registrantdetail",
+            name="wants_junior_activities_info",
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name="registrantdetail",
+            name="wants_to_volunteer",
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="created_at",
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+    ]

server/event_registration/models.py

@@ -19,27 +19,21 @@ def create_user(self, email, password=None, **extra_fields):
     def create_superuser(self, email, password=None, **extra_fields):
         extra_fields.setdefault("is_staff", True)
         extra_fields.setdefault("is_superuser", True)
-        extra_fields.setdefault("role", "ADMIN")
         return self.create_user(email, password, **extra_fields)
 
 
 class User(AbstractBaseUser, PermissionsMixin):
-    ROLE_CHOICES = (
-        ("ADMIN", "Admin"),
-        ("PARTICIPANT", "Participant"),
-    )
 
     email = models.EmailField(unique=True)
-    role = models.CharField(
-        max_length=20,
-        choices=ROLE_CHOICES,
-        default="PARTICIPANT",
-    )
     is_active = models.BooleanField(default=True)
     is_staff = models.BooleanField(default=False)  # Controls admin site access
-    created_at = models.DateTimeField(default=timezone.now)
+    created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
+    first_name = models.CharField(max_length=100, blank=True)
+    middle_name = models.CharField(max_length=100, blank=True)
+    last_name = models.CharField(max_length=100, blank=True)
+
     USERNAME_FIELD = "email"
     REQUIRED_FIELDS = []