fix: 변경된 세션 모델을 serializer들에도 반영

Author: MU-Software

app/admin_api/filtersets/event/presentation.py

@@ -0,0 +1,13 @@
+from django_filters import rest_framework as filters
+
+
+class PresentationCategoryAdminFilterSet(filters.FilterSet):
+    type = filters.UUIDFilter(field_name="type_id")
+
+
+class PresentationAdminFilterSet(filters.FilterSet):
+    type = filters.UUIDFilter(field_name="type_id")
+
+
+class PresentationSpeakerAdminFilterSet(filters.FilterSet):
+    presentation = filters.UUIDFilter(field_name="presentation_id")

app/admin_api/serializers/event/presentation.py

@@ -2,7 +2,9 @@
 from core.serializer.base_abstract_serializer import BaseAbstractSerializer
 from core.serializer.json_schema_serializer import JsonSchemaSerializer
 from event.presentation.models import Presentation, PresentationCategory, PresentationSpeaker, PresentationType
+from file.models import PublicFile
 from rest_framework import serializers
+from user.models import UserExt
 
 
 class PresentationTypeAdminSerializer(BaseAbstractSerializer, JsonSchemaSerializer, serializers.ModelSerializer):
@@ -18,12 +20,43 @@ class Meta:
 
 
 class PresentationAdminSerializer(BaseAbstractSerializer, JsonSchemaSerializer, serializers.ModelSerializer):
+    class PresentationCategoryField(serializers.PrimaryKeyRelatedField):
+        def get_queryset(self):
+            qs = super().get_queryset()
+            return qs.filter(type=self.instance.type) if self.instance else qs.none()
+
+    categories = PresentationCategoryField(
+        many=True, required=False, queryset=PresentationCategory.objects.filter_active()
+    )
+
     class Meta:
         model = Presentation
-        fields = COMMON_ADMIN_FIELDS + ("title_ko", "title_en")
+        fields = COMMON_ADMIN_FIELDS + (
+            "categories",
+            "type",
+            "title_ko",
+            "title_en",
+            "description_ko",
+            "description_en",
+        )
+
+    def validate(self, attrs: dict) -> dict:
+        type = attrs.get("type", getattr(self.instance, "type", None))
+        categories = attrs.get("categories", getattr(self.instance, "categories", []))
+
+        if type and categories:
+            if not all(category.type == type for category in categories):
+                raise serializers.ValidationError("All categories must belong to the same type.")
+
+        return super().validate(attrs)
 
 
 class PresentationSpeakerAdminSerializer(BaseAbstractSerializer, JsonSchemaSerializer, serializers.ModelSerializer):
+    user = serializers.PrimaryKeyRelatedField(queryset=UserExt.objects.filter(is_active=True))
+    image = serializers.PrimaryKeyRelatedField(
+        queryset=PublicFile.objects.filter_active(), allow_null=True, required=False
+    )
+
     class Meta:
         model = PresentationSpeaker
-        fields = COMMON_ADMIN_FIELDS + ("presentation", "user", "biography_ko", "biography_en")
+        fields = COMMON_ADMIN_FIELDS + ("presentation", "user", "image", "biography_ko", "biography_en")

app/admin_api/urls.py

@@ -2,6 +2,7 @@
 from admin_api.views.event.event import EventAdminViewSet
 from admin_api.views.event.presentation import (
     PresentationAdminViewSet,
+    PresentationCategoryAdminViewSet,
     PresentationSpeakerAdminViewSet,
     PresentationTypeAdminViewSet,
 )
@@ -28,11 +29,9 @@
 admin_event_router.register("sponsortag", SponsorTagAdminViewSet)
 admin_event_router.register("sponsor", SponsorAdminViewSet)
 admin_event_router.register("presentationtype", PresentationTypeAdminViewSet)
+admin_event_router.register("presentationcategory", PresentationCategoryAdminViewSet)
 admin_event_router.register("presentation", PresentationAdminViewSet)
-admin_event_router.register(
-    "presentation/(?P<presentation_id>{UUID_V4_PATTERN})/speaker",
-    PresentationSpeakerAdminViewSet,
-)
+admin_event_router.register("presentationspeaker", PresentationSpeakerAdminViewSet)
 
 urlpatterns = [
     path("cms/", include(admin_cms_router.urls)),

app/admin_api/views/event/presentation.py

@@ -1,25 +1,27 @@
 from __future__ import annotations
 
+from admin_api.filtersets.event.presentation import (
+    PresentationAdminFilterSet,
+    PresentationCategoryAdminFilterSet,
+    PresentationSpeakerAdminFilterSet,
+)
 from admin_api.serializers.event.presentation import (
     PresentationAdminSerializer,
     PresentationCategoryAdminSerializer,
     PresentationSpeakerAdminSerializer,
     PresentationTypeAdminSerializer,
 )
-from core.const.regex import UUID_V4_PATTERN
 from core.const.tag import OpenAPITag
 from core.permissions import IsSuperUser
 from core.viewset.json_schema_viewset import JsonSchemaViewSet
-from django.db import models
 from drf_spectacular.utils import extend_schema, extend_schema_view
 from event.presentation.models import (
     Presentation,
     PresentationCategory,
-    PresentationCategoryRelation,
     PresentationSpeaker,
     PresentationType,
 )
-from rest_framework import decorators, exceptions, request, response, status, viewsets
+from rest_framework import viewsets
 
 ADMIN_METHODS = ["list", "retrieve", "create", "update", "partial_update", "destroy"]
 
@@ -31,92 +33,29 @@ class PresentationTypeAdminViewSet(JsonSchemaViewSet, viewsets.ModelViewSet):
     permission_classes = [IsSuperUser]
     queryset = PresentationType.objects.filter_active().select_related("created_by", "updated_by", "deleted_by")
 
-    @extend_schema(
-        tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION],
-        responses={status.HTTP_200_OK: PresentationCategoryAdminSerializer(many=True)},
-    )
-    @decorators.action(detail=True, methods=["get"], url_path="categories")
-    def list_categories(self, *args: tuple, **kwargs: dict) -> response.Response:
-        categories = PresentationCategory.objects.filter_active().filter(type=self.get_object())
-        return response.Response(data=PresentationCategoryAdminSerializer(instance=categories, many=True).data)
-
-    @extend_schema(
-        tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION],
-        request=PresentationCategoryAdminSerializer,
-        responses={status.HTTP_201_CREATED: PresentationCategoryAdminSerializer},
-    )
-    @decorators.action(detail=True, methods=["post"], url_path="categories")
-    def add_category(self, request: request.Request, *args: tuple, **kwargs: dict) -> response.Response:
-        serializer = PresentationCategoryAdminSerializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-        serializer.save()
-        return response.Response(data=serializer.data, status=status.HTTP_201_CREATED)
-
-    @extend_schema(
-        tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION],
-        request=PresentationCategoryAdminSerializer,
-        responses={status.HTTP_200_OK: PresentationCategoryAdminSerializer},
-    )
-    @decorators.action(detail=True, methods=["patch"], url_path=f"categories/(?P<category_id>{UUID_V4_PATTERN})")
-    def update_category(self, request: request.Request, pk: str, category_id: str, *args, **kwargs):
-        if not (category := PresentationCategory.objects.filter_active().filter(type_id=pk, id=category_id).first()):
-            raise exceptions.NotFound(detail="Category not found.")
-
-        serializer = PresentationCategoryAdminSerializer(instance=category, data=request.data, partial=True)
-        serializer.is_valid(raise_exception=True)
-        serializer.save()
-        return response.Response(data=serializer.data)
 
-    @extend_schema(tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION], responses={status.HTTP_204_NO_CONTENT: None})
-    @decorators.action(detail=True, methods=["delete"], url_path=f"categories/(?P<category_id>{UUID_V4_PATTERN})")
-    def delete_category(self, pk: str, category_id: str, *args: tuple, **kwargs: dict) -> response.Response:
-        if not (category := PresentationCategory.objects.filter_active().filter(type_id=pk, id=category_id).first()):
-            raise exceptions.NotFound(detail="Category not found.")
-
-        category.delete()
-        return response.Response(status=status.HTTP_204_NO_CONTENT)
+@extend_schema_view(**{m: extend_schema(tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION]) for m in ADMIN_METHODS})
+class PresentationCategoryAdminViewSet(JsonSchemaViewSet, viewsets.ModelViewSet):
+    http_method_names = ["get", "post", "patch", "delete"]
+    serializer_class = PresentationCategoryAdminSerializer
+    permission_classes = [IsSuperUser]
+    filterset_class = PresentationCategoryAdminFilterSet
+    queryset = PresentationCategory.objects.filter_active().select_related("created_by", "updated_by", "deleted_by")
 
 
 @extend_schema_view(**{m: extend_schema(tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION]) for m in ADMIN_METHODS})
 class PresentationAdminViewSet(JsonSchemaViewSet, viewsets.ModelViewSet):
     http_method_names = ["get", "post", "patch", "delete"]
     serializer_class = PresentationAdminSerializer
     permission_classes = [IsSuperUser]
+    filterset_class = PresentationAdminFilterSet
     queryset = Presentation.objects.get_all_nested_data().select_related("created_by", "updated_by", "deleted_by")
 
-    @extend_schema(
-        tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION],
-        responses={status.HTTP_200_OK: PresentationCategoryAdminSerializer(many=True)},
-    )
-    @decorators.action(detail=True, methods=["get"], url_path="categories")
-    def list_categories(self, *args: tuple, **kwargs: dict) -> response.Response:
-        categories = self.get_object().active_categories
-        return response.Response(data=PresentationCategoryAdminSerializer(instance=categories, many=True).data)
-
-    @extend_schema(tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION], responses={status.HTTP_201_CREATED: None})
-    @decorators.action(detail=True, methods=["post"], url_path="categories/(?P<category_id>{UUID_V4_PATTERN})")
-    def add_category(self, pk: str, category_id: str, *args: tuple, **kwargs: dict) -> response.Response:
-        PresentationCategoryRelation.objects.get_or_create(presentation_id=pk, category_id=category_id)
-        return response.Response(status=status.HTTP_201_CREATED)
-
-    @extend_schema(tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION], responses={status.HTTP_204_NO_CONTENT: None})
-    @decorators.action(detail=True, methods=["delete"], url_path="categories/(?P<category_id>{UUID_V4_PATTERN})")
-    def remove_category(self, pk: str, category_id: str, *args: tuple, **kwargs: dict) -> response.Response:
-        if not (
-            relation := PresentationCategoryRelation.objects.filter(presentation_id=pk, category_id=category_id).first()
-        ):
-            raise exceptions.NotFound(detail="Category is not associated with this presentation.")
-
-        relation.delete()
-        return response.Response(status=status.HTTP_204_NO_CONTENT)
-
 
 @extend_schema_view(**{m: extend_schema(tags=[OpenAPITag.ADMIN_EVENT_PRESENTATION]) for m in ADMIN_METHODS})
 class PresentationSpeakerAdminViewSet(JsonSchemaViewSet, viewsets.ModelViewSet):
     http_method_names = ["get", "post", "patch", "delete"]
     serializer_class = PresentationSpeakerAdminSerializer
     permission_classes = [IsSuperUser]
+    filterset_class = PresentationSpeakerAdminFilterSet
     queryset = PresentationSpeaker.objects.filter_active().select_related("created_by", "updated_by", "deleted_by")
-
-    def get_queryset(self) -> models.QuerySet[PresentationSpeaker]:
-        return super().get_queryset().filter(presentation_id=self.kwargs["presentation_id"])

app/event/presentation/serializers.py

@@ -10,16 +10,18 @@ class Meta:
 
 class PresentationSpeakerSerializer(serializers.ModelSerializer):
     nickname = serializers.CharField(source="user.nickname", read_only=True)
+    image = serializers.FileField(source="image.file", read_only=True, allow_null=True)
 
     class Meta:
         model = PresentationSpeaker
-        fields = ("id", "nickname", "biography")
+        fields = ("id", "nickname", "biography", "image")
 
 
 class PresentationSerializer(serializers.ModelSerializer):
-    categories = PresentationCategorySerializer(source="active_categories", many=True, read_only=True)
-    speakers = PresentationSpeakerSerializer(source="active_speakers", many=True, read_only=True)
+    image = serializers.FileField(source="image.file", read_only=True, allow_null=True)
+    categories = PresentationCategorySerializer(many=True, read_only=True)
+    speakers = PresentationSpeakerSerializer(many=True, read_only=True)
 
     class Meta:
         model = Presentation
-        fields = ("id", "title", "categories", "speakers")
+        fields = ("id", "title", "description", "image", "categories", "speakers")