From 741412bbe4b1cbcf5baa408d372dd4a7da5f088c Mon Sep 17 00:00:00 2001 From: NarayanBavisetti Date: Fri, 26 Dec 2025 18:54:41 +0530 Subject: [PATCH 1/2] chore: removed the deleted states --- apps/api/plane/db/models/issue.py | 6 ------ apps/api/plane/db/models/state.py | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/apps/api/plane/db/models/issue.py b/apps/api/plane/db/models/issue.py index 07ebdf0a41e..eaab84b7f80 100644 --- a/apps/api/plane/db/models/issue.py +++ b/apps/api/plane/db/models/issue.py @@ -90,12 +90,6 @@ def get_queryset(self): return ( super() .get_queryset() - .filter( - models.Q(issue_intake__status=1) - | models.Q(issue_intake__status=-1) - | models.Q(issue_intake__status=2) - | models.Q(issue_intake__isnull=True) - ) .filter(deleted_at__isnull=True) .filter(state__is_triage=False) .exclude(state__group=StateGroup.TRIAGE.value) diff --git a/apps/api/plane/db/models/state.py b/apps/api/plane/db/models/state.py index aeb08b8b2e9..29a02e00c2c 100644 --- a/apps/api/plane/db/models/state.py +++ b/apps/api/plane/db/models/state.py @@ -5,7 +5,7 @@ # Module imports from .project import ProjectBaseModel - +from plane.db.mixins import SoftDeletionManager class StateGroup(models.TextChoices): BACKLOG = "backlog", "Backlog" @@ -58,14 +58,14 @@ class StateGroup(models.TextChoices): ] -class StateManager(models.Manager): +class StateManager(SoftDeletionManager): """Default manager - excludes triage states""" def get_queryset(self): return super().get_queryset().exclude(group=StateGroup.TRIAGE.value) -class TriageStateManager(models.Manager): +class TriageStateManager(SoftDeletionManager): """Manager for triage states only""" def get_queryset(self): From 98a5e4950e59621ed1e41d7e515469f3ddce2482 Mon Sep 17 00:00:00 2001 From: NarayanBavisetti Date: Fri, 26 Dec 2025 19:18:48 +0530 Subject: [PATCH 2/2] chore: remove the unwnated filters --- apps/api/plane/db/models/issue.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/api/plane/db/models/issue.py b/apps/api/plane/db/models/issue.py index eaab84b7f80..5f6ce051d2a 100644 --- a/apps/api/plane/db/models/issue.py +++ b/apps/api/plane/db/models/issue.py @@ -90,8 +90,6 @@ def get_queryset(self): return ( super() .get_queryset() - .filter(deleted_at__isnull=True) - .filter(state__is_triage=False) .exclude(state__group=StateGroup.TRIAGE.value) .exclude(archived_at__isnull=False) .exclude(project__archived_at__isnull=False)