(optimization): Prefetch related org objects

Signed-off-by: Kipchirchir Sigei <arapgodsmack@gmail.com>
onaio · Oct 2, 2023 · 6c63699 · 6c63699
1 parent 0625ede
commit 6c63699
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/onadata/apps/api/viewsets/organization_profile_viewset.py b/onadata/apps/api/viewsets/organization_profile_viewset.py
@@ -8,6 +8,7 @@
 
 from django.conf import settings
 from django.core.cache import cache
+from django.db.models import Prefetch
 from django.utils.module_loading import import_string
 
 from rest_framework import status
@@ -16,7 +17,7 @@
 from rest_framework.viewsets import ModelViewSet
 
 from onadata.apps.api import permissions
-from onadata.apps.api.models.organization_profile import OrganizationProfile
+from onadata.apps.api.models.organization_profile import OrganizationProfile, OrgProfileUserObjectPermission, OrgProfileGroupObjectPermission
 from onadata.apps.api.tools import get_baseviewset_class
 from onadata.libs.filters import (
     OrganizationPermissionFilter,
@@ -56,8 +57,35 @@ class OrganizationProfileViewSet(
     """
     List, Retrieve, Update, Create/Register Organizations.
     """
-
-    queryset = OrganizationProfile.objects.filter(user__is_active=True)
+    queryset = (
+        OrganizationProfile.objects.select_related("user__profile")
+        .prefetch_related(
+            Prefetch(
+                "organizationprofile",
+                queryset=OrganizationProfile.objects.filter(user__is_active=True)
+                .select_related("user")
+                .prefetch_related("user")
+                .prefetch_related("userprofileuserobjectpermission_set")
+                .prefetch_related("orgprofileuserobjectpermission_set")
+            ),
+        )
+        .prefetch_related(
+            Prefetch(
+                "orgprofileuserobjectpermission_set",
+                queryset=OrgProfileUserObjectPermission.objects.select_related(
+                    "user__profile__organizationprofile", "permission"
+                ),
+            )
+        )
+        .prefetch_related(
+            Prefetch(
+                "orgprofilegroupobjectpermission_set",
+                queryset=OrgProfileGroupObjectPermission.objects.select_related(
+                    "group", "permission"
+                ),
+            )
+        )
+    )
     serializer_class = serializer_from_settings()
     lookup_field = "user"
     permission_classes = [permissions.OrganizationProfilePermissions]

diff --git a/onadata/libs/permissions.py b/onadata/libs/permissions.py
@@ -439,6 +439,7 @@ def is_organization(obj):
         return False
 
 
+@lru_cache(maxsize=None)
 def get_role(permissions, obj):
     """
     Return the user role for the given obj permissions.
@@ -449,6 +450,7 @@ def get_role(permissions, obj):
     return None
 
 
+@lru_cache(maxsize=None)
 def get_role_in_org(user, organization):
     """
     Return the user role in the organization.

diff --git a/onadata/libs/serializers/organization_serializer.py b/onadata/libs/serializers/organization_serializer.py
@@ -3,6 +3,8 @@
 Organization Serializer
 """
 
+from functools import lru_cache
+
 from django.contrib.auth import get_user_model
 from django.db.models.query import QuerySet
 from django.utils.translation import gettext as _
@@ -118,11 +120,13 @@ def validate_org(self, value):
 
         raise serializers.ValidationError(_(f"Organization {org} already exists."))
 
+    @lru_cache(maxsize=None)
     def get_users(self, obj):
         """
         Return organization members.
         """
 
+        @lru_cache(maxsize=None)
         def _create_user_list(user_list):
             users_list = []
             for u in user_list: