Merge pull request #13 from rockstarr-programmerr/dev

Dev

Author: rockstarr-programmerr

classroom/business/all/student_report.py

@@ -1,3 +1,5 @@
+from datetime import timedelta
+
 from .band_score import BAND_SCORE_MAPPER
 
 
@@ -19,6 +21,9 @@ def make(self, exercise_pk=None, detail=True):
 
             if submission:
                 report['submitted'] = True
+                report['time_taken'] = submission.time_taken
+                report['submit_datetime'] = submission.submit_datetime
+
                 questions = exercise.questions.all().prefetch_related('answers')
                 answers = submission.answers.all()
 
@@ -50,6 +55,8 @@ def make(self, exercise_pk=None, detail=True):
     def new_report(exercise):
         return {
             'exercise': exercise,
+            'time_taken': timedelta(seconds=0),
+            'submit_datetime': None,
             'passage_1_total': 0,
             'passage_2_total': 0,
             'passage_3_total': 0,

classroom/business/teacher/classroom.py

@@ -1,9 +1,9 @@
-import secrets
 import os
+import secrets
 
 from django.contrib.auth import get_user_model
-from django.core.files.storage import default_storage
 
+from classroom.storages import ExerciseImageStorage
 from classroom.tasks import send_temp_password_for_new_students_task
 
 User = get_user_model()
@@ -75,14 +75,16 @@ def resend_password_emails(classroom, email):
 
 
 def upload_reading_exercise_image(image):
+    storage = ExerciseImageStorage()
+
     directory = 'classroom/reading_exercises/uploaded_images'
     path = f'{directory}/{image.name}'
 
-    if default_storage.exists(path):
+    if storage.exists(path):
         img_name, img_ext = os.path.splitext(image.name)
         unique_name = img_name + secrets.token_urlsafe(nbytes=8)
         path = f'{directory}/{unique_name}{img_ext}'
 
-    default_storage.save(path, image)
-    url = default_storage.url(path)
+    storage.save(path, image)
+    url = storage.url(path)
     return url

classroom/migrations/0015_readingsubmission_time_taken.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.7 on 2021-10-23 14:58
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classroom', '0014_alter_readingquestion_options'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='readingsubmission',
+            name='time_taken',
+            field=models.DurationField(default=datetime.timedelta(0)),
+        ),
+    ]

classroom/models/reading_submission.py

@@ -1,3 +1,5 @@
+from datetime import timedelta
+
 from django.contrib.auth import get_user_model
 from django.db import models
 
@@ -10,6 +12,7 @@ class ReadingSubmission(models.Model):
     exercise = models.ForeignKey(ReadingExercise, on_delete=models.CASCADE, related_name='submissions')
     submitter = models.ForeignKey(User, on_delete=models.CASCADE, related_name='reading_submissions')
     submit_datetime = models.DateTimeField(auto_now_add=True)
+    time_taken = models.DurationField(default=timedelta(seconds=0))
 
     class Meta:
         ordering = ['exercise', 'submitter', 'submit_datetime']

classroom/serializers/classroom.py

@@ -87,6 +87,8 @@ class StudentReadingReportSerializer(serializers.Serializer):
     show_detail = serializers.BooleanField(write_only=True, default=True)
 
     exercise = _ExerciseSerializer(read_only=True)
+    time_taken = serializers.DurationField(read_only=True)
+    submit_datetime = serializers.DateTimeField(read_only=True)
     passage_1_total = serializers.IntegerField(read_only=True)
     passage_2_total = serializers.IntegerField(read_only=True)
     passage_3_total = serializers.IntegerField(read_only=True)

classroom/serializers/exercise.py

@@ -27,7 +27,17 @@ def save(self, **kwargs):
         return super().save(**kwargs)
 
 
-class _SubmitAnswerListSerializer(serializers.ListSerializer):
+class _ReadingExerciseAnswerSerializer(serializers.Serializer):
+    question_number = serializers.IntegerField(min_value=1)
+    content = serializers.CharField()
+
+
+class ReadingExerciseSubmitSerializer(serializers.Serializer):
+    time_taken = serializers.DurationField(
+        help_text='Number of seconds, or a string in this format: "[DD] [HH:[MM:]]ss[.uuuuuu]".'
+    )
+    answers = _ReadingExerciseAnswerSerializer(many=True)
+
     def save(self, exercise=None):
         student = self.context['request'].user
         if exercise.submissions.filter(submitter=student).exists():
@@ -38,11 +48,16 @@ def save(self, exercise=None):
         self._create_submission_answers(submission)
 
     def _create_submission(self, student, exercise):
-        return ReadingSubmission.objects.create(submitter=student, exercise=exercise)
+        time_taken = self.validated_data['time_taken']
+        return ReadingSubmission.objects.create(
+            submitter=student,
+            exercise=exercise,
+            time_taken=time_taken,
+        )
 
     def _create_submission_answers(self, submission):
         answers_to_create = []
-        for answer in self.validated_data:
+        for answer in self.validated_data['answers']:
             answers_to_create.append(
                 ReadingSubmissionAnswer(
                     submission=submission,
@@ -53,14 +68,6 @@ def _create_submission_answers(self, submission):
         ReadingSubmissionAnswer.objects.bulk_create(answers_to_create)
 
 
-class ReadingExerciseSubmitSerializer(serializers.Serializer):
-    question_number = serializers.IntegerField(min_value=1)
-    content = serializers.CharField()
-
-    class Meta:
-        list_serializer_class = _SubmitAnswerListSerializer
-
-
 class ReadingExerciseUploadImgSerializer(serializers.Serializer):
     image = serializers.ImageField(write_only=True)
     image_url = serializers.URLField(read_only=True)

classroom/serializers/reading_submission.py

@@ -12,7 +12,8 @@ class Meta:
         model = ReadingSubmission
         fields = [
             'pk', 'url', 'exercise',
-            'submitter', 'submit_datetime', 'answers',
+            'submitter', 'submit_datetime',
+            'time_taken', 'answers',
         ]
         extra_kwargs = {
             'url': {'view_name': 'reading-submission-detail'},

classroom/storages.py

@@ -0,0 +1,10 @@
+from storages.backends.s3boto3 import S3StaticStorage
+
+
+class ExerciseImageStorage(S3StaticStorage):
+    """
+    Because image URL is saved in html by CKEditor, we must use S3StaticStorage
+    so that `querystring_auth` is disabled, and URL is always the same.
+    Also, set `default_acl` to 'public-read' so that these images are accessible.
+    """
+    default_acl = 'public-read'

classroom/views/exercise.py

@@ -27,7 +27,7 @@ class ReadingExerciseViewSet(ModelViewSet):
     def submit_answers(self, request, pk):
         """Student submit their answer to this exercise.
         """
-        serializer = self.get_serializer(data=request.data, many=True)
+        serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         exercise = self.get_object()
         serializer.save(exercise=exercise)

keep_learning/settings.py

@@ -235,7 +235,7 @@
 
 SIMPLE_JWT = {
     'ACCESS_TOKEN_LIFETIME': timedelta(minutes=5),
-    'REFRESH_TOKEN_LIFETIME': timedelta(days=1),
+    'REFRESH_TOKEN_LIFETIME': timedelta(days=7),
     'ROTATE_REFRESH_TOKENS': True,
     'BLACKLIST_AFTER_ROTATION': True,
     'UPDATE_LAST_LOGIN': True,  # Needed for invalidating used password reset token