Merge pull request #8 from Lab-Lab-Lab/fix_grading_issue

Fix grading issue

Author: hcientist

config/settings/local.py

@@ -65,5 +65,4 @@
 # CORS_ALLOWED_ORIGIN_REGEXES = [
 #     r"^http://localhost:3000$",  # works for local dev
 # ]
-print('CORS_ALLOWED_ORIGIN_REGEXES', CORS_ALLOWED_ORIGIN_REGEXES)
 # ------------------------------------------------------------------------------

requirements.txt

@@ -0,0 +1 @@
+-r requirements/local.txt

requirements.txt

@@ -4,8 +4,13 @@
 from rest_framework.mixins import ListModelMixin, RetrieveModelMixin, UpdateModelMixin
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet
+from django.db.models import OuterRef, Subquery
 
-from .serializers import AssignmentViewSetSerializer, AssignmentInstrumentSerializer, AssignmentSerializer
+from .serializers import (
+    AssignmentViewSetSerializer,
+    AssignmentInstrumentSerializer,
+    AssignmentSerializer,
+)
 from teleband.assignments.api.serializers import ActivitySerializer, PiecePlanSerializer
 from teleband.musics.api.serializers import PartTranspositionSerializer
 
@@ -29,14 +34,22 @@ class ActivityViewSet(RetrieveModelMixin, ListModelMixin, GenericViewSet):
     permission_classes = [IsTeacher]
 
     def get_queryset(self):
-        return self.queryset.filter(
-            pk__in=Assignment.objects.filter(
-                enrollment__course__slug=self.kwargs["course_slug_slug"]
+        # Define a subquery to get the first assignment for each activity
+        distinct_activity_assignments = (
+            Assignment.objects.filter(
+                enrollment__course__slug=self.kwargs["course_slug_slug"],
+                activity=OuterRef("id"),
             )
-            .distinct("activity")
-            .values_list("pk", flat=True)
+            .order_by("id", "pk")
+            .values("activity_id")[:1]
         )
 
+        # Use the subquery to filter the main queryset
+        queryset = self.queryset.filter(pk__in=Subquery(distinct_activity_assignments))
+
+        return queryset
+
+
 class AssignmentViewSet(
     RetrieveModelMixin, UpdateModelMixin, ListModelMixin, GenericViewSet
 ):
@@ -71,16 +84,36 @@ def get_queryset(self):
         role = self.request.user.enrollment_set.get(course=course).role
 
         if role.name == "Student":
-            return Assignment.objects.filter(
-                enrollment__course=course, enrollment__user=self.request.user
-            ).select_related("activity", "instrument", "piece", "activity__part_type", "instrument__transposition", "group").prefetch_related("submissions")
+            return (
+                Assignment.objects.filter(
+                    enrollment__course=course, enrollment__user=self.request.user
+                )
+                .select_related(
+                    "activity",
+                    "instrument",
+                    "piece",
+                    "activity__part_type",
+                    "instrument__transposition",
+                    "group",
+                )
+                .prefetch_related("submissions")
+            )
         if role.name == "Teacher":
-            return Assignment.objects.filter(enrollment__course=course).select_related("activity", "instrument", "piece", "activity__part_type", "instrument__transposition", "group")
+            return Assignment.objects.filter(enrollment__course=course).select_related(
+                "activity",
+                "instrument",
+                "piece",
+                "activity__part_type",
+                "instrument__transposition",
+                "group",
+            )
 
     def list(self, request, *args, **kwargs):
         assignments = self.get_queryset()
 
-        serialized = AssignmentViewSetSerializer(assignments, context={'request': request}, many=True)
+        serialized = AssignmentViewSetSerializer(
+            assignments, context={"request": request}, many=True
+        )
 
         grouped = defaultdict(list)
         for assignment in serialized.data:
@@ -101,24 +134,24 @@ def list(self, request, *args, **kwargs):
         }
 
         # FIXME: this should respect order from server/pieceplan and mayeb do this as a backup?
-        orderFromActivityType = lambda a: ordering[a['activity_type_name'].split()[0]]
+        orderFromActivityType = lambda a: ordering[a["activity_type_name"].split()[0]]
         for pieceplan in grouped:
             grouped[pieceplan].sort(key=orderFromActivityType)
 
         return Response(grouped)
 
 
-class PiecePlanViewSet(
-    RetrieveModelMixin, ListModelMixin, GenericViewSet
-):
+class PiecePlanViewSet(RetrieveModelMixin, ListModelMixin, GenericViewSet):
     serializer_class = PiecePlanSerializer
     queryset = PiecePlan.objects.prefetch_related("piece")
     lookup_field = "id"
     permission_classes = [IsTeacher]
 
     def get_queryset(self):
         course = Course.objects.get(slug=self.kwargs["course_slug_slug"])
-        return PiecePlan.objects.filter(curriculum__course=course).prefetch_related("piece")
+        return PiecePlan.objects.filter(curriculum__course=course).prefetch_related(
+            "piece"
+        )
 
     # def get_serializer_class(self):
     #     if self.action == "create":

teleband/assignments/api/views.py

@@ -6,8 +6,13 @@
 
 @admin.register(Submission)
 class SubmissionAdmin(VersionAdmin):
-    list_display = ("id", "assignment", "submitted",)
+    list_display = (
+        "id",
+        "assignment",
+        "submitted",
+    )
     list_filter = ("assignment__piece",)
+    raw_id_fields = ("assignment",)
 
 
 @admin.register(SubmissionAttachment)
@@ -27,7 +32,7 @@ class GradeAdmin(VersionAdmin):
         "rhythm",
         "tone",
         "expression",
-        "created_at"
+        "created_at",
     )
     # list_filter = ("student_submission", "own_submission", "grader")
     list_filter = ("grader",)

teleband/submissions/admin.py

@@ -5,7 +5,7 @@
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet, ModelViewSet
 from teleband.submissions.api.teacher_serializers import TeacherSubmissionSerializer
-
+from django.db.models import OuterRef, Subquery
 
 from .serializers import (
     GradeSerializer,
@@ -72,18 +72,29 @@ def recent(self, request, **kwargs):
         piece_slug = request.GET["piece_slug"]
         activity_name = request.GET["activity_name"]
 
-        queryset = (
+        # https://chatgpt.com/share/827ac4eb-110d-423c-a106-1e696059fc83
+        # Define a subquery to get the latest submission for each enrollment
+        latest_submissions = (
             Submission.objects.filter(
+                assignment__enrollment=OuterRef("assignment__enrollment"),
                 assignment__enrollment__course__slug=course_id,
                 assignment__activity__activity_type__name=activity_name,
                 assignment__part__piece__slug=piece_slug,
             )
-            .order_by("assignment__enrollment", "-submitted")
-            .distinct("assignment__enrollment")
+            .order_by("-submitted")
+            .values("pk")[:1]
         )
 
+        # Use the subquery to filter the main queryset
+        filtered_submissions = Submission.objects.filter(
+            pk__in=Subquery(latest_submissions)
+        ).order_by("assignment__enrollment", "-submitted")
+
+        # The final queryset will have the latest submissions for each enrollment
+        submissions = filtered_submissions
+
         serializer = self.serializer_class(
-            queryset, many=True, context={"request": request}
+            submissions, many=True, context={"request": request}
         )
         return Response(status=status.HTTP_200_OK, data=serializer.data)