Sort drops within campaigns by required minutes watched

core/templates/index.html

@@ -10,8 +10,7 @@
             <span class="d-inline text-muted">{{ grouped_drops|length }} game{{ grouped_drops|length|pluralize }}</span>
         </h2>
         {% if grouped_drops %}
-        {% for game, drops_list in grouped_drops.items %}
+        {% for game, campaigns in grouped_drops.items %}
-        {# Retain card structure for layout, replace table with list #}
         <div class="card mb-4 shadow-sm">
             <div class="row g-0">
                 <!-- Game Box Art -->
@@ -20,7 +19,7 @@
                     <img src="{{ game.box_art_url }}" alt="{{ game.display_name|default:'Game name unknown' }} box art"
                         class="img-fluid rounded-start" height="283" width="212" loading="lazy" />
                     {% else %}
-                    <img src="{% static 'images/404_boxart.jpg' %}"
+                    <img src="https://static-cdn.jtvnw.net/ttv-static/404_boxart.jpg"
                         alt="{% if game %}{{ game.display_name }}{% else %}Unknown Game{% endif %} box art"
                         class="img-fluid rounded-start" height="283" width="212" loading="lazy" />
                     {% endif %}
@@ -41,54 +40,78 @@
                             {% endif %}
                         </h2>
 
-                        {% if drops_list %}
+                        {% if campaigns %}
-                        <!-- NEW Drop List Structure -->
+                        <div class="mt-4">
-                        <ul class="list-unstyled mt-3">
+                            {% for campaign, drops_list in campaigns.items %}
-                            {% for drop in drops_list %}
+                            <div class="card mb-3">
-                            <li class="mb-3"> {# Add margin between list items #}
+                                <div class="card-header bg-secondary bg-opacity-25">
-                                <strong>{{ drop.name|default:'Unknown Drop' }}</strong>
+                                    <h4 class="h6 mb-0"><a
-                                (Requires {{ drop.required_minutes_watched|minutes_to_hours }})
+                                            href="{{ campaign.details_url|default:'#' }}">{{ campaign.name|default:"Unknown Campaign" }}</a>
-                                <br>
+                                    </h4>
-                                <em>Campaign:
+                                    <div class="mt-1">
-                                    <a href="{{ drop.campaign.details_url|default:'#' }}" class="text-decoration-none"
+                                        {% if campaign.details_url != campaign.account_link_url and campaign.account_link_url %}
-                                        title="{{ drop.campaign.name|default:'Unknown Campaign' }}">
+                                        <a href="{{ campaign.account_link_url }}" class="text-decoration-none">Link
-                                        {{ drop.campaign.name|truncatechars:40|default:'N/A' }} {# Adjusted truncate #}
+                                            Account</a>
-                                    </a>
-                                    {% if drop.campaign.details_url != drop.campaign.account_link_url and drop.campaign.account_link_url %}
-                                    | <a href="{{ drop.campaign.account_link_url }}" class="text-decoration-none"
-                                        title="Link Account for {{ drop.campaign.name }}">Link</a>
                                         {% endif %}
-                                </em>
+                                    </div>
-                                <br>
+                                    <p class="mb-0 mt-1 text-muted small">
-                                Ends in: <abbr
+                                        {{ campaign.start_at|date:'l d F H:i' }} -
-                                    title="{{ drop.campaign.start_at|date:'l d F H:i' }} - {{ drop.campaign.end_at|date:'l d F H:i' }}">
+                                        {{ campaign.end_at|date:'l d F H:i' }} | {{ campaign.end_at|timeuntil }}
-                                    {{ drop.campaign.end_at|timeuntil }}
+                                    </p>
-                                </abbr>
+                                </div>
-
+                                <div class="card-body p-0">
+                                    <div class="table-responsive">
+                                        <table class="table table-striped table-hover align-middle mb-0">
+                                            <thead>
+                                                <tr>
+                                                    <th>Benefit Image</th>
+                                                    <th>Drop Name</th>
+                                                    <th>Benefit Name</th>
+                                                    <th>Required Minutes Watched</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                {% for drop in drops_list %}
                                                 {% if drop.benefits.exists %}
-                                <br>
-                                Benefits:
-                                <ul class="list-inline">
                                                 {% for benefit in drop.benefits.all %}
-                                    <li class="list-inline-item">
+                                                <tr>
-                                        <abbr title="{{ benefit.name|default:'Unknown Benefit' }}">
+                                                    <td>
-                                            {% if benefit.image_asset_url %}
                                                         <img src="{{ benefit.image_asset_url|default:'https://static-cdn.jtvnw.net/ttv-static/404_boxart.jpg' }}"
                                                             alt="{{ benefit.name|default:'Unknown Benefit' }}"
-                                                class="img-fluid rounded me-1 align-middle" {# Added align-middle #}
+                                                            class="img-fluid rounded" height="50" width="50"
-                                                height="20" width="20" loading="lazy" />
+                                                            loading="lazy" />
-                                            {% endif %}
+                                                    </td>
-                                            <small>{{ benefit.name|truncatechars:25|default:'Unknown Benefit' }}</small>
+                                                    <td>{{ drop.name|default:'Unknown Drop' }}</td>
-                                            {# Wrap text in small #}
+                                                    <td>
-                                        </abbr>
+                                                        {{ benefit.name|default:'Unknown Benefit' }}
-                                    </li>
+                                                    </td>
+                                                    <td>
+                                                        {{ drop.required_minutes_watched|minutes_to_hours }}
+                                                    </td>
+                                                </tr>
                                                 {% endfor %}
-                                </ul>
+                                                {% else %}
+                                                <tr>
+                                                    <td>
+                                                        <img src="https://static-cdn.jtvnw.net/ttv-static/404_boxart.jpg"
+                                                            alt="{{ drop.name|default:'Unknown Drop' }}"
+                                                            class="img-fluid rounded" height="50" width="50"
+                                                            loading="lazy" />
+                                                    </td>
+                                                    <td>{{ drop.name|default:'Unknown Drop' }}</td>
+                                                    <td>N/A</td>
+                                                    <td>{{ drop.required_minutes_watched|minutes_to_hours|default:'N/A' }}
+                                                    </td>
+                                                </tr>
                                                 {% endif %}
-                                {# Removed hr, using li margin instead #}
-                            </li>
                                                 {% endfor %}
-                        </ul>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                            {% endfor %}
+                        </div>
                         {% else %}
                         <p class="mt-3 text-muted">No active drops found for this game currently.</p>
                         {% endif %}

core/views.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import logging
-from collections import defaultdict
 from typing import TYPE_CHECKING, Any
 
 from django.db.models import Prefetch
@@ -22,34 +21,80 @@ logger: logging.Logger = logging.getLogger(__name__)
 
 @require_http_methods(request_method_list=["GET", "HEAD"])
 def get_home(request: HttpRequest) -> HttpResponse:
-    """Render the index page.
+    """Render the index page with drops grouped hierarchically by game and campaign.
+
+    This view fetches all currently active drops (where current time is between start_at and end_at),
+    and organizes them by game and campaign for display. Drops within each campaign are sorted by
+    required minutes watched.
 
     Args:
         request (HttpRequest): The request object.
 
     Returns:
-        HttpResponse: The response object
+        HttpResponse: The rendered index template with grouped drops.
     """
     now: timezone.datetime = timezone.now()
-    grouped_drops = defaultdict(list)
 
+    try:
+        # Dictionary structure: {Game: {Campaign: [TimeBasedDrop, ...]}}
+        grouped_drops: dict[Game, dict[DropCampaign, list[TimeBasedDrop]]] = {}
+
+        # Fetch all currently active drops with optimized queries
         current_drops_qs = (
             TimeBasedDrop.objects.filter(start_at__lte=now, end_at__gte=now)
-        .select_related("campaign__game")
+            .select_related("campaign", "campaign__game", "campaign__owner")
             .prefetch_related("benefits")
-        .order_by("campaign__game__display_name", "name")
+            .order_by("campaign__game__display_name", "campaign__name", "required_minutes_watched")
         )
 
+        # Drops without associated games or campaigns
+        orphaned_drops: list[TimeBasedDrop] = []
+
         for drop in current_drops_qs:
+            # Check if drop has both campaign and game
             if drop.campaign and drop.campaign.game:
                 game: Game = drop.campaign.game
-            grouped_drops[game].append(drop)
+                campaign: DropCampaign = drop.campaign
-        else:
+
-            logger.warning("Drop %s does not have an associated game or campaign.", drop.name)
+                # Initialize the game entry if it doesn't exist
+                if game not in grouped_drops:
+                    grouped_drops[game] = {}
+
+                # Initialize the campaign entry if it doesn't exist
+                if campaign not in grouped_drops[game]:
+                    grouped_drops[game][campaign] = []
+
+                # Add the drop to the appropriate campaign
+                grouped_drops[game][campaign].append(drop)
+            else:
+                # Store drops without proper association separately
+                orphaned_drops.append(drop)
+                logger.warning("Drop %s does not have an associated game or campaign.", drop.name or drop.drop_id)
+
+        # Make sure drops within each campaign are sorted by required_minutes_watched
+        for campaigns in grouped_drops.values():
+            for drops in campaigns.values():
+                drops.sort(key=lambda drop: drop.required_minutes_watched or 0)
+
+        # Also sort orphaned drops if any
+        if orphaned_drops:
+            orphaned_drops.sort(key=lambda drop: drop.required_minutes_watched or 0)
+
+        context: dict[str, Any] = {
+            "grouped_drops": grouped_drops,
+            "orphaned_drops": orphaned_drops,
+            "current_time": now,
+        }
 
-    context = {"grouped_drops": dict(grouped_drops)}
         return render(request, "index.html", context)
 
+    except Exception:
+        logger.exception("Error in get_home view")
+        return HttpResponse(
+            status=500,
+            content="An error occurred while processing your request. Please try again later.",
+        )
+
 
 @require_http_methods(request_method_list=["GET", "HEAD"])
 def get_game(request: HttpRequest, twitch_id: int) -> HttpResponse: