From 3241693d6dddc14e13507abef79bbbce4e481156 Mon Sep 17 00:00:00 2001
From: Bavisetti Narayan <72156168+NarayanBavisetti@users.noreply.github.com>
Date: Fri, 26 Dec 2025 20:28:33 +0530
Subject: [PATCH] [WEB-5815] chore: removed the deleted states (#8457)

---
 apps/api/plane/db/models/issue.py | 8 --------
 apps/api/plane/db/models/state.py | 6 +++---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/apps/api/plane/db/models/issue.py b/apps/api/plane/db/models/issue.py
index 07ebdf0a41..5f6ce051d2 100644
--- a/apps/api/plane/db/models/issue.py
+++ b/apps/api/plane/db/models/issue.py
@@ -90,14 +90,6 @@ class IssueManager(SoftDeletionManager):
         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)
             .exclude(archived_at__isnull=False)
             .exclude(project__archived_at__isnull=False)
diff --git a/apps/api/plane/db/models/state.py b/apps/api/plane/db/models/state.py
index aeb08b8b2e..29a02e00c2 100644
--- a/apps/api/plane/db/models/state.py
+++ b/apps/api/plane/db/models/state.py
@@ -5,7 +5,7 @@ from django.db.models import Q
 
 # Module imports
 from .project import ProjectBaseModel
-
+from plane.db.mixins import SoftDeletionManager
 
 class StateGroup(models.TextChoices):
     BACKLOG = "backlog", "Backlog"
@@ -58,14 +58,14 @@ DEFAULT_STATES = [
 ]
 
 
-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):