fix: lint fixes + allow to forget messages that are in a removing state

Author: amalcaraz

src/aleph/handlers/content/forget.py

@@ -113,10 +113,15 @@ async def check_permissions(self, session: DbSession, message: MessageDb):
             if target_status.status in (
                 MessageStatus.FORGOTTEN,
                 MessageStatus.REJECTED,
+                MessageStatus.REMOVED,
             ):
                 continue
 
-            if target_status.status != MessageStatus.PROCESSED:
+            # Note: Only allow to forget messages that are processed or marked for removing
+            if (
+                target_status.status != MessageStatus.PROCESSED
+                or target_status.status != MessageStatus.REMOVING
+            ):
                 raise ForgetTargetNotFound(target_hash=target_hash)
 
             target_message = get_message_by_item_hash(
@@ -190,7 +195,11 @@ async def _forget_item_hash(
             )
             return
 
-        if message_status.status != MessageStatus.PROCESSED:
+        # Note: Only allow to forget messages that are processed or marked for removing
+        if (
+            message_status.status != MessageStatus.PROCESSED
+            and message_status.status != MessageStatus.REMOVING
+        ):
             logger.error(
                 "FORGET message %s targets message %s which is not processed yet. This should not happen.",
                 forgotten_by.item_hash,

src/aleph/web/controllers/prices.py

@@ -46,6 +46,14 @@ class HTTPProcessing(HTTPException):
         web.HTTPGone,
         "This message has been forgotten",
     ),
+    MessageStatus.REMOVING: (
+        web.HTTPGone,
+        "This message is marked for removing",
+    ),
+    MessageStatus.REMOVED: (
+        web.HTTPGone,
+        "This message has been removed",
+    ),
 }
 
 

tests/jobs/test_balance_job.py

@@ -10,7 +10,12 @@
 from aleph.db.models.balances import AlephBalanceDb
 from aleph.db.models.chains import ChainTxDb
 from aleph.db.models.cron_jobs import CronJobDb
-from aleph.db.models.files import FilePinDb, FilePinType, GracePeriodFilePinDb, MessageFilePinDb, StoredFileDb
+from aleph.db.models.files import (
+    FilePinType,
+    GracePeriodFilePinDb,
+    MessageFilePinDb,
+    StoredFileDb,
+)
 from aleph.db.models.messages import MessageDb, MessageStatusDb
 from aleph.jobs.cron.balance_job import BalanceCronJob
 from aleph.toolkit.constants import STORE_AND_PROGRAM_COST_CUTOFF_HEIGHT, MiB
@@ -274,9 +279,7 @@ async def fixture_message_for_recovery(session_factory, now, fixture_base_data):
         session.add_all([message])
         session.commit()
 
-        session.add_all(
-            [wallet, file, file_pin, message_status, message_cost]
-        )
+        session.add_all([wallet, file, file_pin, message_status, message_cost])
         session.commit()
 
     return {