Merge pull request #175 from pythonkr/devdev

어드민 페이지에서 후원사 정보가 보기 편하도록 수정

Author: jungmir

sponsor/admin.py

@@ -20,8 +20,9 @@ class SponsorAdmin(SummernoteModelAdmin):
         "submitted",
         "accepted",
         "paid_at",
+        "year",
     )
-    list_filter = ("accepted", "submitted")
+    list_filter = ("accepted", "submitted", "paid_at")
     ordering = ("-created_at",)
 
 

sponsor/models.py

@@ -67,7 +67,7 @@ def accepted_count(self):
         return Sponsor.objects.filter(level=self, submitted=True, accepted=True).count()
 
     def __str__(self):
-        return self.name
+        return f"({self.year}) {self.name}"
 
 
 class BenefitByLevel(models.Model):

sponsor/serializers.py

@@ -82,10 +82,6 @@ class Meta:
 
 
 class SponsorLevelSerializer(serializers.ModelSerializer):
-    benefits = SponsorBenefitWithOfferSerializer(
-        many=True, read_only=True, source="benefit_by_level"
-    )
-
     class Meta:
         model = SponsorLevel
         fields = [
@@ -96,11 +92,19 @@ class Meta:
             "price",
             "limit",
             "order",
-            "benefits",
         ]
         read_only_fields = ["id"]
 
 
+class SponsorLevelWithBenefitSerializer(SponsorLevelSerializer):
+    benefits = SponsorBenefitWithOfferSerializer(
+        many=True, read_only=True, source="benefit_by_level"
+    )
+
+    class Meta(SponsorLevelSerializer.Meta):
+        fields = SponsorLevelSerializer.Meta.fields + ["benefits"]
+
+
 class SponsorSummariesSerializer(serializers.ModelSerializer):
     class Meta:
         model = Sponsor

sponsor/viewsets.py

@@ -16,11 +16,11 @@
     PatronListSerializer,
     SponsorBenefitSerializer,
     SponsorDetailSerializer,
-    SponsorLevelSerializer,
     SponsorListSerializer,
     SponsorRemainingAccountSerializer,
     SponsorSerializer,
     SponsorWithLevelSerializer,
+    SponsorLevelWithBenefitSerializer,
 )
 from sponsor.slack import send_new_sponsor_notification
 from sponsor.validators import SponsorValidater
@@ -49,7 +49,7 @@ def get_serializer_class(self):
             case "list_with_levels":
                 return SponsorWithLevelSerializer
             case _:
-                return SponsorLevelSerializer
+                return SponsorLevelWithBenefitSerializer
 
     @action(detail=False, methods=["GET"], url_path="with-sponsor")
     def list_with_levels(self, request, version):