Reduce number of queries required for content tagging endpoints

openedx/core/djangoapps/content_tagging/rest_api/v1/filters.py

@@ -6,7 +6,6 @@
 from rest_framework.filters import BaseFilterBackend
 
 import openedx_tagging.core.tagging.rules as oel_tagging
-from organizations.models import Organization
 
 from ...rules import get_admin_orgs, get_user_orgs
 from ...models import TaxonomyOrg
@@ -25,9 +24,8 @@ def filter_queryset(self, request, queryset, _):
         if oel_tagging.is_taxonomy_admin(request.user):
             return queryset
 
-        orgs = list(Organization.objects.all())
-        user_admin_orgs = get_admin_orgs(request.user, orgs)
-        user_orgs = get_user_orgs(request.user, orgs)  # Orgs that the user is a content creator or instructor
+        user_admin_orgs = get_admin_orgs(request.user)
+        user_orgs = get_user_orgs(request.user)  # Orgs that the user is a content creator or instructor
 
         if len(user_orgs) == 0 and len(user_admin_orgs) == 0:
             return queryset.none()
@@ -69,9 +67,8 @@ def filter_queryset(self, request, queryset, _):
         if oel_tagging.is_taxonomy_admin(request.user):
             return queryset
 
-        orgs = list(Organization.objects.all())
-        user_admin_orgs = get_admin_orgs(request.user, orgs)
-        user_orgs = get_user_orgs(request.user, orgs)
+        user_admin_orgs = get_admin_orgs(request.user)
+        user_orgs = get_user_orgs(request.user)
         user_or_admin_orgs = list(set(user_orgs) | set(user_admin_orgs))
 
         return queryset.filter(taxonomy__enabled=True).filter(

openedx/core/djangoapps/content_tagging/rest_api/v1/tests/test_views.py

@@ -499,12 +499,12 @@ def test_create_taxonomy(self, user_attr: str, expected_status: int) -> None:
 
     @ddt.data(
         ('staff', 11),
-        ("content_creatorA", 19),  # FIXME too many queries.
-        ("library_staffA", 19),
-        ("library_userA", 19),
-        ("instructorA", 19),
-        ("course_instructorA", 19),
-        ("course_staffA", 19),
+        ("content_creatorA", 18),  # FIXME too many queries.
+        ("library_staffA", 18),
+        ("library_userA", 18),
+        ("instructorA", 18),
+        ("course_instructorA", 18),
+        ("course_staffA", 18),
     )
     @ddt.unpack
     def test_list_taxonomy_query_count(self, user_attr: str, expected_queries: int):
@@ -1773,10 +1773,10 @@ def test_get_tags(self):
     @ddt.data(
         ('staff', 'courseA', 7),
         ('staff', 'libraryA', 7),
-        ("content_creatorA", 'courseA', 20, False),  # FIXME too many queries.
-        ("content_creatorA", 'libraryA', 20, False),
-        ("library_staffA", 'libraryA', 20, False),  # Library users can only view objecttags, not change them.
-        ("library_userA", 'libraryA', 20, False),
+        ("content_creatorA", 'courseA', 15, False),  # FIXME too many queries.
+        ("content_creatorA", 'libraryA', 15, False),
+        ("library_staffA", 'libraryA', 15, False),  # Library users can only view objecttags, not change them.
+        ("library_userA", 'libraryA', 15, False),
         ("instructorA", 'courseA', 13),
         ("course_instructorA", 'courseA', 13),
         ("course_staffA", 'courseA', 13),

openedx/core/djangoapps/content_tagging/rules.py

@@ -21,16 +21,17 @@
 from openedx.core.djangoapps.content_libraries.api import get_libraries_for_user
 
 from .models import TaxonomyOrg
-from .utils import get_context_key_from_key_string
+from .utils import get_context_key_from_key_string, TaggingRulesCache
 
+
+rules_cache = TaggingRulesCache()
 UserType = Union[django.contrib.auth.models.User, django.contrib.auth.models.AnonymousUser]
 
 
 def is_org_admin(user: UserType, orgs: list[Organization] | None = None) -> bool:
     """
     Return True if the given user is an admin for any of the given orgs.
     """
-
     return len(get_admin_orgs(user, orgs)) > 0
 
 
@@ -47,7 +48,7 @@ def get_admin_orgs(user: UserType, orgs: list[Organization] | None = None) -> li
 
     If no orgs are provided, check all orgs
     """
-    org_list = Organization.objects.all() if orgs is None else orgs
+    org_list = rules_cache.get_orgs() if orgs is None else orgs
     return [
         org for org in org_list if OrgStaffRole(org=org.short_name).has_user(user)
     ]
@@ -115,14 +116,15 @@ def _get_library_user_orgs(user: UserType, orgs: list[Organization]) -> list[Org
     return list(set(library_orgs).intersection(orgs))
 
 
-def get_user_orgs(user: UserType, orgs: list[Organization]) -> list[Organization]:
+def get_user_orgs(user: UserType, orgs: list[Organization] | None = None) -> list[Organization]:
     """
     Return a list of orgs that the given user is a member of (instructor or content creator),
     from the given list of orgs.
     """
-    content_creator_orgs = _get_content_creator_orgs(user, orgs)
-    course_user_orgs = _get_course_user_orgs(user, orgs)
-    library_user_orgs = _get_library_user_orgs(user, orgs)
+    org_list = rules_cache.get_orgs() if orgs is None else orgs
+    content_creator_orgs = _get_content_creator_orgs(user, org_list)
+    course_user_orgs = _get_course_user_orgs(user, org_list)
+    library_user_orgs = _get_library_user_orgs(user, org_list)
     user_orgs = list(set(content_creator_orgs) | set(course_user_orgs) | set(library_user_orgs))
 
     return user_orgs
@@ -235,8 +237,9 @@ def can_change_object_tag_objectid(user: UserType, object_id: str) -> bool:
     if has_studio_write_access(user, context_key):
         return True
 
-    object_org = Organization.objects.filter(short_name=context_key.org).first()
-    return object_org and is_org_admin(user, [object_org])
+    assert context_key.org
+    object_org = rules_cache.get_orgs([context_key.org])
+    return bool(object_org) and is_org_admin(user, object_org)
 
 
 @rules.predicate
@@ -268,8 +271,9 @@ def can_view_object_tag_objectid(user: UserType, object_id: str) -> bool:
     if has_studio_read_access(user, context_key):
         return True
 
-    object_org = Organization.objects.filter(short_name=context_key.org).first()
-    return object_org and (is_org_admin(user, [object_org]) or is_org_user(user, [object_org]))
+    assert context_key.org
+    object_org = rules_cache.get_orgs([context_key.org])
+    return bool(object_org) and (is_org_admin(user, object_org) or is_org_user(user, object_org))
 
 
 @rules.predicate

openedx/core/djangoapps/content_tagging/utils.py

@@ -3,9 +3,11 @@
 """
 from __future__ import annotations
 
+from edx_django_utils.cache import RequestCache
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey, UsageKey
 from opaque_keys.edx.locator import LibraryLocatorV2
+from organizations.models import Organization
 
 from .types import ContentKey
 
@@ -42,3 +44,37 @@ def get_context_key_from_key_string(key_str: str) -> CourseKey | LibraryLocatorV
         return context_key
 
     raise ValueError("context must be a CourseKey or a LibraryLocatorV2")
+
+
+class TaggingRulesCache:
+    """
+    Caches data required for computing rules for the duration of the request.
+    """
+
+    def __init__(self):
+        """
+        Initializes the request cache.
+        """
+        self.request_cache = RequestCache('openedx.core.djangoapps.content_tagging.rules')
+
+    def get_orgs(self, org_names: list[str] | None = None) -> list[Organization]:
+        """
+        Returns the Organizations with the given name(s), or all Organizations if no names given.
+
+        Organization instances are cached for the duration of the request.
+        """
+        cache_key = 'all_orgs'
+        all_orgs = self.request_cache.data.get(cache_key)
+        if all_orgs is None:
+            all_orgs = {
+                org.short_name: org
+                for org in Organization.objects.all()
+            }
+            self.request_cache.set(cache_key, all_orgs)
+
+        if org_names:
+            return [
+                all_orgs[org_name] for org_name in org_names if org_name in all_orgs
+            ]
+
+        return all_orgs.values()