Merge pull request #12196 from AlexVelezLl/fix-question-count

Update exam.question_count calculation
learningequality · May 24, 2024 · b08ed71 · b08ed71
2 parents 4be649e + 4ecc912
commit b08ed71
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/kolibri/core/exams/serializers.py b/kolibri/core/exams/serializers.py
@@ -60,7 +60,7 @@ class ExamSerializer(ModelSerializer):
     creator = PrimaryKeyRelatedField(
         read_only=False, queryset=FacilityUser.objects.all()
     )
-    question_count = IntegerField()
+    question_count = IntegerField(allow_null=True)
     date_archived = DateTimeTzField(allow_null=True)
     date_activated = DateTimeTzField(allow_null=True)
 
@@ -83,7 +83,7 @@ class Meta:
             "learners_see_fixed_order",
             "learner_ids",
         )
-        read_only_fields = ("data_model_version",)
+        read_only_fields = ("data_model_version", "question_count")
 
     def validate(self, attrs):
         title = attrs.get("title")
@@ -137,6 +137,12 @@ def to_internal_value(self, data):
             else:
                 # Otherwise we are just updating the exam, so allow a partial update
                 self.partial = True
+
+        question_sources = data.get("question_sources", [])
+        data["question_count"] = sum(
+            len(source.get("questions", [])) for source in question_sources
+        )
+
         return super(ExamSerializer, self).to_internal_value(data)
 
     def create(self, validated_data):

diff --git a/kolibri/core/exams/test/test_exam_api.py b/kolibri/core/exams/test/test_exam_api.py
@@ -42,10 +42,8 @@ def setUpTestData(cls):
 
     def make_basic_exam(self):
         sections = self.make_basic_sections(1)
-        total_questions = sum(section["question_count"] for section in sections)
         return {
             "title": "Exam",
-            "question_count": total_questions,
             "active": True,
             "collection": self.classroom.id,
             "learners_see_fixed_order": False,
@@ -551,3 +549,15 @@ def test_exam_model_get_questions_v2_v1(self):
 
         self.exam.save()
         self.assertEqual(len(self.exam.get_questions()), 1)
+
+    def test_exam_question_count_calculation(self):
+        self.login_as_admin()
+        exam = self.make_basic_exam()
+        question_count = sum(
+            len(source["questions"]) for source in exam["question_sources"]
+        )
+        response = self.post_new_exam(exam)
+        exam_id = response.data["id"]
+        self.assertEqual(response.status_code, 201)
+        exam_model_instance = models.Exam.objects.get(id=exam_id)
+        self.assertEqual(exam_model_instance.question_count, question_count)
diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -277,15 +277,6 @@ export default function useQuizCreation() {
    * @throws {Error} if quiz is not valid
    */
   function saveQuiz() {
-    const totalQuestions = get(allSections).reduce((acc, section) => {
-      acc += parseInt(section.question_count);
-      return acc;
-    }, 0);
-
-    set(_quiz, {
-      ...get(_quiz),
-      question_count: totalQuestions,
-    });
     if (!validateQuiz(get(_quiz))) {
       throw new Error(`Quiz is not valid: ${JSON.stringify(get(_quiz))}`);
     }

diff --git a/kolibri/plugins/learn/assets/src/views/ExamPage/index.vue b/kolibri/plugins/learn/assets/src/views/ExamPage/index.vue
@@ -574,6 +574,7 @@
 
   .answered {
     display: inline-block;
+    margin-right: 8px;
     margin-left: 8px;
     white-space: nowrap;
   }