From 1e464b7ea79564cd97f01a3cea4a593e5fb591a4 Mon Sep 17 00:00:00 2001 From: borzechof99 <borzechof99@mi.fu-berlin.de> Date: Fri, 2 Jul 2021 16:00:59 +0200 Subject: [PATCH] Fix Tests, Linter --- unisportomat/quiz/serializers.py | 33 +------------------------------ unisportomat/quiz/views.py | 3 --- unisportomat/unisportomat/urls.py | 2 +- 3 files changed, 2 insertions(+), 36 deletions(-) diff --git a/unisportomat/quiz/serializers.py b/unisportomat/quiz/serializers.py index 0e295cf..82d180f 100644 --- a/unisportomat/quiz/serializers.py +++ b/unisportomat/quiz/serializers.py @@ -5,38 +5,7 @@ Serializers creating JSONs for every Model from .models import base64 from rest_framework import serializers - -from .models import Sport, Criterion, Question, validate_rating - - -class SportListSerializer(serializers.ModelSerializer): - """ - Serializes all sports. - """ - - class Meta: - model = Sport - fields = ("id", "name", "url", "criteria_ratings") - - -class QuestionListSerializer(serializers.ModelSerializer): - """ - Serializes all Questions. - """ - - class Meta: - model = Question - fields = ("id", "text", "criterion") - - -class CriterionListSerializer(serializers.ModelSerializer): - """ - Serializes Criterions - """ - - class Meta: - model = Criterion - fields = ("id", "name") +from .models import Criterion, validate_rating class SmallSportListSerializer(serializers.BaseSerializer): diff --git a/unisportomat/quiz/views.py b/unisportomat/quiz/views.py index 7981fca..4694b7b 100644 --- a/unisportomat/quiz/views.py +++ b/unisportomat/quiz/views.py @@ -15,9 +15,6 @@ from .course_scraper.course_scraper import scraping from .serializers import ( SingleQuestionSerializer, SmallSportListSerializer, - SportListSerializer, - CriterionListSerializer, - QuestionListSerializer, SingleSportSerializer, CriteriaSerializer, IncompleteSportSerializer, diff --git a/unisportomat/unisportomat/urls.py b/unisportomat/unisportomat/urls.py index ab754c0..e5cac8b 100644 --- a/unisportomat/unisportomat/urls.py +++ b/unisportomat/unisportomat/urls.py @@ -26,7 +26,6 @@ router.register(r"activity", views.ActivityView, "activity") urlpatterns = [ path("admin/", admin.site.urls), - path("api/admin/", include(router.urls)), path( "api/admin/sport/incomplete/", views.IncompleteSportView.as_view(), @@ -38,4 +37,5 @@ urlpatterns = [ path("api/admin/question/order", views.QuestionOrderView.as_view(), name="order"), path("api/admin/greeting/", views.GreetingView.as_view(), name="greeting"), path("api/admin/end/", views.EndView.as_view(), name="end"), + path("api/admin/", include(router.urls)), ] -- GitLab