Fixes an N+1 query in matching with the version content fetching by prefetching versions

docs/migration-v3.md

@@ -241,66 +241,3 @@ For example:
   }
 }
 ```
-
-## Consume Script Positional Arguments Removed
-
-Pre- and post-consumption scripts no longer receive positional arguments. All information is
-now passed exclusively via environment variables, which have been available since earlier versions.
-
-### Pre-consumption script
-
-Previously, the original file path was passed as `$1`. It is now only available as
-`DOCUMENT_SOURCE_PATH`.
-
-**Before:**
-
-```bash
-#!/usr/bin/env bash
-# $1 was the original file path
-process_document "$1"
-```
-
-**After:**
-
-```bash
-#!/usr/bin/env bash
-process_document "${DOCUMENT_SOURCE_PATH}"
-```
-
-### Post-consumption script
-
-Previously, document metadata was passed as positional arguments `$1` through `$8`:
-
-| Argument | Environment Variable Equivalent |
-| -------- | ------------------------------- |
-| `$1`     | `DOCUMENT_ID`                   |
-| `$2`     | `DOCUMENT_FILE_NAME`            |
-| `$3`     | `DOCUMENT_SOURCE_PATH`          |
-| `$4`     | `DOCUMENT_THUMBNAIL_PATH`       |
-| `$5`     | `DOCUMENT_DOWNLOAD_URL`         |
-| `$6`     | `DOCUMENT_THUMBNAIL_URL`        |
-| `$7`     | `DOCUMENT_CORRESPONDENT`        |
-| `$8`     | `DOCUMENT_TAGS`                 |
-
-**Before:**
-
-```bash
-#!/usr/bin/env bash
-DOCUMENT_ID=$1
-CORRESPONDENT=$7
-TAGS=$8
-```
-
-**After:**
-
-```bash
-#!/usr/bin/env bash
-# Use environment variables directly
-echo "Document ${DOCUMENT_ID} from ${DOCUMENT_CORRESPONDENT} tagged: ${DOCUMENT_TAGS}"
-```
-
-### Action Required
-
-Update any pre- or post-consumption scripts that read `$1`, `$2`, etc. to use the
-corresponding environment variables instead. Environment variables have been the preferred
-option since v1.8.0.

src/documents/consumer.py

@@ -313,6 +313,7 @@ class ConsumerPlugin(
             run_subprocess(
                 [
                     settings.PRE_CONSUME_SCRIPT,
+                    original_file_path,
                 ],
                 script_env,
                 self.log,
@@ -382,6 +383,14 @@ class ConsumerPlugin(
             run_subprocess(
                 [
                     settings.POST_CONSUME_SCRIPT,
+                    str(document.pk),
+                    document.get_public_filename(),
+                    os.path.normpath(document.source_path),
+                    os.path.normpath(document.thumbnail_path),
+                    reverse("document-download", kwargs={"pk": document.pk}),
+                    reverse("document-thumb", kwargs={"pk": document.pk}),
+                    str(document.correspondent),
+                    str(",".join(document.tags.all().values_list("name", flat=True))),
                 ],
                 script_env,
                 self.log,
@@ -641,6 +650,10 @@ class ConsumerPlugin(
                         # If we get here, it was successful. Proceed with post-consume
                         # hooks. If they fail, nothing will get changed.
 
+                        document = Document.objects.prefetch_related("versions").get(
+                            pk=document.pk,
+                        )
+
                         document_consumption_finished.send(
                             sender=self.__class__,
                             document=document,

src/documents/models.py

@@ -381,7 +381,10 @@ class Document(SoftDeleteModel, ModelWithOwner):  # type: ignore[django-manager-
             if isinstance(prefetched_cache, dict)
             else None
         )
-        if prefetched_versions:
+        if prefetched_versions is not None:
+            # Empty list means prefetch ran and found no versions — use own content.
+            if not prefetched_versions:
+                return self.content
             latest_prefetched = max(prefetched_versions, key=lambda doc: doc.id)
             return latest_prefetched.content
 

src/documents/tests/test_consumer.py

@@ -1328,7 +1328,7 @@ class PreConsumeTestCase(DirectoriesMixin, GetConsumerMixin, TestCase):
                     environment = args[1]
 
                     self.assertEqual(command[0], script.name)
-                    self.assertEqual(len(command), 1)
+                    self.assertEqual(command[1], str(self.test_file))
 
                     subset = {
                         "DOCUMENT_SOURCE_PATH": str(c.input_doc.original_file),
@@ -1478,7 +1478,11 @@ class PostConsumeTestCase(DirectoriesMixin, GetConsumerMixin, TestCase):
                 environment = args[1]
 
                 self.assertEqual(command[0], script.name)
-                self.assertEqual(len(command), 1)
+                self.assertEqual(command[1], str(doc.pk))
+                self.assertEqual(command[5], f"/api/documents/{doc.pk}/download/")
+                self.assertEqual(command[6], f"/api/documents/{doc.pk}/thumb/")
+                self.assertEqual(command[7], "my_bank")
+                self.assertCountEqual(command[8].split(","), ["a", "b"])
 
                 subset = {
                     "DOCUMENT_ID": str(doc.pk),

src/documents/views.py

@@ -1248,7 +1248,10 @@ class DocumentViewSet(
         ),
     )
     def suggestions(self, request, pk=None):
-        doc = get_object_or_404(Document.objects.select_related("owner"), pk=pk)
+        doc = get_object_or_404(
+            Document.objects.select_related("owner").prefetch_related("versions"),
+            pk=pk,
+        )
         if request.user is not None and not has_perms_owner_aware(
             request.user,
             "view_document",