From 731a0fd2cd02d415f49eb22211807fcb6137dbe1 Mon Sep 17 00:00:00 2001 From: Daniel Nass Date: Tue, 10 Nov 2026 09:11:53 -0500 Subject: [PATCH] Wait for transaction to commit before queueing modify job --- documentcloud/documents/tests/test_views.py | 17 +++++++++++++++++ documentcloud/documents/views.py | 8 +++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/documentcloud/documents/tests/test_views.py b/documentcloud/documents/tests/test_views.py index 7c21cbbb..9ca83e6d 100644 --- a/documentcloud/documents/tests/test_views.py +++ b/documentcloud/documents/tests/test_views.py @@ -1337,6 +1337,23 @@ def test_modification_marks_cache_dirty(self, client, mocker): document.refresh_from_db() assert document.cache_dirty is True + def test_modification_queued_after_commit(self, client, mocker): + """The modify job must not start before `pending` is committed - its first + processing PATCH would otherwise read the stale status and save it back + over `pending`""" + document = DocumentFactory(page_count=2) + mock_modify = mocker.patch("documentcloud.documents.views.modify.delay") + client.force_authenticate(user=document.user) + response = client.post( + f"/api/documents/{document.pk}/modifications/", + [{"page": "0"}], + format="json", + ) + assert response.status_code == status.HTTP_201_CREATED + mock_modify.assert_not_called() + run_commit_hooks() + mock_modify.assert_called_once() + def _finish_processing(self, client, document): """Send the processing callback that marks a document as done""" client.force_authenticate(user=None) diff --git a/documentcloud/documents/views.py b/documentcloud/documents/views.py index 365a7682..8dfc3a57 100644 --- a/documentcloud/documents/views.py +++ b/documentcloud/documents/views.py @@ -1971,11 +1971,9 @@ def create(self, request, *args, **kwargs): document.save() document.index_on_commit(field_updates={"status": "set"}) - modify.delay( - document.pk, - self.request.user.pk, - serializer.data, - ) + transaction.on_commit( + lambda: modify.delay(document.pk, self.request.user.pk, serializer.data) + ) return Response(serializer.data, status=status.HTTP_201_CREATED) @extend_schema(tags=["document_modifications"])