break out gameset winners based upon group

Author: dakrauth

src/picker/models/picks.py

@@ -503,7 +503,7 @@ class Meta:
 
     def pick_for_picker(self, picker):
         try:
-            return self.picksets.select_related().get(picker=picker)
+            return self.picksets.get(picker=picker)
         except models.ObjectDoesNotExist:
             return None
 
@@ -566,19 +566,23 @@ def update_results(self, results):
 
         return (count, self.points)
 
-    def winners(self):
+    def winners(self, group):
         if self.points:
-            for r in self.results():
+            for r in self.results(group):
                 if r.place == 1:
                     yield r.picker
 
+    def pickset_query(self, group):
+        return self.picksets.filter(picker__picker_memberships__group=group).select_related("picker")
+
     def update_pick_status(self):
-        winning_pickers = set(picker.id for picker in self.winners())
-        for wp in self.picksets.all():
-            wp.update_status(wp.picker_id in winning_pickers)
+        for group in PickerGrouping.objects.active():
+            winning_pickers = set(picker.id for picker in self.winners(group))
+            for wp in self.pickset_query(group):
+                wp.update_status(wp.picker_id in winning_pickers)
 
-    def results(self):
-        picks = list(self.picksets.select_related())
+    def results(self, group):
+        picks = list(self.pickset_query(group))
         return utils.weighted_standings(
             sorted(picks, key=lambda ps: (ps.correct, -ps.points_delta), reverse=True)
         )

src/picker/templates/picker/_base/results/results.html

@@ -7,7 +7,6 @@ <h1>
         <small><a href="{% url 'picker-results-season' gameset.league.slug group.id gameset.season %}">{{ gameset.season }}</a></small>
     </h1>
     {% season_nav gameset "results" %}
-    {% with gameset.results as results %}
     <p>
         {% if gameset.points %}<strong>Final points total:</strong> {{ gameset.points }}<br>{% endif %}
         <em class="autopick">Note: Italicized picker names indicate auto-picker selections</em>
@@ -79,6 +78,5 @@ <h1>
         {% endwith %}
         {% endif %}
         </table>
-        {% endwith %}
     </div>
 {% endblock %}

src/picker/templates/picker/_base/results/season.html

@@ -9,12 +9,12 @@ <h1>{{ season }} Results</h1>
             <th class="text-center">Week</th>
             <th>Winner(s)</th>
         </tr>
-        {% for gameset in gamesets %}
+        {% for gameset, winners in gamesets %}
         <tr>
             <td class="text-center">
                 <a href="{% url "picker-results-sequence" gameset.league.slug group.id gameset.season gameset.sequence %}">Week {{ gameset.sequence }}</a>
             </td>
-            <td>{% for w in gameset.winners %}
+            <td>{% for w in winners %}
                 <div style="display: inline-block; margin-left: 8px;">
                     <strong class="pickername">{{ w.picker }}</strong>
                 </div>{% if not forloop.last %}, {% endif %}

src/picker/views/picks.py

@@ -1,6 +1,5 @@
 from django.utils.functional import cached_property
 from django.shortcuts import get_object_or_404, get_list_or_404
-
 from .. import forms
 from .base import SimplePickerViewBase, PickerViewBase, SimpleFormMixin
 from ..models import Picker, PickerGrouping, GameSetPicks
@@ -80,6 +79,7 @@ def get(self, request, *args, **kwargs):
         gameset = GameSetPicks.objects.current_gameset(league=league)
         if gameset:
             context["gameset"] = gameset
+            context["results"] = gameset.results(context["group"])
         else:
             self.template_name = "@unavailable.html"
             context["heading"] = "Results currently unavailable"
@@ -91,9 +91,12 @@ class ResultsBySeason(ResultsBase):
     template_name = "@results/season.html"
 
     def get_context_data(self, **kwargs):
-        return super().get_context_data(
-            gamesets=GameSetPicks.objects.filter(league=self.league, season=self.season), **kwargs
-        )
+        gamesets = [
+            (gs, gs.winners(self.group))
+            for gs in GameSetPicks.objects.filter(league=self.league, season=self.season)
+        ]
+
+        return super().get_context_data(gamesets=gamesets, **kwargs)
 
 
 class ResultsByWeek(ResultsBase):