remove from-to number, add answer

Author: rockstarr-programmerr

classroom/filters/question.py

@@ -8,6 +8,8 @@ class Meta:
         model = ReadingQuestion
         fields = {
             'exercise': ['exact'],
+            'passage': ['exact'],
+            'number': ['exact', 'gte', 'lte'],
         }
 
     @property

classroom/migrations/0008_auto_20211005_2227.py

@@ -0,0 +1,38 @@
+# Generated by Django 3.2.7 on 2021-10-05 15:27
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classroom', '0007_auto_20211005_2147'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='readingquestion',
+            options={'ordering': ['exercise']},
+        ),
+        migrations.RenameField(
+            model_name='readingquestion',
+            old_name='from_number',
+            new_name='number',
+        ),
+        migrations.RemoveField(
+            model_name='readingquestion',
+            name='to_number',
+        ),
+        migrations.CreateModel(
+            name='ReadingCorrectAnswer',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content', models.CharField(max_length=255)),
+                ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='correct_answers', to='classroom.readingquestion')),
+            ],
+            options={
+                'ordering': ['content'],
+            },
+        ),
+    ]

classroom/migrations/0009_auto_20211005_2232.py

@@ -0,0 +1,37 @@
+# Generated by Django 3.2.7 on 2021-10-05 15:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classroom', '0008_auto_20211005_2227'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ReadingAnswer',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content', models.CharField(max_length=255)),
+            ],
+            options={
+                'ordering': ['content'],
+            },
+        ),
+        migrations.RenameField(
+            model_name='readingquestion',
+            old_name='answers',
+            new_name='choices',
+        ),
+        migrations.DeleteModel(
+            name='ReadingCorrectAnswer',
+        ),
+        migrations.AddField(
+            model_name='readinganswer',
+            name='question',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='classroom.readingquestion'),
+        ),
+    ]

classroom/models/__init__.py

@@ -1,3 +1,4 @@
 from .classroom import Classroom
+from .reading_answer import ReadingAnswer
 from .reading_exercise import ReadingExercise
 from .reading_question import ReadingQuestion

classroom/models/abstracts/answer.py

@@ -0,0 +1,8 @@
+from django.db import models
+
+
+class Answer(models.Model):
+    content = models.CharField(max_length=255)
+
+    class Meta:
+        abstract = True

classroom/models/abstracts/question.py

@@ -9,46 +9,39 @@ class Types(models.TextChoices):
         YES_NO = 'yes_no', _('Yes / No / Not given')
         FILL_BLANK = 'fill_blank', _('Fill in the blank')
 
-    ANSWERS_DELEMITER = ' | '
+    _DELEMITER = ' | '
     _TRUE = 'TRUE'
     _FALSE = 'FALSE'
     _YES = 'YES'
     _NO = 'NO'
     _NOT_GIVEN = 'NOT_GIVEN'
 
-    from_number = models.PositiveSmallIntegerField()
-    to_number = models.PositiveSmallIntegerField(null=True)
+    number = models.PositiveSmallIntegerField()
     question_type = models.CharField(max_length=30, choices=Types.choices)
-    answers = models.CharField(max_length=255, blank=True)
+    choices = models.CharField(max_length=255, blank=True)
     correct_answer = models.CharField(max_length=255)
 
     class Meta:
         abstract = True
 
     def __str__(self):
-        return f'{self.get_question_number_display()} | {self.question_type} | {self.correct_answer[:50]}'
+        return f'{self.number} | {self.get_question_type_display()} | {self.correct_answer[:50]}'
 
     def save(self, *args, **kwargs):
-        self.set_default_answers()
+        self.set_default_choices()
         return super().save(*args, **kwargs)
 
-    def get_question_number_display(self):
-        display = str(self.from_number)
-        if self.to_number is not None and self.to_number != self.from_number:
-            display += f' - {self.to_number}'
-        return display
-
-    def set_default_answers(self):
+    def set_default_choices(self):
         if self.is_true_false():
-            self.answers = self.ANSWERS_DELEMITER.join([
+            self.choices = self._DELEMITER.join([
                 self._TRUE, self._FALSE, self._NOT_GIVEN
             ])
         elif self.is_yes_no():
-            self.answers = self.ANSWERS_DELEMITER.join([
+            self.choices = self._DELEMITER.join([
                 self._YES, self._NO, self._NOT_GIVEN
             ])
         elif not self.is_multiple_choice():
-            self.answers = ''
+            self.choices = ''
 
     def is_true_false(self):
         return self.question_type == self.Types.TRUE_FALSE
@@ -58,3 +51,9 @@ def is_yes_no(self):
 
     def is_multiple_choice(self):
         return self.question_type == self.Types.MULTIPLE_CHOICE
+
+    def get_answers_content(self):
+        answers = []
+        for answer in self.answers.all():
+            answers.append(answer.content)
+        return answers

classroom/models/reading_answer.py

@@ -0,0 +1,10 @@
+from django.db import models
+
+from .abstracts.answer import Answer
+
+
+class ReadingAnswer(Answer):
+    question = models.ForeignKey('ReadingQuestion', on_delete=models.CASCADE, related_name='answers')
+
+    class Meta:
+        ordering = ['content']

classroom/models/reading_exercise.py

@@ -23,13 +23,5 @@ def __str__(self):
         return display
 
     def get_question_range(self):
-        question_numbers = self.questions.order_by('from_number').values('from_number', 'to_number')
-        question_range = []
-        for number in question_numbers:
-            from_number = number['from_number']
-            to_number = number['to_number']
-            if to_number is None:
-                question_range.append(from_number)
-            else:
-                question_range.extend(range(from_number, to_number + 1))
-        return question_range
+        question_range = self.questions.all().values_list('number', flat=True)
+        return list(question_range)

classroom/models/reading_question.py

@@ -2,11 +2,24 @@
 
 from .abstracts.question import Question
 from .reading_exercise import ReadingExercise
+from .reading_answer import ReadingAnswer
 
 
 class ReadingQuestion(Question):
     exercise = models.ForeignKey(ReadingExercise, on_delete=models.CASCADE, related_name='questions')
     passage = models.PositiveSmallIntegerField(default=1)
 
     class Meta:
-        ordering = ['exercise', 'from_number']
+        ordering = ['exercise']
+
+    def create_answers(self, answers):
+        contents = answers.split(self._DELEMITER)
+        answers_objs = [
+            ReadingAnswer(question=self, content=content)
+            for content in contents
+        ]
+        ReadingAnswer.objects.bulk_create(answers_objs)
+
+    def replace_answers(self, answers):
+        self.answers.all().delete()
+        self.create_answers(answers)

classroom/serializers/question.py

@@ -5,55 +5,68 @@
 
 
 class ReadingQuestionSerializer(serializers.HyperlinkedModelSerializer):
+    answers = serializers.CharField(source='get_answers_content')
+
     class Meta:
         model = ReadingQuestion
         fields = [
             'pk', 'url', 'exercise', 'passage',
-            'from_number', 'to_number', 'question_type',
-            'answers', 'correct_answer',
+            'number', 'question_type',
+            'choices', 'answers',
         ]
         extra_kwargs = {
             'url': {'view_name': 'reading-question-detail'},
             'exercise': {'view_name': 'reading-exercise-detail'},
             'passage': {'min_value': 1},
-            'from_number': {'min_value': 1},
-            'to_number': {'min_value': 1},
+            'number': {'min_value': 1},
         }
 
     def validate(self, attrs):
         attrs = super().validate(attrs)
-        self._validate_from_to_number(attrs)
         self._validate_question_not_exist(attrs)
+        self._handle_get_answers_content(attrs)
         return attrs
 
-    def _validate_from_to_number(self, attrs):
-        from_number = attrs['from_number']
-        to_number = attrs['to_number']
-        if to_number is not None and not to_number > from_number:
-            raise serializers.ValidationError(
-                _('"To" must be greater than "From".')
-            )
-
     def _validate_question_not_exist(self, attrs):
-        from_number = attrs['from_number']
-        exercise = attrs['exercise']
+        number = attrs.get('number')
+        if number is None:
+            return
+
+        exercise = attrs.get('exercise') or self.instance.exercise  # If `attrs` don't have 'exercise',
+                                                                    # there should be `self.instance`
         question_range = exercise.get_question_range()
 
         if self.instance:
-            if self.instance.to_number is not None:
-                instance_range = range(self.instance.from_number, self.instance.to_number + 1)
-            else:
-                instance_range = [self.instance.from_number]
-            for number in instance_range:
-                try:
-                    index = question_range.index(number)
-                    question_range.pop(index)
-                except ValueError:
-                    pass
-
-        if from_number in question_range:
+            try:
+                index = question_range.index(self.instance.number)
+                question_range.pop(index)
+            except ValueError:
+                pass
+
+        if number in question_range:
             raise serializers.ValidationError(
                 _('This question number already exists.')
             )
 
-    # TODO: validation regarding `question_type` and `correct_answer`
+    def _handle_get_answers_content(self, attrs):
+        if 'get_answers_content' in attrs:
+            attrs['answers'] = attrs.pop('get_answers_content')
+
+    def create(self, validated_data):
+        has_answers = 'answers' in validated_data
+        if has_answers:
+            answers = validated_data.pop('answers')
+
+        question = super().create(validated_data)
+
+        if has_answers:
+            question.create_answers(answers)
+
+        return question
+
+    def update(self, question, validated_data):
+        if 'answers' in validated_data:
+            answers = validated_data.pop('answers')
+            question.replace_answers(answers)
+
+        return super().update(question, validated_data)