fix: reduce the number of queries in each page of occurrences

RolnickLab · Dec 4, 2024 · 68e94f1 · 68e94f1
1 parent bf04b6b
commit 68e94f1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/ami/main/api/serializers.py b/ami/main/api/serializers.py
@@ -1061,7 +1061,9 @@ class Meta:
         ]
 
     def get_determination_details(self, obj: Occurrence):
-        # @TODO add an equivalent method to the Occurrence model
+        # @TODO convert this to query methods to avoid N+1 queries.
+        # Currently at 100+ queries per page of 10 occurrences.
+        # Add a reusable method to the OccurrenceQuerySet class and call it from the ViewSet.
 
         context = self.context
 
@@ -1091,7 +1093,6 @@ def get_determination_details(self, obj: Occurrence):
 class OccurrenceSerializer(OccurrenceListSerializer):
     determination = CaptureTaxonSerializer(read_only=True)
     detections = DetectionNestedSerializer(many=True, read_only=True)
-    identifications = OccurrenceIdentificationSerializer(many=True, read_only=True)
     predictions = OccurrenceClassificationSerializer(many=True, read_only=True)
     deployment = DeploymentNestedSerializer(read_only=True)
     event = EventNestedSerializer(read_only=True)
@@ -1102,7 +1103,6 @@ class Meta:
         fields = OccurrenceListSerializer.Meta.fields + [
             "determination_id",
             "detections",
-            "identifications",
             "predictions",
         ]
         read_only_fields = [

diff --git a/ami/main/api/views.py b/ami/main/api/views.py
@@ -925,6 +925,8 @@ def get_queryset(self) -> QuerySet:
             "event",
         )
         qs = qs.with_detections_count().with_timestamps()  # type: ignore
+        qs = qs.with_identifications()  # type: ignore
+
         if self.action == "list":
             qs = (
                 qs.all()

diff --git a/ami/main/models.py b/ami/main/models.py
@@ -1945,6 +1945,13 @@ def with_timestamps(self) -> models.QuerySet:
             ),
         )
 
+    def with_identifications(self) -> models.QuerySet:
+        return self.prefetch_related(
+            "identifications",
+            "identifications__taxon",
+            "identifications__user",
+        )
+
 
 class OccurrenceManager(models.Manager):
     def get_queryset(self) -> OccurrenceQuerySet: