From d63e20aebc4da558c982d49e5621dafd0d995ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Hells=C3=A9n?= <tlovinator@gmail.com>
Date: Wed, 7 Jan 2026 20:55:04 +0100
Subject: [PATCH] Use .twitch_id instead of .id

---
 templates/twitch/campaign_detail.html     |  2 +-
 templates/twitch/campaign_list.html       |  8 ++--
 templates/twitch/channel_detail.html      |  8 ++--
 templates/twitch/channel_list.html        |  4 +-
 templates/twitch/debug.html               |  6 +--
 templates/twitch/games_grid.html          |  2 +-
 templates/twitch/games_list.html          |  4 +-
 templates/twitch/org_list.html            |  2 +-
 templates/twitch/organization_detail.html |  4 +-
 templates/twitch/search_results.html      |  8 +++-
 twitch/views.py                           | 48 +++--------------------
 11 files changed, 32 insertions(+), 64 deletions(-)

diff --git a/templates/twitch/campaign_detail.html b/templates/twitch/campaign_detail.html
index 47d2e1d..0c13c02 100644
--- a/templates/twitch/campaign_detail.html
+++ b/templates/twitch/campaign_detail.html
@@ -130,7 +130,7 @@
             </thead>
             <tbody>
                 {% for drop in drops %}
-                    <tr id="drop-{{ drop.drop.id }}">
+                    <tr id="drop-{{ drop.drop.twitch_id }}">
                         <td>
                             {% for benefit in drop.drop.benefits.all %}
                                 {% if benefit.image_asset_url %}
diff --git a/templates/twitch/campaign_list.html b/templates/twitch/campaign_list.html
index c95e6eb..d6a2f42 100644
--- a/templates/twitch/campaign_list.html
+++ b/templates/twitch/campaign_list.html
@@ -25,9 +25,9 @@
                     <select id="game" name="game">
                         <option value="">All Games</option>
                         {% for game in games %}
-                            <option value="{{ game.id }}"
-                                    {% if selected_game == game.id %}selected{% endif %}>
-                                {{ game.display_name|default:game.name|default:game.slug|default:game.id }}
+                            <option value="{{ game.twitch_id }}"
+                                    {% if selected_game == game.twitch_id %}selected{% endif %}>
+                                {{ game.display_name|default:game.name|default:game.slug|default:game.twitch_id }}
                             </option>
                         {% endfor %}
                     </select>
@@ -80,7 +80,7 @@
                                 <h2 style="margin: 0 0 0.5rem 0;">
                                     <a id="game-link-{{ game_group.grouper.twitch_id }}"
                                        href="{% url 'twitch:game_detail' game_group.grouper.twitch_id %}"
-                                       style="text-decoration: none">{{ game_group.grouper.display_name|default:game_group.grouper.name|default:game_group.grouper.slug|default:game_group.grouper.id }}</a>
+                                       style="text-decoration: none">{{ game_group.grouper.display_name|default:game_group.grouper.name|default:game_group.grouper.slug|default:game_group.grouper.twitch_id }}</a>
                                 </h2>
                                 {% comment %} Check if the owner exists and has a valid ID before creating the link {% endcomment %}
                                 {% if game_group.grouper.owner and game_group.grouper.owner.twitch_id %}
diff --git a/templates/twitch/channel_detail.html b/templates/twitch/channel_detail.html
index 52e923a..4bc4967 100644
--- a/templates/twitch/channel_detail.html
+++ b/templates/twitch/channel_detail.html
@@ -12,7 +12,7 @@
     {% endif %}
     <!-- Channel Info -->
     <p>
-        <strong>Channel ID:</strong> {{ channel.id }}
+        <strong>Channel ID:</strong> {{ channel.twitch_id }}
     </p>
     <p>
         <strong>Added to database:</strong>
@@ -50,7 +50,7 @@
                         </td>
                         <td>
                             {% if campaign.game %}
-                                <a href="{% url 'twitch:game_detail' campaign.game.id %}">
+                                <a href="{% url 'twitch:game_detail' campaign.game.twitch_id %}">
                                     {{ campaign.game.display_name|default:campaign.game.name }}
                                 </a>
                             {% else %}
