A community-supported supercharged document management system: scan, index and archive all your documents
Python aiangulararchivingdjangodmsdocument-managementdocument-management-systemllmmachine-learningocroptical-character-recognitionpdf
Fix: use chord.on_error before apply_async (#12842)
shamoon0a6e0db186c7
diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.pyindex 80a471016..848919cde 100644--- a/src/documents/bulk_edit.py+++ b/src/documents/bulk_edit.py@@ -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)raisediff --git a/src/documents/tests/test_bulk_edit.py b/src/documents/tests/test_bulk_edit.pyindex 526588c48..8d0c893eb 100644--- a/src/documents/tests/test_bulk_edit.py+++ b/src/documents/tests/test_bulk_edit.py@@ -945,6 +945,10 @@ class TestPDFActions(DirectoriesMixin, TestCase):pages = [[1, 2], [3]]self.doc2.archive_serial_number = 200self.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_valueresult = 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_argsself.assertEqual(@@ -991,6 +997,7 @@ class TestPDFActions(DirectoriesMixin, TestCase):self.doc2.save()sig = mock.Mock()+ sig.on_error.return_value = sigsig.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 = 250self.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_valueresult = 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 = sigsig.apply_async.side_effect = Exception("boom")mock_chord.return_value = sig