removed active Manager in lieu of adding an active method to the objects

Author: dakrauth

Justfile

@@ -119,10 +119,10 @@ upload:
 # Run linter and code formatter tools
 lint:
     @echo Linting...
-    -{{BIN}}/flake8 picker tests demo
+    -{{BIN}}/ruff check picker tests demo
 
     @echo Format checks...
-    -{{BIN}}/black --check --diff -l 100 picker tests demo
+    -{{BIN}}/ruff format --diff --line-length 100 picker tests demo
 
 # Build the demo Docker container
 docker-build *args='':

picker/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.3.0"
+__version__ = "2.4.0"
 VERSION = tuple(int(i) for i in __version__.split("."))
 
 default_app_config = "picker.apps.PickerConfig"

picker/models/picks.py

@@ -47,9 +47,11 @@ def should_autopick(self):
         return self.autopick != self.Autopick.NONE
 
 
-class ActiveStatusManager(models.Manager):
-    def get_queryset(self):
-        return super().get_queryset().filter(status=self.model.Status.ACTIVE)
+class PickerGroupingManager(models.Manager):
+    def active(self):
+        return self.filter(
+            status=self.model.Status.ACTIVE, leagues__is_active=True
+        ).prefetch_related("leagues", "members")
 
 
 class PickerGrouping(models.Model):
@@ -67,8 +69,7 @@ class Status(models.TextChoices):
     status = models.CharField(max_length=4, choices=Status.choices, default=Status.ACTIVE)
     category = models.CharField(max_length=3, choices=Category.choices, default=Category.PRIVATE)
 
-    objects = models.Manager()
-    active = ActiveStatusManager()
+    objects = PickerGroupingManager()
 
     def __str__(self):
         return self.name
@@ -89,15 +90,17 @@ def save(self, *args, **kws):
         return super().save(*args, **kws)
 
 
-class ActiveMembershipManager(models.Manager):
-    def get_queryset(self):
+class MembershipManager(models.Manager):
+    def active(self, **kwargs):
         return (
-            super()
-            .get_queryset()
-            .filter(status=self.model.Status.ACTIVE, group__status=PickerGrouping.Status.ACTIVE)
+            self.filter(
+                status=self.model.Status.ACTIVE,
+                group__status=PickerGrouping.Status.ACTIVE,
+                **kwargs,
+            )
             .select_related("group")
             .prefetch_related(
-                models.Prefetch("group__leagues", queryset=sports.League.active.all())
+                models.Prefetch("group__leagues", queryset=sports.League.objects.active())
             )
         )
 
@@ -106,7 +109,7 @@ def for_user(self, user, league=None):
         if league:
             kwargs["group__leagues"] = league
 
-        return self.filter(**kwargs)
+        return self.active(**kwargs)
 
 
 class PickerMembership(models.Model):
@@ -129,8 +132,7 @@ class Status(models.TextChoices):
     status = models.CharField(max_length=4, choices=Status.choices, default=Status.ACTIVE)
     autopick = models.CharField(max_length=4, choices=Autopick.choices, default=Autopick.RANDOM)
 
-    objects = models.Manager()
-    active = ActiveMembershipManager()
+    objects = MembershipManager()
 
     def __str__(self):
         return f"{self.user}@{self.group}"

picker/models/sports.py

@@ -37,9 +37,9 @@ def temp_slug():
     return "{:10.0f}".format(random.random() * 10000000000)
 
 
-class ActiveManager(models.Manager):
-    def get_queryset(self):
-        return super().get_queryset().filter(is_active=True)
+class LeagueManager(models.Manager):
+    def active(self):
+        return self.filter(is_active=True)
 
 
 class League(models.Model):
@@ -51,8 +51,7 @@ class League(models.Model):
     avg_game_duration = models.PositiveIntegerField(default=240)
     is_active = models.BooleanField(default=True)
 
-    objects = models.Manager()
-    active = ActiveManager()
+    objects = LeagueManager()
 
     class Meta:
         permissions = (("can_update_score", "Can update scores"),)
@@ -426,7 +425,7 @@ def import_games(self, data, teams=None):
     @cached_property
     def next_gameset(self):
         try:
-            return self.league.gamesets.get(season=self.season, sequence = self.sequence + 1)
+            return self.league.gamesets.get(season=self.season, sequence=self.sequence + 1)
         except GameSet.DoesNotExist:
             return None
 

picker/templatetags/picker_tags.py

@@ -1,5 +1,4 @@
 from django.template import Library
-from django.core.exceptions import ObjectDoesNotExist
 
 from ..models import PickerFavorite
 from ..utils import get_templates

picker/views/base.py

@@ -54,11 +54,11 @@ def season(self):
 
     @cached_property
     def leagues(self):
-        return League.active.all()
+        return League.objects.active()
 
     @cached_property
     def league(self):
-        return get_object_or_404(League.active, slug=self.kwargs["league"])
+        return get_object_or_404(League.objects.active(), slug=self.kwargs["league"])
 
     def get_template_names(self, template_override=None):
         if template_override is None and self.template_name is None:
@@ -114,4 +114,4 @@ def get_context_data(self, **kwargs):
 
     @cached_property
     def memberships(self):
-        return list(PickerMembership.active.for_user(self.request.user, league=self.league))
+        return list(PickerMembership.objects.for_user(self.request.user, league=self.league))

picker/views/picks.py

@@ -179,7 +179,7 @@ def get_context_data(self, **kwargs):
     def show_picks(self, gameset, **kwargs):
         return self.render_to_response(
             self.get_context_data(picks=gameset.pick_for_user(self.request.user), **kwargs),
-            template_override="@picks/show.html"
+            template_override="@picks/show.html",
         )
 
     def post(self, request, *args, **kwargs):

pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "django-picker"
+name = "picker"
 dynamic = ["version"]
 description = "A Django sports picker app"
 license = { file = "LICENSE" }