nit: change logic ordering

pennlabs · Mar 24, 2024 · 0c88556 · 0c88556
1 parent b6f777e
commit 0c88556
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/backend/sublet/views.py b/backend/sublet/views.py
@@ -143,17 +143,18 @@ def list(self, request, *args, **kwargs):
         queryset = self.get_queryset()
 
         # Apply filters based on query parameters
+
+        if subletter.lower() == "true":
+            queryset = queryset.filter(subletter=request.user)
+        else:
+            queryset = queryset.filter(expires_at__gte=timezone.now())
         if title:
             queryset = queryset.filter(title__icontains=title)
         if address:
             queryset = queryset.filter(address__icontains=address)
         if amenities:
             for amenity in amenities:
                 queryset = queryset.filter(amenities__name=amenity)
-        if subletter.lower() == "true":
-            queryset = queryset.filter(subletter=request.user)
-        else:
-            queryset = queryset.filter(expires_at__gte=timezone.now())
         if starts_before:
             queryset = queryset.filter(start_date__lt=starts_before)
         if starts_after: