Merge pull request #12 from DevOps-Cloud-Team5/SCRUM-39-profile-page-stuff

Fix account roles for proper registration

Author: Imafe

api/migrations/0001_initial.py

@@ -1,9 +1,7 @@
-# Generated by Django 5.0.2 on 2024-03-07 22:24
+# Generated by Django 5.0.2 on 2024-03-08 09:22
 
 import django.contrib.auth.models
 import django.contrib.auth.validators
-import django.db.models.deletion
-from django.conf import settings
 from django.db import migrations, models
 
 
@@ -25,6 +23,7 @@ class Migration(migrations.Migration):
                 ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
                 ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
                 ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
+                ('force_pw_change', models.BooleanField(default=False)),
                 ('role', models.CharField(choices=[('S', 'Student'), ('T', 'Teacher'), ('A', 'Admin')], default='S', max_length=1)),
             ],
             options={
@@ -42,12 +41,4 @@ class Migration(migrations.Migration):
                 ('schedule', models.JSONField(default=list)),
             ],
         ),
-        migrations.CreateModel(
-            name='UserCourse',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course', to='api.course')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
     ]

api/migrations/0002_alter_user_role_usercourse.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.0.2 on 2024-03-08 09:23
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='role',
+            field=models.CharField(choices=[('student', 'Student'), ('teacher', 'Teacher'), ('admin', 'Admin')], default='student'),
+        ),
+        migrations.CreateModel(
+            name='UserCourse',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course', to='api.course')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

api/migrations/0002_user_force_pw_change.py

@@ -14,9 +14,9 @@
 #         default=AccountRoles.STUDENT,
 #     )
 class AccountRoles(models.TextChoices):
-    STUDENT = "S", "Student"
-    TEACHER = "T", "Teacher"
-    ADMIN = "A", "Admin"
+    STUDENT = "student"
+    TEACHER = "teacher"
+    ADMIN = "admin"
 
 class User(AbstractBaseUser):
 
@@ -34,7 +34,7 @@ class User(AbstractBaseUser):
     force_pw_change = models.BooleanField(default=False)
 
     role = models.CharField(
-        max_length=1,
+        # max_length=1,
         choices=AccountRoles.choices,
         default=AccountRoles.STUDENT,
     )