Merge remote-tracking branch 'origin/release/2.9' into develop

Author: petrjasek

apps/archived/archived.py

@@ -10,7 +10,7 @@
 
 from operator import itemgetter
 from copy import deepcopy
-from flask import current_app as app
+from flask import current_app as app, request
 from eve.utils import config, ParsedRequest
 import logging
 
@@ -178,7 +178,7 @@ def validate_delete_action(self, doc, allow_all_types=False):
         doc[config.ID_FIELD] = id_field
 
     def on_delete(self, doc):
-        self.validate_delete_action(doc)
+        self.validate_delete_action(doc, allow_all_types=not request)
 
     def delete(self, lookup):
         if app.testing and len(lookup) == 0:

tests/archive/commands_test.py

@@ -1,11 +1,35 @@
 from superdesk.tests import TestCase
 from superdesk.utc import utcnow
 from apps.archive.commands import RemoveExpiredContent
+from datetime import datetime
+from unittest.mock import patch
+from bson import ObjectId
 
 
 class RemoveExpiredContentTestCase(TestCase):
+    test_context = False
+
     def test_is_expired(self):
         command = RemoveExpiredContent()
         item = {"expiry": None, "_id": "foo"}
         now = utcnow()
         self.assertFalse(command._can_remove_item(item, now))
+
+    def test_expired_archived_picture(self):
+        self.app.data.insert(
+            "archived",
+            [
+                {
+                    "type": "picture",
+                    "_id": ObjectId.from_datetime(datetime(2024, 1, 1)),
+                    "item_id": "test",
+                    "guid": "test",
+                },
+            ],
+        )
+
+        with patch.dict(self.app.config, {"ARCHIVED_EXPIRY_MINUTES": 1}):
+            RemoveExpiredContent().run()
+
+        archived_items = self.app.data.find_all("archived")
+        assert 0 == archived_items.count()