✨ [#229] Don't error out immediately if a zaak can't be deleted

Before, when processing the items of a list, if one raised an error we stopped there and marked the list as failed. Now we run through all the items and at the end raise an error if one or more failed.

Author: SilviaAmAm

backend/src/openarchiefbeheer/destruction/exceptions.py

@@ -0,0 +1,2 @@
+class DeletionProcessingError(Exception):
+    pass

backend/src/openarchiefbeheer/destruction/models.py

@@ -180,6 +180,14 @@ def has_short_review_process(self) -> bool:
             [zaaktype in config.zaaktypes_short_process for zaaktype in zaaktypes_urls]
         )
 
+    def has_failures(self) -> bool:
+        return any(
+            [
+                status == InternalStatus.failed
+                for status in self.items.values_list("processing_status", flat=True)
+            ]
+        )
+
 
 class DestructionListItem(models.Model):
     destruction_list = models.ForeignKey(
@@ -254,27 +262,31 @@ def set_processing_status(self, status: InternalStatus) -> None:
         self.processing_status = status
         self.save()
 
-    def process_deletion(self) -> None:
-        from .utils import mark_as_failed_on_error
+    def _delete_zaak(self):
+        try:
+            zaak = Zaak.objects.get(url=self.zaak)
+        except ObjectDoesNotExist as exc:
+            logger.error(
+                "Could not find zaak with URL %s. Aborting deletion.", self.zaak
+            )
+            raise exc
 
-        self.processing_status = InternalStatus.processing
-        self.save()
+        store = ResultStore(store=self)
+        store.clear_traceback()
 
-        with mark_as_failed_on_error(self):
-            try:
-                zaak = Zaak.objects.get(url=self.zaak)
-            except ObjectDoesNotExist as exc:
-                logger.error(
-                    "Could not find zaak with URL %s. Aborting deletion.", self.zaak
-                )
-                raise exc
+        delete_zaak_and_related_objects(zaak=zaak, result_store=store)
 
-            store = ResultStore(store=self)
-            store.clear_traceback()
+        zaak.delete()
 
-            delete_zaak_and_related_objects(zaak=zaak, result_store=store)
+    def process_deletion(self) -> None:
+        self.processing_status = InternalStatus.processing
+        self.save()
 
-            zaak.delete()
+        try:
+            self._delete_zaak()
+        except Exception:
+            self.set_processing_status(InternalStatus.failed)
+            return
 
         self.processing_status = InternalStatus.succeeded
         self.save()

backend/src/openarchiefbeheer/destruction/tasks.py

@@ -7,6 +7,7 @@
 from openarchiefbeheer.celery import app
 
 from .constants import InternalStatus, ListItemStatus, ListStatus
+from .exceptions import DeletionProcessingError
 from .models import DestructionList, DestructionListItem, ReviewResponse
 from .signals import deletion_failure
 from .utils import notify_assignees_successful_deletion
@@ -66,11 +67,11 @@ def delete_destruction_list(destruction_list: DestructionList) -> None:
     chunk_tasks = delete_destruction_list_item.chunks(
         items_pks, settings.ZAKEN_CHUNK_SIZE
     )
-    notify_task = complete_and_notify.si(destruction_list.pk)
+    complete_and_notify_task = complete_and_notify.si(destruction_list.pk)
 
     task_chain = chain(
         chunk_tasks.group(),
-        notify_task,
+        complete_and_notify_task,
         link_error=handle_processing_error.si(destruction_list.pk),
     )
     task_chain.delay()
@@ -99,6 +100,9 @@ def delete_destruction_list_item(pk: int) -> None:
 @app.task
 def complete_and_notify(pk: int) -> None:
     destruction_list = DestructionList.objects.get(pk=pk)
+    if destruction_list.has_failures():
+        raise DeletionProcessingError()
+
     destruction_list.processing_status = InternalStatus.succeeded
     destruction_list.save()
 

backend/src/openarchiefbeheer/destruction/utils.py

@@ -1,4 +1,3 @@
-from contextlib import contextmanager
 from typing import Protocol
 
 from django.conf import settings
@@ -118,15 +117,6 @@ class ObjectWithStatus(Protocol):
     def set_processing_status(self, status: InternalStatus) -> None: ...
 
 
-@contextmanager
-def mark_as_failed_on_error(object_with_status: ObjectWithStatus):
-    try:
-        yield
-    except Exception as exc:
-        object_with_status.set_processing_status(InternalStatus.failed)
-        raise exc
-
-
 def process_new_assignees(
     destruction_list: DestructionList,
     assignees: list[dict],