Add awarded badge and campaign details to badge and campaign templates

templates/twitch/badge_set_detail.html

@@ -67,6 +67,18 @@
                             {% else %}
                                 <em>None</em>
                             {% endif %}
+                            {% if badge.award_campaigns %}
+                                <div style="margin-top: 8px; font-size: 0.9em;">
+                                    <strong>Awarded by Drop Campaigns:</strong>
+                                    <ul style="margin: 0; padding-left: 18px;">
+                                        {% for campaign in badge.award_campaigns %}
+                                            <li>
+                                                <a href="{% url 'twitch:campaign_detail' campaign.twitch_id %}">{{ campaign.clean_name }}</a>
+                                            </li>
+                                        {% endfor %}
+                                    </ul>
+                                </div>
+                            {% endif %}
                         </td>
                     </tr>
                 {% endfor %}

templates/twitch/campaign_detail.html

@@ -155,6 +155,20 @@
                                          src="{{ benefit.image_best_url|default:benefit.image_asset_url }}"
                                          alt="{{ benefit.name }}" />
                                 {% endif %}
+                                {% if benefit.distribution_type == "BADGE" and drop.awarded_badge %}
+                                    <div style="margin-top: 6px; font-size: 0.9em;">
+                                        <strong>Awards Badge:</strong>
+                                        <a href="{% url 'twitch:badge_set_detail' set_id=drop.awarded_badge.badge_set.set_id %}">
+                                            <img src="{{ drop.awarded_badge.image_url_2x }}"
+                                                 alt="{{ drop.awarded_badge.title }} badge"
+                                                 height="24"
+                                                 width="24"
+                                                 style="vertical-align: middle;
+                                                        margin-right: 4px" />
+                                            {{ drop.awarded_badge.title }}
+                                        </a>
+                                    </div>
+                                {% endif %}
                             {% endfor %}
                         </td>
                         <td>

twitch/views.py

@@ -320,7 +320,7 @@ def _enhance_drops_with_context(drops: QuerySet[TimeBasedDrop], now: datetime.da
     Returns:
         List of dicts with drop, local_start, local_end, timezone_name, and countdown_text.
     """
-    enhanced = []
+    enhanced: list[dict[str, Any]] = []
     for drop in drops:
         if drop.end_at and drop.end_at > now:
             time_diff: datetime.timedelta = drop.end_at - now
@@ -441,7 +441,16 @@ def drop_campaign_detail_view(request: HttpRequest, twitch_id: str) -> HttpRespo
         campaign_data[0]["fields"]["drops"] = drops_data
 
     now: datetime.datetime = timezone.now()
-    enhanced_drops = _enhance_drops_with_context(drops, now)
+    enhanced_drops: list[dict[str, Any]] = _enhance_drops_with_context(drops, now)
+    # Attach awarded_badge to each drop in enhanced_drops
+    for enhanced_drop in enhanced_drops:
+        drop = enhanced_drop["drop"]
+        awarded_badge = None
+        for benefit in drop.benefits.all():
+            if benefit.distribution_type == "BADGE":
+                awarded_badge: ChatBadge | None = ChatBadge.objects.filter(title=benefit.name).first()
+                break
+        enhanced_drop["awarded_badge"] = awarded_badge
 
     context: dict[str, Any] = {
         "campaign": campaign,
@@ -580,6 +589,20 @@ class GameDetailView(DetailView):
         game: Game = self.get_object()  # pyright: ignore[reportAssignmentType]
 
         now: datetime.datetime = timezone.now()
+        # For each drop, find awarded badge (distribution_type BADGE)
+        drop_awarded_badges: dict[str, ChatBadge] = {}
+        drops: QuerySet[TimeBasedDrop, TimeBasedDrop] = TimeBasedDrop.objects.filter(
+            campaign__game=game,
+        ).prefetch_related("benefits")
+
+        for drop in drops:
+            for benefit in drop.benefits.all():
+                if benefit.distribution_type == "BADGE":
+                    # Find badge by title
+                    badge: ChatBadge | None = ChatBadge.objects.filter(title=benefit.name).first()
+                    if badge:
+                        drop_awarded_badges[drop.twitch_id] = badge
+
         all_campaigns: QuerySet[DropCampaign] = (
             DropCampaign.objects
             .filter(game=game)
@@ -670,6 +693,7 @@ class GameDetailView(DetailView):
                 "upcoming_campaigns": upcoming_campaigns,
                 "expired_campaigns": expired_campaigns,
                 "owners": list(game.owners.all()),
+                "drop_awarded_badges": drop_awarded_badges,
                 "now": now,
                 "game_data": format_and_color_json(game_data[0]),
             },
@@ -1221,6 +1245,17 @@ def badge_set_detail_view(request: HttpRequest, set_id: str) -> HttpResponse:
 
     badges: QuerySet[ChatBadge] = badge_set.badges.all()  # pyright: ignore[reportAttributeAccessIssue]
 
+    # Attach award_campaigns attribute to each badge for template use
+    for badge in badges:
+        benefits: QuerySet[DropBenefit, DropBenefit] = DropBenefit.objects.filter(
+            distribution_type="BADGE",
+            name=badge.title,
+        )
+        campaigns: QuerySet[DropCampaign, DropCampaign] = DropCampaign.objects.filter(
+            time_based_drops__benefits__in=benefits,
+        ).distinct()
+        badge.award_campaigns = list(campaigns)  # pyright: ignore[reportAttributeAccessIssue]
+
     # Serialize for JSON display
     serialized_set = serialize(
         "json",