@@ -94,7 +94,7 @@
                         </td>
                         <td>
                             {% if campaign.game %}
-                                <a href="{% url 'twitch:game_detail' campaign.game.id %}">
+                                <a href="{% url 'twitch:game_detail' campaign.game.twitch_id %}">
                                     {{ campaign.game.display_name|default:campaign.game.name }}
                                 </a>
                             {% else %}
@@ -138,7 +138,7 @@
                         </td>
                         <td>
                             {% if campaign.game %}
-                                <a href="{% url 'twitch:game_detail' campaign.game.id %}">
+                                <a href="{% url 'twitch:game_detail' campaign.game.twitch_id %}">
                                     {{ campaign.game.display_name|default:campaign.game.name }}
                                 </a>
                             {% else %}
diff --git a/templates/twitch/channel_list.html b/templates/twitch/channel_list.html
index e8e17e5..dba3bc9 100644
--- a/templates/twitch/channel_list.html
+++ b/templates/twitch/channel_list.html
@@ -32,9 +32,9 @@
             </thead>
             <tbody>
                 {% for channel in channels %}
-                    <tr id="channel-row-{{ channel.id }}">
+                    <tr id="channel-row-{{ channel.twitch_id }}">
                         <td>
-                            <a id="channel-link-{{ channel.id }}"
+                            <a id="channel-link-{{ channel.twitch_id }}"
                                href="{% url 'twitch:channel_detail' channel.twitch_id %}">{{ channel.display_name }}</a>
                         </td>
                         <td>{{ channel.name }}</td>
diff --git a/templates/twitch/debug.html b/templates/twitch/debug.html
index ed75618..4375f4d 100644
--- a/templates/twitch/debug.html
+++ b/templates/twitch/debug.html
@@ -12,7 +12,7 @@
         {% if games_without_owner %}
             <ul id="games-without-owner-list">
                 {% for game in games_without_owner %}
-                    <li id="game-{{ game.id }}">
+                    <li id="game-{{ game.twitch_id }}">
                         <a href="{% url 'twitch:game_detail' game.twitch_id %}">{{ game.display_name }}</a> (ID: {{ game.twitch_id }})
                     </li>
                 {% endfor %}
