fix: 발표를 타입명으로 필터링할 수 있도록 수정

Author: MU-Software

app/event/presentation/test/api_test.py

@@ -1,10 +1,13 @@
 import http
-import uuid
+import urllib.parse
 
 import pytest
 from django.urls import reverse
+from event.models import Event
+from event.presentation.models import Presentation, PresentationType
 from event.presentation.test.conftest import PresentationTestEntity
 from rest_framework.test import APIClient
+from user.models.organization import Organization
 
 
 @pytest.mark.django_db
@@ -16,20 +19,48 @@ def test_presentation_api(api_client: APIClient, create_presentation_set: Presen
 
 
 @pytest.mark.django_db
-def test_presentation_category_filter_api(api_client: APIClient, create_presentation_set: PresentationTestEntity):
-    url = f"{reverse('v1:presentation-list')}?categories={create_presentation_set.presentation_category.id}"
-    response = api_client.get(url)
+def test_presentation_event_type_filter_api(api_client: APIClient):
+    # Given: 행사 2개에 각각 2 종류의 발표 유형이 있고, 각 발표 유형마다 1개의 발표가 있음.
+    organization = Organization.objects.create(name="Test Organization")
+    event_1: Event = Event.objects.create(organization=organization, name="Test Event 1")
+    event_2: Event = Event.objects.create(organization=organization, name="Test Event 2")
+
+    event_1_prst_type_1 = PresentationType.objects.create(event=event_1, name="Type 1")
+    event_1_prst_type_2 = PresentationType.objects.create(event=event_1, name="Type 2")
+    event_2_prst_type_1 = PresentationType.objects.create(event=event_2, name="Type 1")
+    event_2_prst_type_2 = PresentationType.objects.create(event=event_2, name="Type 2")
+
+    event_1_prst_type_1_prst = Presentation.objects.create(type=event_1_prst_type_1, title="Presentation 1")
+    event_1_prst_type_2_prst = Presentation.objects.create(type=event_1_prst_type_2, title="Presentation 2")
+    event_2_prst_type_1_prst = Presentation.objects.create(type=event_2_prst_type_1, title="Presentation 3")
+    Presentation.objects.create(type=event_2_prst_type_2, title="Presentation 4")
+
+    # When: API 요청을 통해 행사 1의 발표 유형 1과 2에 해당하는 발표를 요청할 시
+    qs = urllib.parse.urlencode(
+        {"event": event_1.name, "types": f"{event_1_prst_type_1.name},{event_1_prst_type_2.name}"}
+    )
+    response = api_client.get(f"{reverse('v1:presentation-list')}?{qs}")
 
+    # Then: 행사 1의 발표 유형 1과 2에 해당하는 발표가 반환되어야 함.
     assert response.status_code == http.HTTPStatus.OK
-    assert len(response.json()) > 0
 
+    response_data = response.json()
+    assert len(response_data) == 2, "Should return 2 presentations for event 1 with specified types"
+    assert {datum["id"] for datum in response_data} == {
+        str(event_1_prst_type_1_prst.id),
+        str(event_1_prst_type_2_prst.id),
+    }
 
-@pytest.mark.django_db
-def test_presentation_category_filter_api_should_not_return_unknown_category_id(
-    api_client: APIClient, create_presentation_set: PresentationTestEntity
-):
-    url = f"{reverse('v1:presentation-list')}?categories={uuid.uuid4()}"
-    response = api_client.get(url)
+    # When: API 요청을 통해 행사 유형은 지정하지 않고 유형 1에 해당하는 발표를 요청할 시
+    qs = urllib.parse.urlencode({"types": event_1_prst_type_1.name})
+    response = api_client.get(f"{reverse('v1:presentation-list')}?{qs}")
 
+    # Then: 행사 1의 발표 유형 1과 행사 2의 발표 유형 1에 해당하는 발표가 반환되어야 함.
     assert response.status_code == http.HTTPStatus.OK
-    assert len(response.json()) == 0, "Should not return any presentations for unknown category ID"
+
+    response_data = response.json()
+    assert len(response_data) == 2, "Should return presentations for type 1 across all events"
+    assert {datum["id"] for datum in response_data} == {
+        str(event_1_prst_type_1_prst.id),
+        str(event_2_prst_type_1_prst.id),
+    }

app/event/presentation/views.py

@@ -1,27 +1,30 @@
-from core.const.regex import UUID_V4_REGEX
 from core.const.tag import OpenAPITag
-from django.db.models import QuerySet
+from core.models import BaseAbstractModelQuerySet
+from django.db.models import Q
 from django.utils.decorators import method_decorator
 from django_filters import rest_framework as filters
 from django_filters.constants import EMPTY_VALUES
 from drf_spectacular.utils import extend_schema
-from event.presentation.models import Presentation, PresentationCategory, PresentationCategoryRelation
+from event.presentation.models import Presentation, PresentationCategory
 from event.presentation.serializers import PresentationSerializer
-from rest_framework import mixins, serializers, viewsets
+from rest_framework import mixins, viewsets
 
 
 class PresentationFilterSet(filters.FilterSet):
-    type = filters.UUIDFilter(field_name="type_id")
-    categories = filters.BaseCSVFilter(method="filter_by_category_ids")
+    event = filters.CharFilter(method="filter_by_event_name")
+    types = filters.BaseCSVFilter(method="filter_by_type_names")
 
-    def filter_by_category_ids(self, queryset: QuerySet, name: str, value: list[str]) -> QuerySet:
-        if not value or value in EMPTY_VALUES:
+    def filter_by_event_name(self, queryset: BaseAbstractModelQuerySet, name: str, value: str) -> Q:
+        if value in EMPTY_VALUES:
             return queryset
-        if not any(UUID_V4_REGEX.match(v) for v in value):
-            return serializers.ValidationError(f"Invalid UUID format in {name} filter: {value}.")
 
-        target_ids = PresentationCategoryRelation.objects.filter(category__id__in=value).values_list("presentation_id")
-        return queryset.filter(id__in=target_ids)
+        return queryset.filter(Q(type__event__name_ko=value) | Q(type__event__name_en=value))
+
+    def filter_by_type_names(self, queryset: BaseAbstractModelQuerySet, name: str, values: list[str]) -> Q:
+        if values in EMPTY_VALUES:
+            return queryset
+
+        return queryset.filter(Q(type__name_ko__in=values) | Q(type__name_en__in=values))
 
 
 @method_decorator(name="list", decorator=extend_schema(tags=[OpenAPITag.EVENT_PRESENTATION]))