Merge pull request #1284 from syucream/fix/reduce-entry-nplusone

Reduce some N+1 on entry API
dmm-com · Sep 26, 2024 · 6a61ee4 · 6a61ee4
2 parents 351036d + 227d54a
commit 6a61ee4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/entry/api_v2/serializers.py b/entry/api_v2/serializers.py
@@ -560,7 +560,9 @@ def get_attr_value(attr: Attribute) -> EntryAttributeValue:
                                     "name": x.referral.entry.schema.name,
                                 },
                             }
-                            for x in attrv.data_array.all().select_related("referral")
+                            for x in attrv.data_array.all().select_related(
+                                "referral__entry__schema"
+                            )
                             if x.referral and x.referral.is_active
                         ]
                     }
@@ -580,7 +582,7 @@ def get_attr_value(attr: Attribute) -> EntryAttributeValue:
                             if x.referral and x.referral.is_active
                             else None,
                         }
-                        for x in attrv.data_array.all().select_related("referral")
+                        for x in attrv.data_array.all().select_related("referral__entry__schema")
                         if not (x.referral and not x.referral.is_active)
                     ]
                     return {"as_array_named_object": array_named_object}
@@ -724,7 +726,7 @@ def get_default_attr_value(type: int) -> EntryAttributeValue:
         attrv_prefetch = Prefetch(
             "values",
             queryset=AttributeValue.objects.filter(is_latest=True).select_related(
-                "referral", "group", "role"
+                "referral__entry__schema", "group", "role"
             ),
             to_attr="attrv_list",
         )