Merge branch 'main' into video_call_ui

Author: AbdulAlharbi

backend/apps/lessons/migrations/0006_assignment_upload_record.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.6 on 2025-03-26 07:20
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lessons', '0005_alter_quiz_time_limit'),
+        ('uploads', '0004_remove_uploadrecord_profile_uploadrecord_user'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='assignment',
+            name='upload_record',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='uploads.uploadrecord'),
+        ),
+    ]

backend/apps/lessons/models.py

@@ -1,6 +1,6 @@
 from django.db import models
 from django.contrib.auth.models import User
-# from backend.apps.uploads.models import UploadRecord - This will be revised and corrected
+from apps.uploads.models import UploadRecord
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
 
@@ -19,8 +19,8 @@ class Assignment(models.Model):  # Assignments: Represents assignments given to
     description = models.TextField(blank=True)
     assignment_type = models.CharField(max_length=2, choices=ASSIGNMENT_TYPES)
 
-    # Upload_record (ForeignKey to UploadRecord) - Currently not referenced correctly but will be when branch is updated
-    # upload_record = models.ForeignKey(UploadRecord, on_delete=models.SET_NULL, null=True, blank=True)
+    # Upload_record (ForeignKey to UploadRecord)
+    upload_record = models.ForeignKey(UploadRecord, on_delete=models.SET_NULL, null=True, blank=True)
 
     # Student (ForeignKey to User as there's no model exclusively for student)
     student = models.ForeignKey(User, on_delete=models.CASCADE, related_name="assignments", null=True, blank=True)
@@ -31,6 +31,22 @@ class Assignment(models.Model):  # Assignments: Represents assignments given to
     def __str__(self):
         return self.title
 
+    # Helper methods
+    @classmethod
+    def get_assignment(cls, assignment_id):
+        try:
+            return cls.objects.get(pk=assignment_id)
+        except cls.DoesNotExist:
+            return None
+
+    def update_assignment(self, data):
+        for field, value in data.items():
+            setattr(self, field, value)
+        self.save()
+        return self
+
+    def delete_assignment(self):
+        self.delete()
 
 class Quiz(models.Model):  # Quizzes: Represents quizzes linked to assignments.
     class Meta:
@@ -46,6 +62,14 @@ class Meta:
     def __str__(self):
         return f"Quiz for {self.assignment.title}"
 
