mirror of
https://github.com/eitchtee/WYGIWYH.git
synced 2026-04-25 01:58:54 +02:00
fix: cleanup_deleted_transactions task couldn't trigger
This commit is contained in:
@@ -49,7 +49,7 @@ class SoftDeleteQuerySet(models.QuerySet):
|
|||||||
class SoftDeleteManager(models.Manager):
|
class SoftDeleteManager(models.Manager):
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
qs = SoftDeleteQuerySet(self.model, using=self._db)
|
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):
|
class AllObjectsManager(models.Manager):
|
||||||
@@ -60,7 +60,7 @@ class AllObjectsManager(models.Manager):
|
|||||||
class DeletedObjectsManager(models.Manager):
|
class DeletedObjectsManager(models.Manager):
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
qs = SoftDeleteQuerySet(self.model, using=self._db)
|
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):
|
class TransactionCategory(models.Model):
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ def generate_recurring_transactions(timestamp=None):
|
|||||||
|
|
||||||
@app.periodic(cron="10 1 * * *")
|
@app.periodic(cron="10 1 * * *")
|
||||||
@app.task
|
@app.task
|
||||||
def cleanup_deleted_transactions():
|
def cleanup_deleted_transactions(timestamp=None):
|
||||||
with cachalot_disabled():
|
with cachalot_disabled():
|
||||||
if settings.ENABLE_SOFT_DELETE and settings.KEEP_DELETED_TRANSACTIONS_FOR == 0:
|
if settings.ENABLE_SOFT_DELETE and settings.KEEP_DELETED_TRANSACTIONS_FOR == 0:
|
||||||
return "KEEP_DELETED_TRANSACTIONS_FOR is 0, no cleanup performed."
|
return "KEEP_DELETED_TRANSACTIONS_FOR is 0, no cleanup performed."
|
||||||
@@ -44,7 +44,7 @@ def cleanup_deleted_transactions():
|
|||||||
days=settings.KEEP_DELETED_TRANSACTIONS_FOR
|
days=settings.KEEP_DELETED_TRANSACTIONS_FOR
|
||||||
)
|
)
|
||||||
|
|
||||||
invalidate("transactions.Transaction")
|
invalidate()
|
||||||
|
|
||||||
# Hard delete soft-deleted transactions older than the cutoff date
|
# Hard delete soft-deleted transactions older than the cutoff date
|
||||||
old_transactions = Transaction.deleted_objects.filter(deleted_at__lt=cutoff_date)
|
old_transactions = Transaction.deleted_objects.filter(deleted_at__lt=cutoff_date)
|
||||||
|
|||||||
Reference in New Issue
Block a user