Why doesnt this work

Author: omfj

src/genlab_bestilling/managers.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 from django.db import models, transaction
-from django.db.models import BigIntegerField, Case, QuerySet, Value, When
+from django.db.models import BigIntegerField, Case, IntegerField, QuerySet, Value, When
 from django.db.models.functions import Cast
 from polymorphic.managers import PolymorphicManager, PolymorphicQuerySet
 
@@ -40,6 +40,23 @@ def filter_in_draft(self) -> QuerySet:
         """
         return self.filter(status=self.model.OrderStatus.DRAFT)
 
+    def annotate_priority_order(self) -> QuerySet:
+        """
+        Annotate the queryset with a priority order based on urgency and prioritization.
+        Order should be: urgent > prioritized > normal.
+        """
+        return self.annotate(
+            priority_order=Case(
+                When(is_urgent=True, then=self.model.OrderPriority.URGENT),
+                When(
+                    is_prioritized=True,
+                    then=Value(self.model.OrderPriority.PRIORITIZED),
+                ),
+                default=Value(self.model.OrderPriority.NORMAL),
+                output_field=IntegerField(),
+            )
+        )
+
 
 OrderManager = PolymorphicManager.from_queryset(OrderQuerySet)
 

src/staff/filters.py

@@ -133,7 +133,7 @@ class Meta:
         )
 
 
-class ExtractionOrderFilter(HideStatusesByDefaultMixin, filters.FilterSet):
+class ExtractionOrderFilter(filters.FilterSet):
     id = CharFilter(
         field_name="id",
         label="Order ID",
@@ -188,11 +188,6 @@ class ExtractionOrderFilter(HideStatusesByDefaultMixin, filters.FilterSet):
         ),
     )
 
-    @property
-    def qs(self) -> QuerySet:
-        queryset = super().qs
-        return self.exclude_hidden_statuses(queryset, self.data)
-
     class Meta:
         model = ExtractionOrder
         fields = (

src/staff/mixins.py

@@ -135,24 +135,16 @@ def order_sample_status(
 
 
 class PriorityMixinTable(tables.Table):
-    priority = tables.TemplateColumn(
+    priority_order = tables.TemplateColumn(
         orderable=True,
         verbose_name="Priority",
         template_name="staff/components/priority_column.html",
     )
 
-    def order_priority(
+    def order_priority_order(
         self, queryset: QuerySet[Order], is_descending: bool
     ) -> tuple[QuerySet[Order], bool]:
         prefix = "-" if is_descending else ""
-        queryset = queryset.annotate(
-            priority_order=Case(
-                When(is_urgent=True, then=2),
-                When(is_prioritized=True, then=1),
-                default=0,
-                output_field=IntegerField(),
-            )
-        )
         sorted_by_priority = queryset.order_by(f"{prefix}priority_order")
 
         return (sorted_by_priority, True)

src/staff/tables.py

@@ -88,7 +88,7 @@ def render_id(self, record: Order) -> str:
 
     class Meta:
         fields = (
-            "priority",
+            "priority_order",
             "id",
             "status",
             "area",
@@ -98,7 +98,7 @@ class Meta:
             "responsible_staff",
         )
         empty_text = "No Orders"
-        order_by = ("-priority", "status")
+        order_by = ("-priority_order", "status")
 
 
 class AnalysisOrderTable(OrderTable):
@@ -180,7 +180,7 @@ class Meta(OrderTable.Meta):
             "confirmed_at",
         )  # type: ignore[assignment]
         sequence = (
-            "priority",
+            "priority_order",
             "id",
             "status",
             "area",

src/staff/views.py

@@ -138,6 +138,7 @@ def get_queryset(self) -> QuerySet[ExtractionOrder]:
                 "genrequest__area",
             )
             .prefetch_related("species", "sample_types")
+            .annotate_priority_order()
             .annotate(
                 total_samples=Count("samples"),
                 total_samples_isolated=models.Count(