fix: 후원자의 한마디 필터 관련 수정

Author: MU-Software

app/shop/patron.py

@@ -1,10 +1,10 @@
 from core.const.tag import OpenAPITag
-from django.db.models import CharField, DecimalField, Exists, F, OuterRef, Q, Subquery, Sum, Value
+from django.db.models import CharField, DecimalField, Exists, F, OuterRef, Subquery, Sum, TextField, Value
 from django.db.models.functions import Coalesce
 from django_filters import rest_framework as filters
 from drf_spectacular.utils import extend_schema, extend_schema_view
 from rest_framework import mixins, routers, serializers, status, viewsets
-from shop.order.models import Order, OrderProductOptionRelation, OrderProductRelation
+from shop.order.models import Order, OrderProductRelation, TicketInfo
 from shop.payment_history.models import REFUNDABLE_STATUSES, PaymentHistory
 
 
@@ -18,27 +18,12 @@ class Meta:
 
 class PatronSerializer(serializers.ModelSerializer):
     name = serializers.CharField(source="customer_info.name", allow_null=True)
+    contribution_message = serializers.CharField(read_only=True)
 
     class Meta:
-        fields: list[str] = ["name"]
+        fields: list[str] = ["name", "contribution_message"]
         model = Order
 
-    def to_representation(self, instance: Order) -> dict[str, str]:
-        result = super().to_representation(instance)
-
-        opor: OrderProductOptionRelation = (
-            OrderProductOptionRelation.objects.filter_active()
-            .filter(
-                Q(product_option_group__name__contains="후원자") | Q(product_option_group__name__contains="message"),
-                order_product_relation__order=instance,
-                order_product_relation__deleted_at__isnull=True,
-                product_option_group__name__contains="후원자",
-                product_option_group__is_custom_response=True,
-            )
-            .first()
-        )
-        return result | {"contribution_message": opor.custom_response if opor else ""}
-
 
 @extend_schema_view(
     list=extend_schema(
@@ -64,11 +49,23 @@ class PatronViewSet(mixins.ListModelMixin, viewsets.GenericViewSet):
         .annotate(total=Sum(F("price") + F("donation_price")))
         .values("total")
     )
+    contribution_message_sq = (
+        TicketInfo.objects.filter_active()
+        .filter(order_product_relation__order_id=OuterRef("id"), order_product_relation__deleted_at__isnull=True)
+        .exclude(contribution_message__isnull=True)
+        .exclude(contribution_message="")
+        .values("contribution_message")[:1]
+    )
 
     queryset = (
         Order.objects.filter_active()
         .annotate(
             current_status=Subquery(latest_status_sq, output_field=CharField()),
+            contribution_message=Coalesce(
+                Subquery(contribution_message_sq, output_field=TextField()),
+                Value(""),
+                output_field=TextField(),
+            ),
             has_donation_product=Exists(
                 OrderProductRelation.objects.filter_active().filter(
                     order_id=OuterRef("id"),

app/shop/test/patron_api_test.py

@@ -1,7 +1,7 @@
 import pytest
 from rest_framework.status import HTTP_200_OK
-from shop.order.models import Order, OrderProductOptionRelation
-from shop.product.models import OptionGroup
+from shop.conftest import VALID_TICKET_INFO
+from shop.order.models import Order, TicketInfo
 from shop.test.helpers import PatronApi
 
 
@@ -40,18 +40,12 @@ def test_patron_list_year_filter_matches_order_year(anon_client, order_factory):
 
 
 @pytest.mark.django_db
-def test_patron_list_returns_contribution_message_from_donation_option(anon_client, ticket_product, order_factory):
+def test_patron_list_returns_contribution_message_from_ticket_info(anon_client, order_factory):
     donation_completed_order = order_factory(status="completed", donation=5000)
-    group = OptionGroup.objects.create(
-        product=ticket_product,
-        name="후원자 한마디",
-        is_custom_response=True,
-        custom_response_pattern=r"^.*$",
-    )
-    OrderProductOptionRelation.objects.create(
+    TicketInfo.objects.create(
         order_product_relation=donation_completed_order.products.first(),
-        product_option_group=group,
-        custom_response="응원합니다!",
+        **VALID_TICKET_INFO,
+        contribution_message="응원합니다!",
     )
 
     response = PatronApi(http_client=anon_client).list()