From f36e9e43dd118504e1316162c612c14a0e6d701e Mon Sep 17 00:00:00 2001 From: Mads Nylund Date: Thu, 2 May 2024 12:45:49 +0200 Subject: [PATCH] added serializer for category in event --- CHANGELOG.md | 1 + app/content/serializers/category.py | 6 ++++++ app/content/serializers/event.py | 3 +++ 3 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fc6c0226..3174fbc87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ ## Neste versjon ## Versjon 2024.05.01 +- ⚡**Arrangement**. Et arrangement vil nå få kategori sendt som navn på kategori istedenfor kun id. - ⚡**Påmelding**. En bruker som har betalt for en påmelding på et arrangement kan ikke lenger melde seg av. ## Versjon 2024.04.16 diff --git a/app/content/serializers/category.py b/app/content/serializers/category.py index d5e07ee7f..dc60ed8fb 100644 --- a/app/content/serializers/category.py +++ b/app/content/serializers/category.py @@ -7,3 +7,9 @@ class CategorySerializer(BaseModelSerializer): class Meta: model = Category fields = "__all__" # bad form + + +class SimpleCategorySerializer(BaseModelSerializer): + class Meta: + model = Category + fields = ("id", "text") diff --git a/app/content/serializers/event.py b/app/content/serializers/event.py index 737b8a818..f2deee1b1 100644 --- a/app/content/serializers/event.py +++ b/app/content/serializers/event.py @@ -6,6 +6,7 @@ from app.common.enums import GroupType from app.common.serializers import BaseModelSerializer from app.content.models import Event, PriorityPool +from app.content.serializers.category import SimpleCategorySerializer from app.content.serializers.priority_pool import ( PriorityPoolCreateSerializer, PriorityPoolSerializer, @@ -30,6 +31,7 @@ class EventSerializer(serializers.ModelSerializer): ) contact_person = DefaultUserSerializer(read_only=True, required=False) reactions = ReactionSerializer(required=False, many=True) + category = SimpleCategorySerializer(read_only=True) class Meta: model = Event @@ -104,6 +106,7 @@ def validate_limit(self, limit): class EventListSerializer(serializers.ModelSerializer): expired = serializers.BooleanField(read_only=True) organizer = SimpleGroupSerializer(read_only=True) + category = SimpleCategorySerializer(read_only=True) class Meta: model = Event