Don't count archived reservation units for unit ordering filter

Author: matti-lamppu

spaces/querysets/unit.py

@@ -27,7 +27,7 @@ def order_by_reservation_units_count(self, *, desc: bool = False) -> Self:
 
         return self.alias(
             reservation_units_count=SubqueryCount(
-                ReservationUnit.objects.filter(unit=models.OuterRef("pk")).values("id"),
+                ReservationUnit.objects.filter(unit=models.OuterRef("pk"), is_archived=False).values("id"),
             ),
         ).order_by(models.OrderBy(models.F("reservation_units_count"), descending=desc))
 

tests/test_graphql_api/test_unit/test_ordering.py

@@ -156,6 +156,10 @@ def test_units__order__by_reservation_units_count(graphql):
     ReservationUnitFactory.create_batch(2, unit=units[1])
     ReservationUnitFactory.create_batch(3, unit=units[2])
 
+    # Not counted since archived
+    ReservationUnitFactory.create(unit=units[2], is_archived=True)
+    ReservationUnitFactory.create(unit=units[3], is_archived=True)
+
     # Descending
     query_1 = units_query(order_by=["reservationUnitsCountDesc", "pkDesc"])
     response_1 = graphql(query_1)