style(quiz): fixed linting issues

Author: cjnbennett

server/api/apps/shared_models/admin.py

@@ -22,4 +22,3 @@ class QuestionAdmin(admin.ModelAdmin):
 
 admin.site.register(Tag)
 admin.site.register(QuestionResponse)
-

server/api/apps/shared_models/models/__init__.py

@@ -1,2 +0,0 @@
-from .quiz_models import Question, Tag, Answer
-from .statistics_models import QuestionResponse

server/api/apps/shared_models/models/quiz_models.py

@@ -10,7 +10,6 @@ class QuestionType(models.TextChoices):
         NUMERIC = "NA", _("Numerical Answer")
         SHORT_ANSWER = "SA", _("Short Answer")
 
-
     text = models.TextField(blank=True, default="")
     question_type = models.CharField(max_length=2,
                                      choices=QuestionType.choices,
@@ -25,7 +24,7 @@ def __str__(self):
 class Tag(models.Model):
     name = models.CharField(max_length=defines.TAG_NAME_MAXLEN)
     question = models.ManyToManyField(Question)
-    
+
     def __str__(self):
         return self.name
 
@@ -34,7 +33,6 @@ class Answer(models.Model):
     text = models.CharField(max_length=defines.ANSWER_TEXT_MAXLEN)
     is_correct = models.BooleanField(default=False)
     question = models.ForeignKey(Question, on_delete=models.CASCADE)
-    
+
     def __str__(self):
         return self.text
-

server/api/apps/shared_models/models/statistics_models.py

@@ -1,6 +1,5 @@
 from django.db import models
-from . import defines
-from .quiz_models import *
+from .quiz_models import Question, Answer
 from django.contrib.auth.models import User
 
 from datetime import timedelta
@@ -18,4 +17,3 @@ class QuestionResponse(models.Model):
 
     def __str__(self):
         return str((self.question, self.selected_answer))
-

server/api/apps/shared_models/serializers/quiz_serializers.py

@@ -1,13 +1,13 @@
-from rest_framework import routers, serializers, viewsets
-from ..models.quiz_models import *
+from rest_framework import serializers
+from ..models.quiz_models import Question, Tag, Answer
 
 
 class QuestionSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = Question
         fields = ["id", "text", "question_type", "date_created"]
 
-        
+
 class TagSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = Tag
@@ -18,4 +18,3 @@ class AnswerSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = Answer
         fields = ["id", "text", "is_correct", "question"]
-

server/api/apps/shared_models/serializers/statistics_serializers.py

@@ -1,5 +1,5 @@
-from rest_framework import routers, serializers, viewsets
-from ..models.statistics_models import *
+from rest_framework import serializers
+from ..models.statistics_models import QuestionResponse
 
 
 class QuestionResponseSerializer(serializers.HyperlinkedModelSerializer):
@@ -11,4 +11,3 @@ class Meta:
                   "is_correct",
                   "time_taken",
                   "date_created"]
-

server/api/apps/shared_models/tests/test_quiz.py

@@ -2,20 +2,21 @@
 from django.utils import timezone
 from ..models.quiz_models import Question, Tag, Answer
 
-import datetime
+MC = Question.QuestionType.MULTICHOICE
+NA = Question.QuestionType.NUMERIC
+SA = Question.QuestionType.SHORT_ANSWER
 
 
 class QuestionTestCase(TestCase):
     def setUp(self):
         self.creation_time = timezone.now()
+
         Question.objects.create(text="Test multiple choice question",
-                                question_type=
-                                Question.QuestionType.MULTICHOICE)
+                                question_type=MC)
         Question.objects.create(text="Test numerical answer question",
-                                question_type=Question.QuestionType.NUMERIC)
+                                question_type=NA)
         Question.objects.create(text="Test short answer question",
-                                question_type=
-                                Question.QuestionType.SHORT_ANSWER)
+                                question_type=SA)
 
     def test_text(self):
         mc = Question.objects.get(text="Test multiple choice question")
@@ -51,8 +52,7 @@ def test_date_created(self):
 class TagTestCase(TestCase):
     def setUp(self):
         q = Question.objects.create(text="This is a physics question",
-                                    question_type=
-                                    Question.QuestionType.NUMERIC)
+                                    question_type=NA)
         t = Tag.objects.create(name="Unit 3 Physics")
         q.tag_set.add(t)
 
@@ -67,8 +67,7 @@ def test(self):
 class AnswerTestCase(TestCase):
     def setUp(self):
         q = Question.objects.create(text="Question?",
-                                    question_type=
-                                    Question.QuestionType.SHORT_ANSWER)
+                                    question_type=SA)
         Answer.objects.create(text="Answer!", question=q, is_correct=True)
 
     def test(self):
@@ -80,4 +79,3 @@ def test(self):
         self.assertTrue(a.is_correct)
 
         self.assertEquals(a.question, q)
-

server/api/apps/shared_models/tests/test_statistics.py

@@ -3,23 +3,23 @@
 from ..models.quiz_models import Question, Answer
 from ..models.statistics_models import QuestionResponse
 
-import datetime
+from datetime import timedelta
+
+MC = Question.QuestionType.MULTICHOICE
 
 
 class QuestionTestCase(TestCase):
     def setUp(self):
         self.creation_time = timezone.now()
         q = Question.objects.create(text="Question?",
-                                    question_type=
-                                    Question.QuestionType.MULTICHOICE)
+                                    question_type=MC)
         a = Answer.objects.create(text="Answer!",
                                   question=q,
                                   is_correct=True)
         QuestionResponse.objects.create(question=q,
                                         selected_answer=a,
                                         is_correct=a.is_correct,
-                                        time_taken=
-                                        datetime.timedelta(seconds=5))
+                                        time_taken=timedelta(seconds=5))
 
     def test(self):
         q = Question.objects.get(text="Question?")
@@ -32,7 +32,6 @@ def test(self):
         self.assertEquals(qr.selected_answer, a)
         self.assertEquals(qr.is_correct, a.is_correct)
         self.assertEquals(qr.is_correct, True)
-        self.assertEquals(qr.time_taken, datetime.timedelta(seconds=5))
+        self.assertEquals(qr.time_taken, timedelta(seconds=5))
         self.assertLess((qr.date_created-self.creation_time).total_seconds(),
-                          0.1)
-
+                        0.1)