From c481479fdd55ac9debb4dc76f44183d0e9a9c2e1 Mon Sep 17 00:00:00 2001
From: borzechof99 <borzechof99@mi.fu-berlin.de>
Date: Sat, 26 Jun 2021 16:11:26 +0200
Subject: [PATCH] Fixed Linter and Pagination
---
unisportomat/quiz/fixtures/criteria.json | 1 +
unisportomat/quiz/models.py | 3 ++-
unisportomat/quiz/tests.py | 11 ++++++++---
unisportomat/quiz/views.py | 2 +-
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/unisportomat/quiz/fixtures/criteria.json b/unisportomat/quiz/fixtures/criteria.json
index 584ded6..597ae13 100644
--- a/unisportomat/quiz/fixtures/criteria.json
+++ b/unisportomat/quiz/fixtures/criteria.json
@@ -2,6 +2,7 @@
{
"model": "quiz.criterion",
"pk": 1,
+ "question": 1,
"fields": {
"name": "Outdoorsport"
}
diff --git a/unisportomat/quiz/models.py b/unisportomat/quiz/models.py
index 9da7add..9a7b5b1 100644
--- a/unisportomat/quiz/models.py
+++ b/unisportomat/quiz/models.py
@@ -72,7 +72,8 @@ class Sport(models.Model):
rating_obj, _ = CriterionRating.objects.get_or_create(
sport=self, criterion=criterion, defaults={"rating": rating}
)
- rating_obj.rating = validate_rating(rating)
+ validate_rating(rating)
+ rating_obj.rating = rating
rating_obj.save()
return rating_obj
diff --git a/unisportomat/quiz/tests.py b/unisportomat/quiz/tests.py
index 4eec683..8014902 100644
--- a/unisportomat/quiz/tests.py
+++ b/unisportomat/quiz/tests.py
@@ -386,7 +386,12 @@ class Modeltranslation_Two_Languages_Test(TestCase):
class APITest(APITestCase):
"""Tests the Django API"""
- fixtures = ["sports.json", "criteria.json", "criterion_ratings.json"]
+ fixtures = [
+ "sports.json",
+ "criteria.json",
+ "criterion_ratings.json",
+ "questions.json",
+ ]
def test_get_sport_returns_correct_data(self):
"""Test the API endpoint /sport/{id}"""
@@ -495,8 +500,8 @@ class APITest(APITestCase):
response = self.client.get(reverse("incomplete"))
- self.assertEqual(len(response.data), 1)
- self.assertEqual(response.data[0]["name"], "Jiu Jitsu")
+ self.assertEqual(len(response.data["results"]), 1)
+ self.assertEqual(response.data["results"][0]["name"], "Jiu Jitsu")
def test_get_criteria(self):
"""
diff --git a/unisportomat/quiz/views.py b/unisportomat/quiz/views.py
index 6147522..8d7e0cf 100644
--- a/unisportomat/quiz/views.py
+++ b/unisportomat/quiz/views.py
@@ -217,7 +217,7 @@ class IncompleteSportView(APIView):
"""
paginator = PageNumberWithPageSizePagination()
- queryset = Sport.objects.iterator()
+ queryset = Sport.objects.all().order_by("name")
queryset = paginator.paginate_queryset(queryset, request)
incomplete_sport_list = []
--
GitLab