Don't lose our prefetches when invoking guardian and fetch the custom field__field, which we actually use

src/documents/filters.py

@@ -884,10 +884,16 @@ class ObjectOwnedOrGrantedPermissionsFilter(ObjectPermissionsFilter):
     """
 
     def filter_queryset(self, request, queryset, view):
+        # django-guardian's get_objects_for_user builds its own queryset
+        # internally and loses prefetch_related declarations.  Use its result
+        # as a subquery so we can filter the original queryset (which retains
+        # all prefetch hints) rather than returning guardian's queryset directly.
         objects_with_perms = super().filter_queryset(request, queryset, view)
-        objects_owned = queryset.filter(owner=request.user)
-        objects_unowned = queryset.filter(owner__isnull=True)
-        return objects_with_perms | objects_owned | objects_unowned
+        return queryset.filter(
+            Q(pk__in=objects_with_perms)
+            | Q(owner=request.user)
+            | Q(owner__isnull=True),
+        )
 
 
 class ObjectOwnedPermissionsFilter(ObjectPermissionsFilter):

src/documents/sanity_checker.py

@@ -182,9 +182,8 @@ def _check_thumbnail(
     present_files: set[Path],
 ) -> None:
     """Verify the thumbnail exists and is readable."""
-    # doc.thumbnail_path already returns a resolved Path; no need to re-resolve.
-    thumbnail_path: Final[Path] = doc.thumbnail_path
-    if not thumbnail_path.is_file():
+    thumbnail_path: Final[Path] = Path(doc.thumbnail_path).resolve()
+    if not thumbnail_path.exists() or not thumbnail_path.is_file():
         messages.error(doc.pk, "Thumbnail of document does not exist.")
         return
 
@@ -201,9 +200,8 @@ def _check_original(
     present_files: set[Path],
 ) -> None:
     """Verify the original file exists, is readable, and has matching checksum."""
-    # doc.source_path already returns a resolved Path; no need to re-resolve.
-    source_path: Final[Path] = doc.source_path
-    if not source_path.is_file():
+    source_path: Final[Path] = Path(doc.source_path).resolve()
+    if not source_path.exists() or not source_path.is_file():
         messages.error(doc.pk, "Original of document does not exist.")
         return
 
@@ -239,9 +237,8 @@ def _check_archive(
     elif doc.has_archive_version:
         if TYPE_CHECKING:
             assert isinstance(doc.archive_path, Path)
-        # doc.archive_path already returns a resolved Path; no need to re-resolve.
-        archive_path: Final[Path] = doc.archive_path  # type: ignore[assignment]
-        if not archive_path.is_file():
+        archive_path: Final[Path] = Path(doc.archive_path).resolve()
+        if not archive_path.exists() or not archive_path.is_file():
             messages.error(doc.pk, "Archived version of document does not exist.")
             return
 
@@ -317,15 +314,7 @@ def check_sanity(
     messages = SanityCheckMessages()
     present_files = _build_present_files()
 
-    documents = Document.global_objects.only(
-        "pk",
-        "filename",
-        "mime_type",
-        "checksum",
-        "archive_checksum",
-        "archive_filename",
-        "content",
-    ).iterator(chunk_size=500)
+    documents = Document.global_objects.all()
     for doc in iter_wrapper(documents):
         _check_document(doc, messages, present_files)
 

src/documents/views.py

@@ -919,7 +919,7 @@ class DocumentViewSet(
                     ),
                 ),
                 "tags",
-                "custom_fields",
+                "custom_fields__field",
                 "notes",
             )
         )