Faster get_property_views

SEED-platform · Dec 6, 2023 · d74a70c · d74a70c
1 parent ae98297
commit d74a70c
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/seed/models/analysis_property_views.py b/seed/models/analysis_property_views.py
@@ -91,14 +91,13 @@ def get_property_views(cls, analysis_property_views):
         :param analysis_property_views: list[AnalysisPropertyView]
         :return: dict{int: PropertyView}, PropertyViews keyed by the related AnalysisPropertyView id
         """
-        # build a query to find PropertyViews linked to the canonical property and cycles we're interested in
-        property_view_query = models.Q()
+        # Fast query to find all potentially-necessary propertyViews
+        property_ids = set()
+        cycle_ids = set()
         for analysis_property_view in analysis_property_views:
-            property_view_query |= (
-                models.Q(property_id=analysis_property_view.property_id)
-                & models.Q(cycle_id=analysis_property_view.cycle_id)
-            )
-        property_views = PropertyView.objects.filter(property_view_query)
+            property_ids.add(analysis_property_view.property_id)
+            cycle_ids.add(analysis_property_view.cycle_id)
+        property_views = PropertyView.objects.filter(property_id__in=property_ids, cycle_id__in=cycle_ids)
 
         # get original property views keyed by canonical property id and cycle
         property_views_by_property_cycle_id = {