Single query

Author: aastabk

src/staff/tables.py

@@ -13,7 +13,6 @@
     ExtractionPlate,
     Order,
     Sample,
-    SampleIsolationMethod,
     SampleMarkerAnalysis,
 )
 from nina.models import Project
@@ -457,10 +456,11 @@ class OrderAnalysisSampleTable(tables.Table):
         },
     )
 
-    isolation_method = tables.Column(
+    isolation_method = tables.ManyToManyColumn(
+        accessor="sample__isolation_method",
+        transform=lambda x: x.name,
         verbose_name="Isolation Method",
-        accessor="sample",  # needed to get `record.sample` instead of `None`
-        empty_values=(),
+        orderable=False,
     )
 
     class Meta:
@@ -488,13 +488,6 @@ def render_checked(self, record: SampleMarkerAnalysis) -> str:
             record.id,
         )
 
-    def render_isolation_method(self, record: SampleMarkerAnalysis) -> str:
-        print(record)
-        qs = SampleIsolationMethod.objects.filter(sample=record.sample).values_list(
-            "isolation_method__name", flat=True
-        )
-        return ", ".join(qs)
-
 
 class PlateTable(tables.Table):
     id = tables.Column(

src/staff/views.py

@@ -559,7 +559,14 @@ def get_order(self) -> ExtractionOrder:
     def get_queryset(self) -> QuerySet[Sample]:
         return Sample.objects.filter(
             order=self.get_order(), genlab_id__isnull=False
-        ).prefetch_related("order", "type", "isolation_method")
+        ).prefetch_related(
+            "order",
+            "type",
+            Prefetch(
+                "isolation_method",
+                queryset=IsolationMethod.objects.order_by("name").distinct(),
+            ),
+        )
 
     def get_isolation_methods(self) -> QuerySet[IsolationMethod, str]:
         types = self.get_queryset().values_list("type", flat=True).distinct()