From f547aa07faecbde9e1de694d48df144413ff0cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6pf?= Date: Sat, 4 Feb 2023 14:02:54 +0100 Subject: [PATCH] retain completed tasks after expiry --- backend/oasst_backend/task_repository.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/oasst_backend/task_repository.py b/backend/oasst_backend/task_repository.py index 7748840a..38a23e0c 100644 --- a/backend/oasst_backend/task_repository.py +++ b/backend/oasst_backend/task_repository.py @@ -12,7 +12,7 @@ from oasst_backend.utils.database_utils import CommitMode, managed_tx_method from oasst_shared.exceptions.oasst_api_error import OasstError, OasstErrorCode from oasst_shared.schemas import protocol as protocol_schema from oasst_shared.utils import utcnow -from sqlmodel import Session, delete, func, or_ +from sqlmodel import Session, delete, false, func, or_ from starlette.status import HTTP_404_NOT_FOUND @@ -27,7 +27,7 @@ def validate_frontend_message_id(message_id: str) -> None: def delete_expired_tasks(session: Session) -> int: - stm = delete(Task).where(Task.expiry_date < utcnow()) + stm = delete(Task).where(Task.expiry_date < utcnow(), Task.done == false()) result = session.exec(stm) logger.info(f"Deleted {result.rowcount} expired tasks.") return result.rowcount @@ -236,5 +236,5 @@ class TaskRepository: qry = qry.limit(limit) return qry.all() - def delete_expired_tasks(self) -> int: + def delete_expired(self) -> int: return delete_expired_tasks(self.db)