diff --git a/backend/services/queue_service.py b/backend/services/queue_service.py index ff819b7..c4f185f 100644 --- a/backend/services/queue_service.py +++ b/backend/services/queue_service.py @@ -211,7 +211,7 @@ class QueueService: return [task.to_dict() for task in self.repository.recent(limit=limit)] def retry_dead_letters(self, ctx: RequestContext, *, limit: int = 50) -> dict[str, Any]: - jobs = self.list_jobs(status="dead_letter", page=1, page_size=limit).items + jobs = self.list_jobs(status="dead_letter", page=1, page_size=_batch_limit(limit)).items retried = [] errors = [] for job in jobs: @@ -222,7 +222,7 @@ class QueueService: return {"retried": retried, "errors": errors, "total": len(retried)} def move_failed_to_dead_letter(self, ctx: RequestContext, *, limit: int = 50) -> dict[str, Any]: - jobs = self.list_jobs(status="failed", page=1, page_size=limit).items + jobs = self.list_jobs(status="failed", page=1, page_size=_batch_limit(limit)).items moved = [] for job in jobs: moved.append( @@ -278,3 +278,11 @@ def _optional_text(value: Any) -> str | None: return None text = str(value).strip() return text or None + + +def _batch_limit(value: int) -> int: + try: + limit = int(value) + except (TypeError, ValueError): + limit = 50 + return min(max(limit, 1), 100) diff --git a/tests/test_queue_service.py b/tests/test_queue_service.py index f7ddce7..caef835 100644 --- a/tests/test_queue_service.py +++ b/tests/test_queue_service.py @@ -62,6 +62,21 @@ class QueueServiceTests(unittest.TestCase): self.assertIsNone(first.idempotency_key) self.assertIsNone(second.idempotency_key) + def test_dead_letter_batch_limits_are_normalized(self): + for index in range(3): + self.queue_service.create_task({"status": "failed", "error_message": f"failure {index}"}, self.ctx) + + none_moved = self.queue_service.move_failed_to_dead_letter(self.ctx, limit=0) + self.assertEqual(none_moved["total"], 1) + self.assertEqual(self.queue_service.queue_summary()["dead_letter"], 1) + + moved = self.queue_service.move_failed_to_dead_letter(self.ctx, limit=999) + self.assertEqual(moved["total"], 2) + + retried = self.queue_service.retry_dead_letters(self.ctx, limit=-5) + self.assertEqual(retried["total"], 1) + self.assertEqual(self.queue_service.queue_summary()["dead_letter"], 2) + if __name__ == "__main__": unittest.main()