amorfo77/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2026-05-26 16:35:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix: use chord.on_error before apply_async (#12842)

Browse Source
This commit is contained in:
shamoon
2026-05-24 14:42:11 -07:00
committed by GitHub
parent 15682231b2
commit 0a6e0db186
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/documents/bulk_edit.py
+6 -6
View File
@@ -676,9 +676,9 @@ def split(
chord(
header=consume_tasks,
body=delete.si([doc.id]),
).apply_async(
link_error=[restore_archive_serial_numbers_task.s(backup)],
)
).on_error(
restore_archive_serial_numbers_task.s(backup),
).apply_async()
except Exception:
restore_archive_serial_numbers(backup)
raise
@@ -856,9 +856,9 @@ def edit_pdf(
chord(
header=consume_tasks,
body=delete.si([doc.id]),
).apply_async(
link_error=[restore_archive_serial_numbers_task.s(backup)],
)
).on_error(
restore_archive_serial_numbers_task.s(backup),
).apply_async()
except Exception:
restore_archive_serial_numbers(backup)
raise
src/documents/tests/test_bulk_edit.py
+14
View File
@@ -945,6 +945,10 @@ class TestPDFActions(DirectoriesMixin, TestCase):
pages = [[1, 2], [3]]
self.doc2.archive_serial_number = 200
self.doc2.save()
errback = bulk_edit.restore_archive_serial_numbers_task.s(
{self.doc2.id: 200},
)
mock_chord.return_value.on_error.return_value = mock_chord.return_value
result = bulk_edit.split(doc_ids, pages, delete_originals=True)
self.assertEqual(result, "OK")
@@ -957,6 +961,8 @@ class TestPDFActions(DirectoriesMixin, TestCase):
mock_delete_documents.assert_called()
mock_chord.assert_called_once()
mock_chord.return_value.on_error.assert_called_once_with(errback)
mock_chord.return_value.apply_async.assert_called_once_with()
delete_documents_args, _ = mock_delete_documents.call_args
self.assertEqual(
@@ -991,6 +997,7 @@ class TestPDFActions(DirectoriesMixin, TestCase):
self.doc2.save()
sig = mock.Mock()
sig.on_error.return_value = sig
sig.apply_async.side_effect = Exception("boom")
mock_chord.return_value = sig
@@ -1256,10 +1263,16 @@ class TestPDFActions(DirectoriesMixin, TestCase):
operations = [{"page": 1}, {"page": 2}]
self.doc2.archive_serial_number = 250
self.doc2.save()
errback = bulk_edit.restore_archive_serial_numbers_task.s(
{self.doc2.id: 250},
)
mock_chord.return_value.on_error.return_value = mock_chord.return_value
result = bulk_edit.edit_pdf(doc_ids, operations, delete_original=True)
self.assertEqual(result, "OK")
mock_chord.assert_called_once()
mock_chord.return_value.on_error.assert_called_once_with(errback)
mock_chord.return_value.apply_async.assert_called_once_with()
self.assertEqual(mock_consume_file.call_args.kwargs["overrides"].asn, 250)
self.doc2.refresh_from_db()
self.assertIsNone(self.doc2.archive_serial_number)
@@ -1288,6 +1301,7 @@ class TestPDFActions(DirectoriesMixin, TestCase):
self.doc2.save()
sig = mock.Mock()
sig.on_error.return_value = sig
sig.apply_async.side_effect = Exception("boom")
mock_chord.return_value = sig