workers.queuecleanup: remove direct peewee usage

workers/queuecleanupworker.py

@@ -1,10 +1,13 @@
 import logging
 
-from app import app
-from data.database import UseThenDisconnect, QueueItem
-from workers.worker import Worker
 from datetime import timedelta, datetime
 
+from app import app
+from data.database import UseThenDisconnect
+from data.queue import delete_expired
+from workers.worker import Worker
+
+
 logger = logging.getLogger(__name__)
 
 DELETION_DATE_THRESHOLD = timedelta(days=7)
@@ -12,6 +15,7 @@ DELETION_COUNT_THRESHOLD = 50
 BATCH_SIZE = 500
 QUEUE_CLEANUP_FREQUENCY = app.config.get('QUEUE_CLEANUP_FREQUENCY', 60*60*24)
 
+
 class QueueCleanupWorker(Worker):
   def __init__(self):
     super(QueueCleanupWorker, self).__init__()
@@ -22,16 +26,11 @@ class QueueCleanupWorker(Worker):
     with UseThenDisconnect(app.config):
       while True:
         # Find all queue items older than the threshold (typically a week) and delete them.
-        threshold_ago = datetime.now() - DELETION_DATE_THRESHOLD
-        to_delete = list(QueueItem.select()
-                                  .where(QueueItem.processing_expires <= threshold_ago)
-                                  .limit(BATCH_SIZE))
-
-        if len(to_delete) < DELETION_COUNT_THRESHOLD:
+        expiration_threshold = datetime.now() - DELETION_DATE_THRESHOLD
+        deleted_count = delete_expired(expiration_threshold, DELETION_COUNT_THRESHOLD, BATCH_SIZE)
+        if deleted_count == 0:
           return
 
-        QueueItem.delete().where(QueueItem.id << to_delete).execute()
-
 
 if __name__ == "__main__":
   worker = QueueCleanupWorker()