diff --git a/app/apps/transactions/models.py b/app/apps/transactions/models.py index 4b21019..d2fb6a5 100644 --- a/app/apps/transactions/models.py +++ b/app/apps/transactions/models.py @@ -49,7 +49,7 @@ class SoftDeleteQuerySet(models.QuerySet): class SoftDeleteManager(models.Manager): def get_queryset(self): qs = SoftDeleteQuerySet(self.model, using=self._db) - return qs if not settings.ENABLE_SOFT_DELETE else qs.filter(deleted=False) + return qs.filter(deleted=False) class AllObjectsManager(models.Manager): @@ -60,7 +60,7 @@ class AllObjectsManager(models.Manager): class DeletedObjectsManager(models.Manager): def get_queryset(self): qs = SoftDeleteQuerySet(self.model, using=self._db) - return qs if not settings.ENABLE_SOFT_DELETE else qs.filter(deleted=True) + return qs.filter(deleted=True) class TransactionCategory(models.Model): diff --git a/app/apps/transactions/tasks.py b/app/apps/transactions/tasks.py index 0833f4e..0abbc75 100644 --- a/app/apps/transactions/tasks.py +++ b/app/apps/transactions/tasks.py @@ -27,7 +27,7 @@ def generate_recurring_transactions(timestamp=None): @app.periodic(cron="10 1 * * *") @app.task -def cleanup_deleted_transactions(): +def cleanup_deleted_transactions(timestamp=None): with cachalot_disabled(): if settings.ENABLE_SOFT_DELETE and settings.KEEP_DELETED_TRANSACTIONS_FOR == 0: return "KEEP_DELETED_TRANSACTIONS_FOR is 0, no cleanup performed." @@ -44,7 +44,7 @@ def cleanup_deleted_transactions(): days=settings.KEEP_DELETED_TRANSACTIONS_FOR ) - invalidate("transactions.Transaction") + invalidate() # Hard delete soft-deleted transactions older than the cutoff date old_transactions = Transaction.deleted_objects.filter(deleted_at__lt=cutoff_date)