refactor(handle_source_deleted): follow the v1 API's exception-handling for consistency

Author: cfm

securedrop/journalist_app/api2/events.py

@@ -176,13 +176,19 @@ def handle_source_deleted(event: Event, minor: int) -> EventResult:
         # Mark as deleted all the items in the source's collection
         deleted_items = {item.uuid: None for item in source.collection}
 
-        utils.delete_collection(source.filesystem_id)
-        return EventResult(
-            event_id=event.id,
-            status=(EventStatusCode.OK, None),
-            sources={event.target.source_uuid: None},
-            items=deleted_items,
-        )
+        try:
+            utils.delete_collection(source.filesystem_id)
+            return EventResult(
+                event_id=event.id,
+                status=(EventStatusCode.OK, None),
+                sources={event.target.source_uuid: None},
+                items=deleted_items,
+            )
+        except ValueError as exc:
+            return EventResult(
+                event_id=event.id,
+                status=(EventStatusCode.InternalServerError, str(exc)),
+            )
 
     @staticmethod
     def handle_source_conversation_deleted(event: Event, minor: int) -> EventResult:
@@ -210,6 +216,7 @@ def handle_source_conversation_deleted(event: Event, minor: int) -> EventResult:
         # Mark as deleted all the items in the source's collection
         deleted_items = {item.uuid: None for item in source.collection}
 
+        # NB. Does not raise exceptions from utils.delete_file_object().
         utils.delete_source_files(source.filesystem_id)
         db.session.refresh(source)
 

securedrop/journalist_app/api2/types.py

@@ -56,6 +56,7 @@ class EventStatusCode(IntEnum):
     Conflict = 409
     # The target UUID doesn't exist and it was a deletion request
     Gone = 410
+    InternalServerError = 500
     NotImplemented = 501