From 625cff33886f9bc24d76120dc3400aaa24da88db Mon Sep 17 00:00:00 2001
From: Michael Hiiva <michaelhiiva@gmail.com>
Date: Wed, 21 Apr 2021 10:44:30 -0700
Subject: [PATCH] Added Correct query for all player ratings to fix legacy.

---
 agagd/agagd_core/views/core.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/agagd/agagd_core/views/core.py b/agagd/agagd_core/views/core.py
index a8b1c9c2..e25a9718 100644
--- a/agagd/agagd_core/views/core.py
+++ b/agagd/agagd_core/views/core.py
@@ -322,22 +322,20 @@ def country_detail(request, country_name):
 
 def all_player_ratings(request):
     all_player_ratings_query = (
-        Member.objects.filter(
-            Q(chapter_id=F("chapters__member_id")) | Q(chapters__member_id__isnull=True)
-        )
-        .filter(Q(member_id=F("players__pin_player")))
+        Member.objects.select_related("chapter_id")
         .filter(status="accepted")
-        .exclude(players__rating__isnull=True)
-        .exclude(type="chapter")
-        .exclude(type="e-journal")
-        .exclude(type="library")
-        .exclude(type="institution")
+        .filter(players__rating__isnull=False)
+        .exclude(type__iexact="e-journal")
+        .exclude(type__iexact="chapter")
+        .exclude(type__iexact="library")
+        .exclude(type__iexact="institution")
         .values(
-            "full_name",
+            "chapter_id",
             "member_id",
+            "chapter_id__name",
+            "full_name",
             "type",
             "players__rating",
-            "chapter_id",
             "state",
             "players__sigma",
         )