Fix user vote display on account pages

Author: mfosterw

democrasite/webiscite/models.py

@@ -153,11 +153,15 @@ def get_queryset(self):
             )
         )
 
-    def get_user_queryset(self, user: User):
-        bills = self.get_queryset()
-        return bills.annotate(
+    def annotate_user_vote(
+        self, user: User, queryset: models.QuerySet["Bill"] | None = None
+    ):
+        if queryset is None:
+            queryset = self.get_queryset()
+
+        return queryset.annotate(
             user_vote=models.Subquery(
-                bills.filter(
+                queryset.filter(
                     vote__bill=models.OuterRef("pk"),
                     vote__user=user,
                 ).values("vote__support")

democrasite/webiscite/tests/test_models.py

@@ -99,15 +99,15 @@ def test_get_queryset(self, bill, user: User):
         assert bill.yes_percent == 50  # noqa: PLR2004
         assert bill.no_percent == 50  # noqa: PLR2004
 
-    def test_get_user_queryset(self, bill: Bill, user: User):
+    def test_annotate_user_vote(self, bill: Bill, user: User):
         bill.vote(user, support=True)
-        assert Bill.objects.get_user_queryset(user).first().user_vote is True
+        assert Bill.objects.annotate_user_vote(user).first().user_vote is True
 
         bill.vote(user, support=False)
-        assert Bill.objects.get_user_queryset(user).first().user_vote is False
+        assert Bill.objects.annotate_user_vote(user).first().user_vote is False
 
         bill.vote(user, support=False)
-        assert Bill.objects.get_user_queryset(user).first().user_vote is None
+        assert Bill.objects.annotate_user_vote(user).first().user_vote is None
 
     def test_create_from_github(self, user: User):
         pr = PullRequestFactory.create()

democrasite/webiscite/views.py

@@ -24,7 +24,7 @@ class BillListView(ListView):
 
     def get_queryset(self):
         if self.request.user.is_authenticated:
-            return Bill.objects.get_user_queryset(self.request.user).filter(
+            return Bill.objects.annotate_user_vote(self.request.user).filter(
                 status=Bill.Status.OPEN
             )
         return Bill.objects.filter(status=Bill.Status.OPEN)
@@ -47,8 +47,11 @@ def get_queryset(self):
         """
         Return the list of items for this view - bills proposed by the current user.
         """
-        assert self.request.user.is_authenticated  # type guard
-        return self.request.user.bill_set.all()
+        user = self.request.user
+        assert user.is_authenticated  # type guard
+
+        bill_set = user.bill_set.all()
+        return Bill.objects.annotate_user_vote(user, bill_set)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -69,8 +72,11 @@ def get_queryset(self):
         """
         Return the list of items for this view - bills voted on by the current user.
         """
-        assert self.request.user.is_authenticated  # type guard
-        return self.request.user.votes.all()
+        user = self.request.user
+        assert user.is_authenticated  # type guard
+
+        bills = user.votes.all()
+        return Bill.objects.annotate_user_vote(user, bills)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -92,7 +98,7 @@ def get_object(self, queryset=None):
 
         try:
             if self.request.user.is_authenticated:
-                return Bill.objects.get_user_queryset(self.request.user).get(pk=pk)
+                return Bill.objects.annotate_user_vote(self.request.user).get(pk=pk)
             return Bill.objects.get(pk=pk)
 
         except Bill.DoesNotExist as err: