diff --git a/unisportomat/quiz/serializers.py b/unisportomat/quiz/serializers.py index 0400657ef05892bda1917c908104afe797a34e0c..37b11e95f8c752fd069ef40970741f0b02aaec90 100644 --- a/unisportomat/quiz/serializers.py +++ b/unisportomat/quiz/serializers.py @@ -12,7 +12,7 @@ class SportListSerializer(serializers.ModelSerializer): class Meta: model = Sport - fields = ("pk", "name", "url", "criteria_ratings") + fields = ("id", "name", "url", "criteria_ratings") class QuestionListSerializer(serializers.ModelSerializer): @@ -23,7 +23,7 @@ class QuestionListSerializer(serializers.ModelSerializer): class Meta: model = Question - fields = ("pk", "text", "criterion") + fields = ("id", "text", "criterion") class CriterionListSerializer(serializers.ModelSerializer): @@ -33,7 +33,7 @@ class CriterionListSerializer(serializers.ModelSerializer): class Meta: model = Criterion - fields = ("pk", "name") + fields = ("id", "name") class SmallSportListSerializer(serializers.BaseSerializer): @@ -44,7 +44,7 @@ class SmallSportListSerializer(serializers.BaseSerializer): for sport, boolean in sport_instances: serialized_data.append( { - "pk": sport.pk, + "id": sport.pk, "name": sport.name, "url": sport.url, "is_filled": boolean, @@ -59,7 +59,7 @@ class SingleSportSerializer(serializers.BaseSerializer): serialized_data = {} - serialized_data["pk"] = sport.pk + serialized_data["id"] = sport.pk serialized_data["name"] = sport.name serialized_data["url"] = sport.url @@ -68,7 +68,7 @@ class SingleSportSerializer(serializers.BaseSerializer): for criterion in sport.criteria_ratings.iterator(): criterion_data = {} - criterion_data["pk"] = criterion.pk + criterion_data["id"] = criterion.pk criterion_data["name"] = criterion.name # The iterator iterates over the Criterions connected, and not the criterion connection itself, so we need to get that one again diff --git a/unisportomat/quiz/views.py b/unisportomat/quiz/views.py index 275d97ad148bff07106c802555b0dc591aec5dfb..838913890b8df058f4bd1f97e3d0338719fa8724 100644 --- a/unisportomat/quiz/views.py +++ b/unisportomat/quiz/views.py @@ -128,7 +128,7 @@ class SmallSportListView(viewsets.ViewSet): for criterion in data_dict["criteria"]: new_sport.rate( - Criterion.objects.get(pk=criterion["pk"]), criterion["value"] + Criterion.objects.get(pk=criterion["id"]), criterion["value"] ) new_sport.save() @@ -171,11 +171,3 @@ class SmallSportListView(viewsets.ViewSet): def destroy(self, request, pk=None): return Response({"test": "Removing a Single Entry"}) - - -# Dev Notes: -# - This is a singular APIView which isn't meant to expose complete lists -# - It cannot be written into the Router, as it isn't a Viewset, so it is written directly into the urls.py's urlspatterns like this: -# path(r"api/admin/single-small-sport-list", views.SmallSportListAPIView.as_view()) -# - The API isn't in the list in /api/admin because of that, but needs to be called manually here: -# http://localhost:8000/api/admin/single-small-sport-list