+    # Helper Method(s)
+    @classmethod
+    def get_quiz(cls, quiz_id):
+        try:
+            return cls.objects.get(pk=quiz_id)
+        except cls.DoesNotExist:
+            return None
+
 
 class Question(models.Model):  # Questions: Represents individual questions within a quiz.
     QUESTION_TYPES = [
@@ -57,13 +81,29 @@ class Question(models.Model):  # Questions: Represents individual questions with
     question_type = models.CharField(max_length=2, choices=QUESTION_TYPES)
     order_of_question = models.PositiveIntegerField()
     question_text = models.TextField()
-    # New field to store points/score for the question
     points = models.PositiveIntegerField(default=1, help_text="Points assigned to this question")
 
     def __str__(self):
         quiz_title = self.quiz.assignment.title if self.quiz and self.quiz.assignment else "Unknown Quiz"
         return f"Question {self.order_of_question} - {quiz_title}"
 
+    # Helper Methods
+    @classmethod
+    def get_question(cls, question_id):
+        try:
+            return cls.objects.get(pk=question_id)
+        except cls.DoesNotExist:
+            return None
+
+    def update_question(self, data):
+        for field, value in data.items():
+            setattr(self, field, value)
+        self.save()
+        return self
+
+    def delete_question(self):
+        self.delete()
+
 
 class Choice(models.Model):  # Choices: Store the possible answer choices for multiple choice questions.
     # Fields
@@ -74,15 +114,48 @@ class Choice(models.Model):  # Choices: Store the possible answer choices for mu
     def __str__(self):
         return f"Choice: {self.choice_text} ({'Correct' if self.is_correct else 'Incorrect'})"
 
+    # Helper Methods
+    @classmethod
+    def get_choices(cls, question):
+        return cls.objects.filter(question=question)
+
+    @classmethod
+    def delete_choices(cls, question):
+        cls.objects.filter(question=question).delete()
+        # self.delete()
+
+    @classmethod
+    def bulk_create_choices(cls, choices_data, question):
+        # double check **choice_data - saw this online ;)
+        choices = [cls(question=question, **choice_data) for choice_data in choices_data]
+        return cls.objects.bulk_create(choices)
+
+    @classmethod
+    def bulk_update_choices(cls, choices_data, question):
+        existing_choices = cls.objects.filter(question=question)
+
+        choices_to_update = []
+        for choice_data in choices_data:
+            choice_id = choice_data.get("id")
+            choice_obj = existing_choices.filter(id=choice_id).first()
+
+            if choice_obj:
+                for field, value in choice_data.items():
+                    setattr(choice_obj, field, value)
+                choices_to_update.append(choice_obj)
+
+        if choices_to_update:
+            cls.objects.bulk_update(choices_to_update, ["choice_text", "is_correct"])
+
 
 class Solution(models.Model):  # Solutions: Represents correct answers to questions.
     # Fields
     question = models.ForeignKey(Question, on_delete=models.CASCADE)
     choices = models.ManyToManyField(Choice, blank=True)  # for multiple choice questions
     short_answer_text = models.TextField(blank=True, null=True)  # for short answer questions
-    
-    # New validation that ensures MC questions have at least one correct answer
+
     def clean(self):
+        # validation that ensures MC questions have at least one correct answer
         if self.question.question_type == 'MC' and not self.choices.filter(is_correct=True).exists():
             raise ValidationError("A multiple-choice question must have at least one correct answer.")
 

backend/apps/lessons/permissions.py

@@ -0,0 +1,8 @@
+from rest_framework.permissions import BasePermission
+
+
+# Custom permission to allow access to admins and tutors only.
+class IsAdminOrTutor(BasePermission):
+    def has_permission(self, request, view):
+        # Allow access if user is an admin or has role as tutor
+        return request.user.is_staff or (hasattr(request.user, 'profile') and request.user.profile.role == 1)

backend/apps/lessons/serializers.py

@@ -0,0 +1,38 @@
+from rest_framework import serializers
+from .models import Assignment, Quiz, Question, Choice
+
+
+class AssignmentSerializer(serializers.ModelSerializer):
+    student_username = serializers.CharField(source='student.username', read_only=True)
+
+    class Meta:
+        model = Assignment
+        fields = [
+            "id",
+            "title",
+            "description",
+            "assignment_type",
+            "deadline",
+            "student",
+            "student_username",
+            "upload_record",
+            "upload_record_id"
+        ]
+
+
+class QuizSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Quiz
+        fields = ["id", "assignment", "time_limit", "num_of_questions", "attempts", "is_active"]
+
+
+class QuestionSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Question
+        fields = ["id", "quiz", "question_type", "order_of_question", "question_text", "points"]
+
+
+class ChoiceSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Choice
+        fields = ["id", "question", "choice_text", "is_correct"]

backend/apps/lessons/urls.py

@@ -0,0 +1,40 @@
+from django.urls import path
+from .views import (
+    AssignmentDetailView,
+    AssignmentCreateView,
+    QuizQuestionListView,
+    QuestionCreateView,
+    QuestionUpdateView,
+    QuestionDeleteView,
+    ChoiceListView,
+    ChoiceCreateView,
+    ChoiceUpdateView,
+    ChoiceDeleteView
+)
+
+urlpatterns = [
+    # CRUD endpoints for Assignments
+    path("assignments/<int:pk>/", AssignmentDetailView.as_view(), name="assignment-detail"),
+    path("assignments/create/", AssignmentCreateView.as_view(), name="assignment-create"),
+
+    # CRUD endpoints for Quizzes and Questions
+    path("assignments/<int:assignment_id>/quiz/<int:quiz_id>/questions/",
+         QuizQuestionListView.as_view(), name="quiz-question-list"),
+
+    path("assignments/<int:assignment_id>/quiz/<int:quiz_id>/questions/create/",
+         QuestionCreateView.as_view(), name="question-create"),
+    path("assignments/<int:assignment_id>/quiz/<int:quiz_id>/questions/<int:question_id>/update/",
+         QuestionUpdateView.as_view(), name="question-update"),
+    path("assignments/<int:assignment_id>/quiz/<int:quiz_id>/questions/<int:question_id>/delete/",
+         QuestionDeleteView.as_view(), name="question-delete"),
+
+    # CRUD endpoints for Choices
+    path("assignments/<int:assignment_id>/quiz/<int:quiz_id>/questions/<int:question_id>/choices/",
+         ChoiceListView.as_view(), name="choice-list"),
+    path("assignments/<int:assignment_id>/quiz/<int:quiz_id>/questions/<int:question_id>/choices/create/",
+         ChoiceCreateView.as_view(), name="choice-create"),
+    path("assignments/<int:assignment_id>/quiz/<int:quiz_id>/questions/<int:question_id>/choices/update/",
+         ChoiceUpdateView.as_view(), name="choice-update"),
+    path("assignments/<int:assignment_id>/quiz/<int:quiz_id>/questions/<int:question_id>/choices/delete/",
+         ChoiceDeleteView.as_view(), name="choice-delete")
+]