diff --git a/apps/api/plane/app/views/search/issue.py b/apps/api/plane/app/views/search/issue.py index 1e7669fa37..6d3a948a3e 100644 --- a/apps/api/plane/app/views/search/issue.py +++ b/apps/api/plane/app/views/search/issue.py @@ -13,6 +13,7 @@ from rest_framework.request import Request from .base import BaseAPIView from plane.db.models import Issue, ProjectMember, IssueRelation from plane.utils.issue_search import search_issues +from plane.db.models.intake import IntakeIssueStatus class IssueSearchEndpoint(BaseAPIView): @@ -143,6 +144,16 @@ class IssueSearchEndpoint(BaseAPIView): project__archived_at__isnull=True, project__deleted_at__isnull=True, ) + .filter( + Q(issue_intake__isnull=True) + | Q( + issue_intake__status__in=[ + IntakeIssueStatus.ACCEPTED.value, + IntakeIssueStatus.REJECTED.value, + IntakeIssueStatus.DUPLICATE.value, + ] + ) + ) .filter(deleted_at__isnull=True) .filter(state__is_triage=False) .exclude(archived_at__isnull=False) diff --git a/apps/api/plane/db/models/intake.py b/apps/api/plane/db/models/intake.py index 1eddd587c2..363c11bca0 100644 --- a/apps/api/plane/db/models/intake.py +++ b/apps/api/plane/db/models/intake.py @@ -44,15 +44,6 @@ class IntakeIssueStatus(models.IntegerChoices): ACCEPTED = 1 DUPLICATE = 2 - -class IntakeIssueStatus(models.IntegerChoices): - PENDING = -2 - REJECTED = -1 - SNOOZED = 0 - ACCEPTED = 1 - DUPLICATE = 2 - - class IntakeIssue(ProjectBaseModel): intake = models.ForeignKey( "db.Intake", related_name="issue_intake", on_delete=models.CASCADE