fixbug marking score

Author: rockstarr-programmerr

classroom/models/abstracts/question.py

@@ -60,13 +60,17 @@ def get_answers_content(self):
         return answers
 
     def check_answer(self, answer):
+        # NOTE: don't use .values_list('content', flat=True) here,
+        # because it will not utilize .prefetch_related('answers'),
+        # which lead to more DB queries
         possible_answers = self.answers.all()
+        possible_answers = [answer.content for answer in possible_answers]
 
         if self.is_fill_blank():
             answer = f' {answer} '  # Add 2 spaces to both side to help with regex matching
 
             for correct_answer in possible_answers:
-                regex = correct_answer.content
+                regex = correct_answer
                 if regex.startswith('('):
                     regex = r'(?:' + regex[1:]
 

classroom/serializers/classroom.py

@@ -1,32 +1,14 @@
-from copy import copy
-
 from django.utils.translation import gettext as _
 from rest_framework import serializers
-from rest_framework.reverse import reverse
 
 from account.serializers import UserSerializer
 from classroom.models import Classroom
 from classroom.utils.serializer import ValidateUniqueTogetherMixin
 
 
-class _StudentSerializer(UserSerializer):
-    reading_report_url = serializers.SerializerMethodField()
-
-    class Meta(UserSerializer.Meta):
-        fields = copy(UserSerializer.Meta.fields)
-        fields.append('reading_report_url')
-
-    def get_reading_report_url(self, student):
-        request = self.context['request']
-        classroom_pk = self.context['view'].kwargs['pk']
-        url = reverse('classroom-student-reading-report', kwargs={'pk': classroom_pk}, request=request)
-        url += f'?student={student.pk}'
-        return url
-
-
 class ClassroomSerializer(ValidateUniqueTogetherMixin, serializers.HyperlinkedModelSerializer):
     teacher = UserSerializer(read_only=True)
-    students = _StudentSerializer(many=True, read_only=True)
+    students = UserSerializer(many=True, read_only=True)
 
     class Meta:
         model = Classroom