Merge pull request #1207 from syucream/fix/some-nplusone

Mitigate some N+1

Author: userlocalhost

acl/api_v2/views.py

@@ -1,5 +1,3 @@
-import itertools
-
 from django.db.models import Q
 from django.http import Http404
 from drf_spectacular.types import OpenApiTypes
@@ -67,7 +65,9 @@ def get(self, request: Request, pk: int) -> Response:
         if instance.objtype == ACLObjType.Entity:
             attrs = instance.attrs.filter(is_active=True)
             acl_history = acl_history + list(
-                itertools.chain.from_iterable([attr.history.all() for attr in attrs])
+                EntityAttr.history.filter(aclbase_ptr_id__in=[a.id for a in attrs]).order_by(
+                    "-history_date", "-history_id"
+                )
             )
             for attr in attrs:
                 codename_query |= (
@@ -78,7 +78,9 @@ def get(self, request: Request, pk: int) -> Response:
 
         permissions = HistoricalPermission.objects.filter(codename_query)
         permission_history = list(
-            itertools.chain.from_iterable([p.history.all() for p in permissions])
+            HistoricalPermission.history.filter(
+                permission_ptr_id__in=[p.id for p in permissions]
+            ).order_by("-history_date", "-history_id")
         )
 
         serializer = ACLHistorySerializer(data=acl_history + permission_history, many=True)

entity/api_v2/views.py

@@ -195,7 +195,7 @@ def get_queryset(self):
         entity = Entity.objects.filter(id=self.kwargs.get("entity_id"), is_active=True).first()
         if not entity:
             raise Http404
-        return self.queryset.filter(schema=entity)
+        return self.queryset.filter(schema=entity).select_related("schema")
 
     @extend_schema(request=EntryCreateSerializer)
     def create(self, request: Request, entity_id: int) -> Response:

job/api_v2/serializers.py

@@ -5,6 +5,7 @@
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 
+from airone.lib.acl import ACLObjType
 from entry.models import Entry
 from job.models import Job
 
@@ -34,8 +35,8 @@ class Meta:
     @extend_schema_field(JobTargetSerializer())
     def get_target(self, obj: Job) -> JobTarget | None:
         if obj.target is not None:
-            sub = obj.target.get_subclass_object()
-            if isinstance(sub, Entry):
+            if obj.target.objtype == ACLObjType.Entry:
+                sub = Entry.objects.filter(id=obj.target.id).select_related("schema").first()
                 return {
                     "id": sub.id,
                     "name": sub.name,
@@ -53,7 +54,7 @@ def get_target(self, obj: Job) -> JobTarget | None:
             return None
 
     def get_passed_time(self, obj: Job) -> int:
-        if obj.is_finished():
+        if obj.is_finished(with_refresh=False):
             return math.floor((obj.updated_at - obj.created_at).total_seconds())
         else:
             return math.floor((datetime.now(timezone.utc) - obj.created_at).total_seconds())

job/api_v2/views.py

@@ -108,7 +108,7 @@ def get_queryset(self) -> QuerySet:
         if created_after:
             query &= Q(created_at__gte=created_after)
 
-        return Job.objects.filter(query).order_by("-created_at")
+        return Job.objects.filter(query).select_related("target").order_by("-created_at")
 
 
 class JobRerunAPI(generics.UpdateAPIView):

job/models.py

@@ -206,9 +206,10 @@ def is_timeout(self) -> bool:
 
         return datetime.now(pytz.timezone(settings.TIME_ZONE)) > task_expiry
 
-    def is_finished(self) -> bool:
-        # Sync status flag information with the data which is stored in database
-        self.refresh_from_db(fields=["status"])
+    def is_finished(self, with_refresh: bool = True) -> bool:
+        if with_refresh:
+            # Sync status flag information with the data which is stored in database
+            self.refresh_from_db(fields=["status"])
 
         # This value indicates that there is no more processing for a job
         finished_status: list[JobStatus] = [