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

Scrum 39 profile page stuff

Author: MaxMB15

api/migrations/0001_initial.py

@@ -1,7 +1,9 @@
-# Generated by Django 5.0.2 on 2024-03-05 12:00
+# Generated by Django 5.0.2 on 2024-03-07 22:24
 
 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
 
 
@@ -23,7 +25,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')),
-                ('role', models.CharField(choices=[('student', 'Student'), ('teacher', 'Teacher'), ('admin', 'Admin')], default='student', max_length=7)),
+                ('role', models.CharField(choices=[('S', 'Student'), ('T', 'Teacher'), ('A', 'Admin')], default='S', max_length=1)),
             ],
             options={
                 'abstract': False,
@@ -35,11 +37,17 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Course',
             fields=[
-                ('course_id', models.CharField(max_length=50, primary_key=True, serialize=False)),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('course_name', models.CharField(max_length=50)),
                 ('schedule', models.JSONField(default=list)),
-                ('enrolled_students', models.JSONField(default=list)),
-                ('teachers', 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_user_courses.py api/migrations/0002_user_force_pw_change.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.0.2 on 2024-03-05 12:18
+# Generated by Django 5.0.2 on 2024-03-07 22:25
 
 from django.db import migrations, models
 
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddField(
             model_name='user',
-            name='courses',
-            field=models.JSONField(blank=True, default=list),
+            name='force_pw_change',
+            field=models.BooleanField(default=False),
         ),
     ]

api/migrations/0003_remove_course_course_id_and_more.py

@@ -19,7 +19,7 @@ class AccountRoles(models.TextChoices):
     ADMIN = "A", "Admin"
 
 class User(AbstractBaseUser):
-    user_id = models.BigAutoField(primary_key=True)
+
     username = models.CharField(
         ("username"),
         max_length=150,
@@ -31,7 +31,7 @@ class User(AbstractBaseUser):
     first_name = models.CharField(("first name"), max_length=150, blank=True)
     last_name = models.CharField(("last name"), max_length=150, blank=True)
     email = models.EmailField(("email address"), blank=True)
-    force_pw_change = models.BinaryField(("force the user to change password"), default=False)
+    force_pw_change = models.BooleanField(default=False)
 
     role = models.CharField(
         max_length=1,
@@ -50,7 +50,7 @@ def clean(self):
         self.email = self.__class__.objects.normalize_email(self.email)
 
     def get_classes(self):
-        return [uc.course for uc in UserCourse.objects.filter(user__user_id=self.user_id)]
+        return [uc.course for uc in UserCourse.objects.filter(user__id=self.id)]
 
 
 class Course(models.Model):

api/models.py

@@ -13,9 +13,11 @@
 from drf_spectacular.utils import extend_schema, OpenApiResponse
 
 from .permissions import IsTeacher, IsAdmin, IsStudent
-from .models import Course
+from .models import Course, AccountRoles
 from .serializers import CustomTokenSerializer, CreateUserSerializer, UserSerializer, CourseCreateSerializer, CourseSerializer
 
+import pdb
+
 
 User = get_user_model()
 __ROOT__ = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -39,14 +41,15 @@ def test(request):
 # Ideally a better method should be used to create the first admin account, but useful for debugging
 def genAdmin(request):
     queryset = User.objects.all()
-    admins = UserSerializer(queryset.filter(role="admin"), many=True)
+    # pdb.set_trace()
+    admins = UserSerializer(queryset.filter(role= AccountRoles.ADMIN), many=True)
     default_admin = UserSerializer(queryset.filter(username="admin"), many=True)
     if len(admins.data) + len(default_admin.data) != 0:
         return JsonResponse({"error": "admin account already setup"}, status=status.HTTP_403_FORBIDDEN)
 
     user = User.objects.create(
         username='admin',
-        role='admin'
+        role=AccountRoles.ADMIN
     )
     user.set_password('adminadmin')
     user.save()