@@ -45,7 +45,7 @@
                     {# A benefit is linked to a game via a drop and a campaign. #}
                     {# We use the 'with' tag to get the first drop for cleaner access. #}
                     {% with first_drop=b.drops.all.0 %}
-                        <li id="benefit-{{ b.id }}">
+                        <li id="benefit-{{ b.twitch_id }}">
                             {{ b.name }}
                             {# Check if the relationship path to the game exists #}
                             {% if first_drop and first_drop.campaign and first_drop.campaign.game %}
@@ -124,7 +124,7 @@
                     {% for row in duplicate_name_campaigns %}
                         <tr>
                             <td>
-                                <a href="{% url 'twitch:game_detail' row.game_id %}">{{ row.game__display_name }}</a>
+                                <a href="{% url 'twitch:game_detail' row.game__twitch_id %}">{{ row.game__display_name }}</a>
                             </td>
                             <td>{{ row.name }}</td>
                             <td>{{ row.name_count }}</td>
diff --git a/templates/twitch/games_grid.html b/templates/twitch/games_grid.html
index c2b1df0..d0edf9e 100644
--- a/templates/twitch/games_grid.html
+++ b/templates/twitch/games_grid.html
@@ -16,7 +16,7 @@
                 <div style="display: flex; flex-wrap: wrap; gap: 0.25rem;">
                     {% for organization, games in games_by_org.items %}
                         {% for item in games %}
-                            <article id="game-{{ item.game.id }}"
+                            <article id="game-{{ item.game.twitch_id }}"
                                      style="padding: 0.25rem;
                                             border-radius: 8px;
                                             flex: 1 1 160px;
diff --git a/templates/twitch/games_list.html b/templates/twitch/games_list.html
index ea4e382..dd261f1 100644
--- a/templates/twitch/games_list.html
+++ b/templates/twitch/games_list.html
@@ -10,10 +10,10 @@
         </p>
         {% if games_by_org %}
             {% for organization, games in games_by_org.items %}
-                <h2 id="org-{{ organization.id }}">{{ organization.name }}</h2>
+                <h2 id="org-{{ organization.twitch_id }}">{{ organization.name }}</h2>
                 <ul style="list-style: none; padding: 0; margin: 0;">
                     {% for item in games %}
-                        <li id="game-{{ item.game.id }}">
+                        <li id="game-{{ item.game.twitch_id }}">
                             <a href="{% url 'twitch:game_detail' item.game.twitch_id %}">{{ item.game.display_name }}</a>
                         </li>
                     {% endfor %}
diff --git a/templates/twitch/org_list.html b/templates/twitch/org_list.html
index ae56fe7..d48d613 100644
--- a/templates/twitch/org_list.html
+++ b/templates/twitch/org_list.html
@@ -7,7 +7,7 @@
     {% if orgs %}
         <ul id="org-list">
             {% for organization in orgs %}
-                <li id="org-{{ organization.id }}">
+                <li id="org-{{ organization.twitch_id }}">
                     <a href="{% url 'twitch:organization_detail' organization.twitch_id %}">{{ organization.name }}</a>
                 </li>
             {% endfor %}
diff --git a/templates/twitch/organization_detail.html b/templates/twitch/organization_detail.html
index 2f1502e..6c2705f 100644
--- a/templates/twitch/organization_detail.html
+++ b/templates/twitch/organization_detail.html
@@ -7,7 +7,7 @@
     {% if user.is_authenticated %}
         <form id="notification-form"
               method="post"
-              action="{% url 'twitch:subscribe_org_notifications' org_id=organization.id %}">
+              action="{% url 'twitch:subscribe_org_notifications' org_id=organization.twitch_id %}">
             {% csrf_token %}
             <div>
                 <input type="checkbox"
@@ -30,7 +30,7 @@
     {% endif %}
     <ul id="games-list">
         {% for game in games %}
-            <li id="game-{{ game.id }}">
+            <li id="game-{{ game.twitch_id }}">
                 <a href="{% url 'twitch:game_detail' game.twitch_id %}">{{ game }}</a>
             </li>
         {% endfor %}
diff --git a/templates/twitch/search_results.html b/templates/twitch/search_results.html
index 9f35841..c1d48ad 100644
--- a/templates/twitch/search_results.html
+++ b/templates/twitch/search_results.html
@@ -43,7 +43,7 @@
                 <ul id="drops-list">
                     {% for drop in results.drops %}
                         <li id="drop-{{ drop.twitch_id }}">
-                            <a href="{% url 'twitch:campaign_detail' drop.campaign.pk %}#drop-{{ drop.twitch_id }}">{{ drop.name }}</a> (in {{ drop.campaign.name }})
+                            <a href="{% url 'twitch:campaign_detail' drop.campaign.twitch_id %}#drop-{{ drop.twitch_id }}">{{ drop.name }}</a> (in {{ drop.campaign.name }})
                         </li>
                     {% endfor %}
                 </ul>
@@ -51,7 +51,11 @@
             {% if results.benefits %}
                 <h2 id="benefits-header">Benefits</h2>
                 <ul id="benefits-list">
-                    {% for benefit in results.benefits %}<li id="benefit-{{ benefit.twitch_id }}">{{ benefit.name }}</li>{% endfor %}
+                    {% for benefit in results.benefits %}
+                        <li id="benefit-{{ benefit.twitch_id }}">
+                            <a href="{% url 'twitch:campaign_detail' benefit.drops.first.campaign.twitch_id %}">{{ benefit.name }}</a>
+                        </li>
+                    {% endfor %}
                 </ul>
             {% endif %}
         {% endif %}
diff --git a/twitch/views.py b/twitch/views.py
index e793346..4af80b2 100644
--- a/twitch/views.py
+++ b/twitch/views.py
@@ -68,7 +68,9 @@ def search_view(request: HttpRequest) -> HttpResponse:
                 Q(name__istartswith=query) | Q(description__icontains=query),
             ).select_related("game")
             results["drops"] = TimeBasedDrop.objects.filter(name__istartswith=query).select_related("campaign")
-            results["benefits"] = DropBenefit.objects.filter(name__istartswith=query)
+            results["benefits"] = DropBenefit.objects.filter(name__istartswith=query).prefetch_related(
+                "drops__campaign",
+            )
         else:
             # SQLite-compatible text search using icontains
             results["organizations"] = Organization.objects.filter(
@@ -85,7 +87,7 @@ def search_view(request: HttpRequest) -> HttpResponse:
             ).select_related("campaign")
             results["benefits"] = DropBenefit.objects.filter(
                 name__icontains=query,
-            )
+            ).prefetch_related("drops__campaign")
 
     return render(
         request,
@@ -181,7 +183,7 @@ def drop_campaign_list_view(request: HttpRequest) -> HttpResponse:
     queryset: QuerySet[DropCampaign] = DropCampaign.objects.all()
 
     if game_filter:
-        queryset = queryset.filter(game__id=game_filter)
+        queryset = queryset.filter(game__twitch_id=game_filter)
 
     queryset = queryset.select_related("game__owner").order_by("-start_at")
 
@@ -541,24 +543,6 @@ class GameDetailView(DetailView):
             campaign for campaign in all_campaigns if campaign.end_at is not None and campaign.end_at < now
         ]
 
-        # Build campaign data with sorted benefits
-        campaigns_with_benefits: list[dict[str, Any]] = []
-        for campaign in all_campaigns:
-            benefits_dict: dict[int, DropBenefit] = {}
-            for drop in campaign.time_based_drops.all():  # type: ignore[attr-defined]
-                for benefit in drop.benefits.all():
-                    benefits_dict[benefit.id] = benefit
-            sorted_benefits = sorted(
-                benefits_dict.values(),
-                key=lambda b: b.name,
-            )
-            campaigns_with_benefits.append(
-                {
-                    "campaign": campaign,
-                    "sorted_benefits": sorted_benefits,
-                },
-            )
-
         serialized_game: str = serialize(
             "json",
             [game],
@@ -606,7 +590,6 @@ class GameDetailView(DetailView):
                 "active_campaigns": active_campaigns,
                 "upcoming_campaigns": upcoming_campaigns,
                 "expired_campaigns": expired_campaigns,
-                "campaigns_with_benefits": campaigns_with_benefits,
                 "owner": game.owner,
                 "now": now,
                 "game_data": format_and_color_json(game_data[0]),
@@ -732,7 +715,7 @@ def debug_view(request: HttpRequest) -> HttpResponse:
     # We retrieve the game's name for user-friendly display.
     duplicate_name_campaigns = (
         DropCampaign.objects
-        .values("game_id", "game__display_name", "name")
+        .values("game__display_name", "name", "game__twitch_id")
         .annotate(name_count=Count("twitch_id"))
         .filter(name_count__gt=1)
         .order_by("game__display_name", "name")
@@ -931,24 +914,6 @@ class ChannelDetailView(DetailView):
             campaign for campaign in all_campaigns if campaign.end_at is not None and campaign.end_at < now
         ]
 
-        # Build campaign data with sorted benefits
-        campaigns_with_benefits = []
-        for campaign in all_campaigns:
-            benefits_dict: dict[int, DropBenefit] = {}
-            for drop in campaign.time_based_drops.all():  # type: ignore[attr-defined]
-                for benefit in drop.benefits.all():
-                    benefits_dict[benefit.id] = benefit
-            sorted_benefits = sorted(
-                benefits_dict.values(),
-                key=lambda b: b.name,
-            )
-            campaigns_with_benefits.append(
-                {
-                    "campaign": campaign,
-                    "sorted_benefits": sorted_benefits,
-                },
-            )
-
         serialized_channel = serialize(
             "json",
             [channel],
@@ -987,7 +952,6 @@ class ChannelDetailView(DetailView):
                 "active_campaigns": active_campaigns,
                 "upcoming_campaigns": upcoming_campaigns,
                 "expired_campaigns": expired_campaigns,
-                "campaigns_with_benefits": campaigns_with_benefits,
                 "now": now,
                 "channel_data": format_and_color_json(channel_data[0]),
             },