squash!: Fix search and add tests

Author: rodmgwgu

openedx_authz/rest_api/v1/views.py

@@ -650,39 +650,43 @@ class AdminConsoleScopesAPIView(generics.ListAPIView):
 
     serializer_class = ScopeSerializer
     pagination_class = AuthZAPIViewPagination
-    filter_backends = [filters.SearchFilter]
-    search_fields = ["display_name"]
     permission_classes = [AnyScopePermission]
 
     def get_serializer_context(self):
         context = super().get_serializer_context()
         context["org_map"] = {org.short_name: org for org in Organization.objects.all()}
         return context
 
-    def _get_courses_queryset(self, allowed_ids: set | None = None) -> QuerySet:
+    def _get_courses_queryset(self, allowed_ids: set | None = None, search: str = "") -> QuerySet:
         """Return a CourseOverview queryset projected to the unified scope shape.
 
         If allowed_ids is provided, filter to only those course keys.
+        If search is provided, filter by display_name.
         """
         qs = CourseOverview.objects
         if allowed_ids is not None:
             qs = qs.filter(id__in=allowed_ids)
+        if search:
+            qs = qs.filter(display_name__icontains=search)
         return qs.annotate(
             scope_id=Cast("id", output_field=CharField()),
             org_name=Cast("org", output_field=CharField()),
             scope_type=Value("course", output_field=CharField()),
         ).values("scope_id", "display_name", "org_name", "scope_type")
 
-    def _get_libraries_queryset(self, allowed_pairs: set | None = None) -> QuerySet:
+    def _get_libraries_queryset(self, allowed_pairs: set | None = None, search: str = "") -> QuerySet:
         """Return a ContentLibrary queryset projected to the unified scope shape.
 
         If allowed_pairs is provided, filter to only those (org, slug) pairs.
+        If search is provided, filter by learning_package__title.
         """
         qs = ContentLibrary.objects
         if allowed_pairs is not None:
             qs = qs.filter(
                 reduce(operator.or_, (Q(org__short_name=org, slug=slug) for org, slug in allowed_pairs), Q())
             )
+        if search:
+            qs = qs.filter(learning_package__title__icontains=search)
         return qs.annotate(
             scope_id=Cast("slug", output_field=CharField()),
             org_name=Cast("org__short_name", output_field=CharField()),
@@ -693,7 +697,8 @@ def _build_queryset(self, courses_qs: QuerySet | None, libraries_qs: QuerySet |
         """Union the provided querysets and sort by org. If only one is provided, return it sorted directly."""
         if courses_qs is not None and libraries_qs is not None:
             return courses_qs.union(libraries_qs).order_by("org_name")
-        return (courses_qs or libraries_qs).order_by("org_name")
+        qs = courses_qs if courses_qs is not None else libraries_qs
+        return qs.order_by("org_name")
 
     def get_queryset(self) -> QuerySet:
         """Return scopes ordered by org, filtered by the user's permissions."""
@@ -703,12 +708,13 @@ def get_queryset(self) -> QuerySet:
         params_serializer = ListScopesSerializer(data=self.request.query_params)
         params_serializer.is_valid(raise_exception=True)
         scope_type = params_serializer.validated_data["type"]
+        search = self.request.query_params.get("search", "").strip()
 
         # Staff and superusers can see all scopes, skip permission filtering.
         if user.is_staff or user.is_superuser:
             return self._build_queryset(
-                courses_qs=self._get_courses_queryset() if scope_type != "library" else None,
-                libraries_qs=self._get_libraries_queryset() if scope_type != "course" else None,
+                courses_qs=self._get_courses_queryset(search=search) if scope_type != "library" else None,
+                libraries_qs=self._get_libraries_queryset(search=search) if scope_type != "course" else None,
             )
 
         management_only = params_serializer.validated_data["management_permission_only"]
@@ -726,7 +732,7 @@ def get_permission(scope_cls):
                     user.username, get_permission(CourseOverviewData).identifier
                 )
             }
-            courses_qs = self._get_courses_queryset(allowed_course_ids)
+            courses_qs = self._get_courses_queryset(allowed_course_ids, search=search)
 
         libraries_qs = None
         if scope_type != "course":
@@ -737,7 +743,7 @@ def get_permission(scope_cls):
                     user.username, get_permission(ContentLibraryData).identifier
                 )
             }
-            libraries_qs = self._get_libraries_queryset(allowed_library_pairs)
+            libraries_qs = self._get_libraries_queryset(allowed_library_pairs, search=search)
 
         # Union the requested querysets and sort by org at the DB level.
         return self._build_queryset(courses_qs, libraries_qs)