fix(requests): respect request state on my-matches pages

esnvutbrno · Nov 19, 2023 · 43956df · 43956df
1 parent 38dda0c
commit 43956df
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/fiesta/apps/buddy_system/views/matches.py b/fiesta/apps/buddy_system/views/matches.py
@@ -3,6 +3,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import ListView
 
+from apps.fiestarequests.models.request import BaseRequestProtocol
 from apps.plugins.middleware.plugin import HttpRequest
 from apps.sections.views.mixins.membership import EnsureLocalUserViewMixin
 from apps.utils.breadcrumbs import with_breadcrumb, with_plugin_home_breadcrumb
@@ -16,6 +17,10 @@ class MyBuddies(EnsureLocalUserViewMixin, ListView):
     template_name = "buddy_system/my_buddies.html"
 
     def get_queryset(self):
-        return self.request.user.buddy_system_request_matches.prefetch_related(
-            "request__issuer__profile"
-        ).select_related("request", "matcher")
+        return (
+            self.request.user.buddy_system_request_matches.prefetch_related("request__issuer__profile")
+            .select_related("request", "matcher")
+            .filter(
+                request__state=BaseRequestProtocol.State.MATCHED,
+            )
+        )
diff --git a/fiesta/apps/pickup_system/views/matches.py b/fiesta/apps/pickup_system/views/matches.py
@@ -3,6 +3,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import ListView
 
+from apps.fiestarequests.models.request import BaseRequestProtocol
 from apps.plugins.middleware.plugin import HttpRequest
 from apps.sections.views.mixins.membership import EnsureLocalUserViewMixin
 from apps.utils.breadcrumbs import with_breadcrumb, with_plugin_home_breadcrumb
@@ -16,6 +17,10 @@ class MyPickups(EnsureLocalUserViewMixin, ListView):
     template_name = "pickup_system/my_pickups.html"
 
     def get_queryset(self):
-        return self.request.user.pickup_system_request_matches.prefetch_related(
-            "request__issuer__profile"
-        ).select_related("request", "matcher")
+        return (
+            self.request.user.pickup_system_request_matches.prefetch_related("request__issuer__profile")
+            .select_related("request", "matcher")
+            .filter(
+                request__state=BaseRequestProtocol.State.MATCHED,
+            )
+        )