squash!: Apply suggestions and fixes

Author: rodmgwgu

openedx_authz/rest_api/v1/views.py

@@ -690,9 +690,10 @@ def _get_libraries_queryset(self, allowed_pairs: set | None = None, search: str
             qs = qs.filter(learning_package__title__icontains=search)
         return qs.annotate(
             scope_id=Cast("slug", output_field=CharField()),
+            display_name=Cast("learning_package__title", output_field=CharField()),
             org_name=Cast("org__short_name", output_field=CharField()),
             scope_type=Value("library", output_field=CharField()),
-        ).values("scope_id", "learning_package__title", "org_name", "scope_type")
+        ).values("scope_id", "display_name", "org_name", "scope_type")
 
     def _build_queryset(self, courses_qs: QuerySet | None, libraries_qs: QuerySet | None) -> QuerySet:
         """Union the provided querysets and sort by org. If only one is provided, return it sorted directly."""

openedx_authz/tests/rest_api/test_views.py

@@ -953,7 +953,8 @@ def setUp(self):
         self.addCleanup(self.build_qs_patcher.stop)
 
         # The stub ContentLibrary uses 'title' directly instead of 'learning_package__title'.
-        # Patch _get_libraries_queryset to use the stub-compatible field.
+        # Patch _get_libraries_queryset to use the stub-compatible field, aliased as 'display_name'
+        # to match the column name the union and serializer expect.
         def stub_get_libraries_queryset(_, allowed_pairs=None, search=""):  # pylint: disable=unused-argument
             qs = ContentLibrary.objects
             if allowed_pairs is not None:
@@ -965,9 +966,10 @@ def stub_get_libraries_queryset(_, allowed_pairs=None, search=""):  # pylint: di
                     )
             return qs.annotate(
                 scope_id=Cast("slug", output_field=CharField()),
+                display_name=Cast("title", output_field=CharField()),
                 org_name=Cast("org__short_name", output_field=CharField()),
                 scope_type=Value("library", output_field=CharField()),
-            ).values("scope_id", "title", "org_name", "scope_type")
+            ).values("scope_id", "display_name", "org_name", "scope_type")
 
         self.libraries_qs_patcher = patch.object(
             views.AdminConsoleScopesAPIView,
@@ -1179,6 +1181,36 @@ def test_view_permission_filters_libraries_for_non_staff(self):
         external_keys = [item["external_key"] for item in response.data["results"]]
         self.assertIn(self.LIBRARY_ORG1, external_keys)
         self.assertNotIn(self.LIBRARY_ORG2, external_keys)
+        # Verify display_name is populated from the library title, not empty.
+        for item in response.data["results"]:
+            self.assertTrue(item["display_name"])
+
+    def test_library_display_name_populated_in_standalone_path(self):
+        """display_name is non-empty for libraries when type=library bypasses the union.
+
+        Regression test: without aliasing learning_package__title as display_name,
+        the standalone library queryset returns 'title' as the key and the serializer
+        silently produces empty strings since it only reads 'display_name'.
+
+        Skipped when the stub ContentLibrary model is in use (no learning_package relation).
+        """
+        if not hasattr(ContentLibrary, "learning_package"):
+            self.skipTest("Stub ContentLibrary has no learning_package relation")
+
+        user = User.objects.get(username="regular_1")
+        self.client.force_authenticate(user=user)
+        # Stop both patchers so the real _get_libraries_queryset runs without union.
+        self.build_qs_patcher.stop()
+        self.libraries_qs_patcher.stop()
+
+        response = self.client.get(self.url, {"type": "library"})
+
+        self.libraries_qs_patcher.start()
+        self.build_qs_patcher.start()
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertGreater(response.data["count"], 0)
+        for item in response.data["results"]:
+            self.assertTrue(item["display_name"])
 
     # ------------------------------------------------------------------ #
     # Permission filtering: manage                                        #