Merge pull request #160 from pythonkr/fix/sponsor-level

Fix: 후원사 등급 별 후원사 목록 API 추가

Author: jungmir

sponsor/serializers.py

@@ -70,11 +70,7 @@ class Meta:
             "level",
             "id",
         ]
-        read_only_fields = [
-            "name",
-            "level",
-            "id",
-        ]
+        read_only_fields = ["id"]
 
 
 class SponsorLevelSerializer(serializers.ModelSerializer):
@@ -97,12 +93,20 @@ class Meta:
         read_only_fields = ["id"]
 
 
+class SponsorSummariesSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Sponsor
+        fields = ["name", "desc", "url", "logo_image", "id"]
+
+
 class SponsorWithLevelSerializer(serializers.ModelSerializer):
-    sponsor = SponsorSerializer(read_only=True, many=True, source="sponsor_set")
+    sponsor = SponsorSummariesSerializer(
+        read_only=True, many=True, source="sponsor_set"
+    )
 
     class Meta:
         model = SponsorLevel
-        fields = ["name", "order", "sponsor"]
+        fields = ["id", "name", "visible", "order", "sponsor"]
 
 
 class SponsorDetailSerializer(serializers.ModelSerializer):
@@ -126,6 +130,8 @@ def get_creator_userid(obj: Sponsor):
 
 
 class SponsorListSerializer(serializers.ModelSerializer):
+    level = SponsorLevelSerializer(read_only=True)
+
     class Meta:
         model = Sponsor
         fields = [

sponsor/urls.py

@@ -27,6 +27,9 @@
             {"get": "retrieve", "delete": "destroy", "put": "update"}
         ),
     ),
+    path(
+        "levels/with-sponsor/", SponsorLevelViewSet.as_view({"get": "list_with_levels"})
+    ),
     path(
         "levels/benefits/",
         SponsorLevelViewSet.as_view(

sponsor/viewsets.py

@@ -14,12 +14,13 @@
 from sponsor.serializers import (
     PatronListSerializer,
     SponsorDetailSerializer,
-    SponsorWithLevelSerializer,
+    SponsorListSerializer,
     SponsorRemainingAccountSerializer,
     SponsorSerializer,
     SponsorLevelSerializer,
     SponsorBenefitSerializer,
     BenefitByLevelSerializer,
+    SponsorWithLevelSerializer,
 )
 from sponsor.slack import send_new_sponsor_notification
 from sponsor.validators import SponsorValidater
@@ -45,9 +46,16 @@ def get_serializer_class(self):
         match self.action:
             case "create_or_update_benefits" | "assign_benefits":
                 return BenefitByLevelSerializer
+            case "list_with_levels":
+                return SponsorWithLevelSerializer
             case _:
                 return SponsorLevelSerializer
 
+    @action(detail=False, methods=["GET"], url_path="with-sponsor")
+    def list_with_levels(self, request, version):
+        serializer = self.get_serializer(self.get_queryset(), many=True)
+        return Response(serializer.data)
+
     @action(detail=False, methods=["POST"])
     def assign_benefits(self, request, version):
         serializer = self.get_serializer(data=request.data)
@@ -86,13 +94,13 @@ def get_queryset(self):
         return (
             super()
             .get_queryset()
-            .filter(paid_at__isnull=False, level__year=self.request.version)
+            .filter(level__year=self.request.version)
             .order_by("level__order", "paid_at")
         )
 
     def get_serializer_class(self):
         if self.action == "list":
-            return SponsorWithLevelSerializer
+            return SponsorListSerializer
         return SponsorSerializer
 
     @atomic