.gitlab-ci.yml

@@ -11,6 +11,8 @@ variables:
   DEV_IMAGE_BASE: $CI_REGISTRY_IMAGE/dev-image-base
   RELEASE_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
   DOCKER_DRIVER: overlay2
+  DOCKER_TLS_CERTDIR: ""
+
 
 # ========================== Build Testing section =========================== #
 build_test_env:
@@ -110,7 +112,7 @@ test_frontend_unit:
   stage: test
   dependencies:
     - build_frontend
-  tags: 
+  tags:
     - docker
   script:
     - cd frontend/

core/migrations/0018_auto_20190709_1526.py

+# Generated by Django 2.2 on 2019-07-09 15:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0017_auto_20190604_1631'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='feedback',
+            name='final_by_reviewer',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='feedbacklabel',
+            name='name',
+            field=models.CharField(max_length=50, unique=True),
+        ),
+    ]

core/models/feedback.py

@@ -25,10 +25,13 @@ class Feedback(models.Model):
         points a student receives for his submission.
     origin : IntegerField
         Of whom was this feedback originally created. She below for the choices
+    final_by_reviewer: BooleanField
+        Whether or not this feedback was set to final by a reviewer once
     """
     score = models.DecimalField(max_digits=5, decimal_places=2, default=0)
     created = models.DateTimeField(auto_now_add=True)
     is_final = models.BooleanField(default=False)
+    final_by_reviewer = models.BooleanField(default=False)
 
     of_submission = models.OneToOneField(
         Submission,

core/serializers/feedback.py

@@ -7,7 +7,7 @@ from rest_framework import serializers
 from rest_framework.utils import html
 
 from core import models
-from core.models import Feedback
+from core.models import Feedback, UserAccount
 from util.factories import GradyUserFactory
 
 from .generic import DynamicFieldsModelSerializer
@@ -121,8 +121,12 @@ class FeedbackSerializer(DynamicFieldsModelSerializer):
         submission = validated_data.pop('of_submission')
         feedback_lines = validated_data.pop('feedback_lines', [])
         labels = validated_data.pop('labels', [])
+        user = self.context['request'].user
         feedback = Feedback.objects.create(of_submission=submission,
                                            **validated_data)
+        if user.role == UserAccount.REVIEWER:
+            feedback.final_by_reviewer = self.context['request'].data['is_final']
+
         for label in labels:
             feedback.labels.add(label)
 
@@ -141,6 +145,11 @@ class FeedbackSerializer(DynamicFieldsModelSerializer):
 
     @transaction.atomic
     def update(self, feedback, validated_data):
+        user = self.context['request'].user
+
+        if user.role == UserAccount.REVIEWER:
+            feedback.final_by_reviewer = self.context['request'].data['is_final']
+
         for comment in validated_data.pop('feedback_lines', []):
             labels = comment.pop('labels', [])
             comment_instance, _ = models.FeedbackComment.objects.update_or_create(

core/views/feedback.py

@@ -28,12 +28,9 @@ class FeedbackApiView(
     lookup_url_kwarg = 'submission_pk'
 
     def _tutor_attempts_to_change_final_feedback_of_reviewer(self, serializer):
-        feedback_is_final = serializer.instance.is_final
+        feedback_final_by_reviewer = serializer.instance.final_by_reviewer
         user_is_tutor = self.request.user.role == models.UserAccount.TUTOR
-        authors = serializer.instance.of_submission.meta.feedback_authors
-        set_by_reviewer = authors.filter(
-            role=models.UserAccount.REVIEWER).exists()
-        return feedback_is_final and set_by_reviewer and user_is_tutor
+        return feedback_final_by_reviewer and user_is_tutor
 
     def _get_implicit_assignment_for_user(self, submission):
         """ Check for tutor if it exists. Not relevant for reviewer """

requirements.dev.txt

 flake8~=3.6.0
 pre-commit~=1.13.0
 pytest-cov~=2.6.0
-pytest-django~=3.4.0
+pytest-django~=3.5.0
 selenium~=3.141.0
 factory-boy~=2.11.0
 Faker~=1.0.0

requirements.txt

 django-cors-headers~=2.4.0
 django-extensions~=2.1
 djangorestframework-jwt~=1.11.0
-djangorestframework~=3.8
-git+https://github.com/robinhundt/djangorestframework-camel-case
-Django~=2.1
+djangorestframework>=3.9, <3.10
+git+https://gitlab.gwdg.de/grady-corp/djangorestframework-camel-case.git
+Django>=2.1, <2.2
 drf-yasg~=1.12.0
 gunicorn~=19.9.0
 psycopg2-binary~=2.7.0