Improve search quality, ORM efficiency, and filter consistency

apps/players/views.py

@@ -7,8 +7,8 @@ from apps.scouting.models import FavoritePlayer
 from apps.stats.models import PlayerSeason
 
 from .forms import PlayerSearchForm
-from .models import Player
-from .services.search import apply_sorting, base_player_queryset, filter_players
+from .models import Player, PlayerCareerEntry
+from .services.search import annotate_player_metrics, apply_sorting, base_player_queryset, filter_players
 
 
 def calculate_age(birth_date):
@@ -48,9 +48,10 @@ class PlayerSearchView(ListView):
 
         if form.is_valid():
             queryset = filter_players(queryset, form.cleaned_data)
+            queryset = annotate_player_metrics(queryset)
             queryset = apply_sorting(queryset, form.cleaned_data.get("sort", "name_asc"))
         else:
-            queryset = queryset.order_by("full_name", "id")
+            queryset = annotate_player_metrics(queryset).order_by("full_name", "id")
 
         return queryset
 
@@ -81,6 +82,12 @@ class PlayerDetailView(DetailView):
             "competition",
             "stats",
         ).order_by("-season__start_date", "-id")
+        career_queryset = PlayerCareerEntry.objects.select_related(
+            "team",
+            "competition",
+            "season",
+            "role_snapshot",
+        ).order_by("-start_date", "-id")
 
         return (
             Player.objects.select_related(
@@ -93,10 +100,7 @@ class PlayerDetailView(DetailView):
             .prefetch_related(
                 "aliases",
                 Prefetch("player_seasons", queryset=season_queryset),
-                "career_entries__team",
-                "career_entries__competition",
-                "career_entries__season",
-                "career_entries__role_snapshot",
+                Prefetch("career_entries", queryset=career_queryset),
             )
         )
 
@@ -132,7 +136,7 @@ class PlayerDetailView(DetailView):
 
         context["age"] = calculate_age(player.birth_date)
         context["current_assignment"] = current_assignment
-        context["career_entries"] = player.career_entries.all().order_by("-start_date", "-id")
+        context["career_entries"] = player.career_entries.all()
         context["season_rows"] = season_rows
         context["is_favorite"] = False
         if self.request.user.is_authenticated: