binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: filter the deleted issues stats (#5893)

Browse source
This commit is contained in:
Bavisetti Narayan 2024-10-22 20:51:11 +05:30 • committed by GitHub
parent 295f094916
commit 6df98099f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 140 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

29
apiserver/plane/api/views/cycle.py
View file

@ -78,6 +78,7 @@ class CycleAPIEndpoint(BaseAPIView):
filter=Q( filter=Q(
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -88,6 +89,7 @@ class CycleAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="completed", issue_cycle__issue__state__group="completed",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -98,6 +100,7 @@ class CycleAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="cancelled", issue_cycle__issue__state__group="cancelled",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -108,6 +111,7 @@ class CycleAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="started", issue_cycle__issue__state__group="started",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -118,6 +122,7 @@ class CycleAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="unstarted", issue_cycle__issue__state__group="unstarted",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -128,6 +133,7 @@ class CycleAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="backlog", issue_cycle__issue__state__group="backlog",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -437,6 +443,7 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
filter=Q( filter=Q(
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -447,6 +454,7 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="completed", issue_cycle__issue__state__group="completed",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -457,6 +465,7 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="cancelled", issue_cycle__issue__state__group="cancelled",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -467,6 +476,7 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="started", issue_cycle__issue__state__group="started",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -477,6 +487,7 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="unstarted", issue_cycle__issue__state__group="unstarted",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -487,6 +498,7 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="backlog", issue_cycle__issue__state__group="backlog",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -500,6 +512,7 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="completed", issue_cycle__issue__state__group="completed",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -510,6 +523,7 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="started", issue_cycle__issue__state__group="started",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -615,7 +629,10 @@ class CycleIssueAPIEndpoint(BaseAPIView):
# List # List
order_by = request.GET.get("order_by", "created_at") order_by = request.GET.get("order_by", "created_at")
issues = ( issues = (
Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id) Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
)
.annotate( .annotate(
sub_issues_count=Issue.issue_objects.filter( sub_issues_count=Issue.issue_objects.filter(
parent=OuterRef("id") parent=OuterRef("id")
@ -812,6 +829,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
filter=Q( filter=Q(
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -822,6 +840,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="completed", issue_cycle__issue__state__group="completed",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -832,6 +851,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="cancelled", issue_cycle__issue__state__group="cancelled",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -842,6 +862,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="started", issue_cycle__issue__state__group="started",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -852,6 +873,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="unstarted", issue_cycle__issue__state__group="unstarted",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -862,6 +884,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
issue_cycle__issue__state__group="backlog", issue_cycle__issue__state__group="backlog",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -878,6 +901,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
assignee_estimate_data = ( assignee_estimate_data = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -953,6 +977,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
label_distribution_data = ( label_distribution_data = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -1014,6 +1039,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
assignee_distribution = ( assignee_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -1092,6 +1118,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
label_distribution = ( label_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )

17
apiserver/plane/api/views/module.py
View file

@ -71,6 +71,7 @@ class ModuleAPIEndpoint(BaseAPIView):
filter=Q( filter=Q(
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
), ),
@ -82,6 +83,7 @@ class ModuleAPIEndpoint(BaseAPIView):
issue_module__issue__state__group="completed", issue_module__issue__state__group="completed",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )
@ -93,6 +95,7 @@ class ModuleAPIEndpoint(BaseAPIView):
issue_module__issue__state__group="cancelled", issue_module__issue__state__group="cancelled",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )
@ -104,6 +107,7 @@ class ModuleAPIEndpoint(BaseAPIView):
issue_module__issue__state__group="started", issue_module__issue__state__group="started",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )
@ -115,6 +119,7 @@ class ModuleAPIEndpoint(BaseAPIView):
issue_module__issue__state__group="unstarted", issue_module__issue__state__group="unstarted",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )
@ -126,6 +131,7 @@ class ModuleAPIEndpoint(BaseAPIView):
issue_module__issue__state__group="backlog", issue_module__issue__state__group="backlog",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )
@ -367,7 +373,10 @@ class ModuleIssueAPIEndpoint(BaseAPIView):
def get(self, request, slug, project_id, module_id): def get(self, request, slug, project_id, module_id):
order_by = request.GET.get("order_by", "created_at") order_by = request.GET.get("order_by", "created_at")
issues = ( issues = (
Issue.issue_objects.filter(issue_module__module_id=module_id) Issue.issue_objects.filter(
issue_module__module_id=module_id,
issue_module__deleted_at__isnull=True,
)
.annotate( .annotate(
sub_issues_count=Issue.issue_objects.filter( sub_issues_count=Issue.issue_objects.filter(
parent=OuterRef("id") parent=OuterRef("id")
@ -552,6 +561,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
filter=Q( filter=Q(
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
), ),
@ -563,6 +573,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_module__issue__state__group="completed", issue_module__issue__state__group="completed",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )
@ -574,6 +585,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_module__issue__state__group="cancelled", issue_module__issue__state__group="cancelled",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )
@ -585,6 +597,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_module__issue__state__group="started", issue_module__issue__state__group="started",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )
@ -596,6 +609,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_module__issue__state__group="unstarted", issue_module__issue__state__group="unstarted",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )
@ -607,6 +621,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_module__issue__state__group="backlog", issue_module__issue__state__group="backlog",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )

2
apiserver/plane/app/views/analytic/base.py
View file

@ -171,6 +171,7 @@ class AnalyticsEndpoint(BaseAPIView):
workspace__slug=slug, workspace__slug=slug,
**filters, **filters,
issue_cycle__cycle_id__isnull=False, issue_cycle__cycle_id__isnull=False,
issue_cycle__deleted_at__isnull=True,
) )
.distinct("issue_cycle__cycle_id") .distinct("issue_cycle__cycle_id")
.order_by("issue_cycle__cycle_id") .order_by("issue_cycle__cycle_id")
@ -189,6 +190,7 @@ class AnalyticsEndpoint(BaseAPIView):
workspace__slug=slug, workspace__slug=slug,
**filters, **filters,
issue_module__module_id__isnull=False, issue_module__module_id__isnull=False,
issue_module__deleted_at__isnull=True,
) )
.distinct("issue_module__module_id") .distinct("issue_module__module_id")
.order_by("issue_module__module_id") .order_by("issue_module__module_id")

11
apiserver/plane/app/views/cycle/archive.py
View file

@ -48,6 +48,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="backlog", state__group="backlog",
issue_cycle__cycle_id=OuterRef("pk"), issue_cycle__cycle_id=OuterRef("pk"),
issue_cycle__deleted_at__isnull=True,
) )
.values("issue_cycle__cycle_id") .values("issue_cycle__cycle_id")
.annotate( .annotate(
@ -62,6 +63,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="unstarted", state__group="unstarted",
issue_cycle__cycle_id=OuterRef("pk"), issue_cycle__cycle_id=OuterRef("pk"),
issue_cycle__deleted_at__isnull=True,
) )
.values("issue_cycle__cycle_id") .values("issue_cycle__cycle_id")
.annotate( .annotate(
@ -76,6 +78,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="started", state__group="started",
issue_cycle__cycle_id=OuterRef("pk"), issue_cycle__cycle_id=OuterRef("pk"),
issue_cycle__deleted_at__isnull=True,
) )
.values("issue_cycle__cycle_id") .values("issue_cycle__cycle_id")
.annotate( .annotate(
@ -90,6 +93,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="cancelled", state__group="cancelled",
issue_cycle__cycle_id=OuterRef("pk"), issue_cycle__cycle_id=OuterRef("pk"),
issue_cycle__deleted_at__isnull=True,
) )
.values("issue_cycle__cycle_id") .values("issue_cycle__cycle_id")
.annotate( .annotate(
@ -104,6 +108,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="completed", state__group="completed",
issue_cycle__cycle_id=OuterRef("pk"), issue_cycle__cycle_id=OuterRef("pk"),
issue_cycle__deleted_at__isnull=True,
) )
.values("issue_cycle__cycle_id") .values("issue_cycle__cycle_id")
.annotate( .annotate(
@ -117,6 +122,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
Issue.issue_objects.filter( Issue.issue_objects.filter(
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
issue_cycle__cycle_id=OuterRef("pk"), issue_cycle__cycle_id=OuterRef("pk"),
issue_cycle__deleted_at__isnull=True,
) )
.values("issue_cycle__cycle_id") .values("issue_cycle__cycle_id")
.annotate( .annotate(
@ -348,6 +354,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
project_id=self.kwargs.get("project_id"), project_id=self.kwargs.get("project_id"),
parent__isnull=False, parent__isnull=False,
issue_cycle__cycle_id=pk, issue_cycle__cycle_id=pk,
issue_cycle__deleted_at__isnull=True,
) )
.order_by() .order_by()
.annotate(count=Func(F("id"), function="Count")) .annotate(count=Func(F("id"), function="Count"))
@ -402,6 +409,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
assignee_distribution = ( assignee_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=pk, issue_cycle__cycle_id=pk,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -459,6 +467,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
label_distribution = ( label_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=pk, issue_cycle__cycle_id=pk,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -514,6 +523,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
assignee_distribution = ( assignee_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=pk, issue_cycle__cycle_id=pk,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -584,6 +594,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
label_distribution = ( label_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=pk, issue_cycle__cycle_id=pk,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )

27
apiserver/plane/app/views/cycle/base.py
View file

@ -102,7 +102,7 @@ class CycleViewSet(BaseViewSet):
filter=Q( filter=Q(
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__issue__deleted_at__isnull=True, issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -114,7 +114,7 @@ class CycleViewSet(BaseViewSet):
issue_cycle__issue__state__group="completed", issue_cycle__issue__state__group="completed",
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__issue__deleted_at__isnull=True, issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -398,6 +398,7 @@ class CycleViewSet(BaseViewSet):
project_id=self.kwargs.get("project_id"), project_id=self.kwargs.get("project_id"),
parent__isnull=False, parent__isnull=False,
issue_cycle__cycle_id=pk, issue_cycle__cycle_id=pk,
issue_cycle__deleted_at__isnull=True,
) )
.order_by() .order_by()
.annotate(count=Func(F("id"), function="Count")) .annotate(count=Func(F("id"), function="Count"))
@ -601,6 +602,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
filter=Q( filter=Q(
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -612,6 +614,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__issue__deleted_at__isnull=True, issue_cycle__issue__deleted_at__isnull=True,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -623,6 +626,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__issue__deleted_at__isnull=True, issue_cycle__issue__deleted_at__isnull=True,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -634,6 +638,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__issue__deleted_at__isnull=True, issue_cycle__issue__deleted_at__isnull=True,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -645,6 +650,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__issue__deleted_at__isnull=True, issue_cycle__issue__deleted_at__isnull=True,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -656,6 +662,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__issue__deleted_at__isnull=True, issue_cycle__issue__deleted_at__isnull=True,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -672,6 +679,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
assignee_estimate_data = ( assignee_estimate_data = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -746,6 +754,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
label_distribution_data = ( label_distribution_data = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -807,6 +816,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
assignee_distribution = ( assignee_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -884,6 +894,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
label_distribution = ( label_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -1074,6 +1085,7 @@ class CycleProgressEndpoint(BaseAPIView):
Issue.issue_objects.filter( Issue.issue_objects.filter(
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -1126,6 +1138,7 @@ class CycleProgressEndpoint(BaseAPIView):
backlog_issues = Issue.issue_objects.filter( backlog_issues = Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
state__group="backlog", state__group="backlog",
@ -1133,6 +1146,7 @@ class CycleProgressEndpoint(BaseAPIView):
unstarted_issues = Issue.issue_objects.filter( unstarted_issues = Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
state__group="unstarted", state__group="unstarted",
@ -1140,6 +1154,7 @@ class CycleProgressEndpoint(BaseAPIView):
started_issues = Issue.issue_objects.filter( started_issues = Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
state__group="started", state__group="started",
@ -1147,6 +1162,7 @@ class CycleProgressEndpoint(BaseAPIView):
cancelled_issues = Issue.issue_objects.filter( cancelled_issues = Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
state__group="cancelled", state__group="cancelled",
@ -1154,6 +1170,7 @@ class CycleProgressEndpoint(BaseAPIView):
completed_issues = Issue.issue_objects.filter( completed_issues = Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
state__group="completed", state__group="completed",
@ -1161,6 +1178,7 @@ class CycleProgressEndpoint(BaseAPIView):
total_issues = Issue.issue_objects.filter( total_issues = Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
).count() ).count()
@ -1220,6 +1238,7 @@ class CycleAnalyticsEndpoint(BaseAPIView):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__issue__deleted_at__isnull=True, issue_cycle__issue__deleted_at__isnull=True,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -1247,6 +1266,7 @@ class CycleAnalyticsEndpoint(BaseAPIView):
assignee_distribution = ( assignee_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -1304,6 +1324,7 @@ class CycleAnalyticsEndpoint(BaseAPIView):
label_distribution = ( label_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -1350,6 +1371,7 @@ class CycleAnalyticsEndpoint(BaseAPIView):
assignee_distribution = ( assignee_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
project_id=project_id, project_id=project_id,
workspace__slug=slug, workspace__slug=slug,
) )
@ -1408,6 +1430,7 @@ class CycleAnalyticsEndpoint(BaseAPIView):
label_distribution = ( label_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
project_id=project_id, project_id=project_id,
workspace__slug=slug, workspace__slug=slug,
) )

5
apiserver/plane/app/views/cycle/issue.py
View file

@ -90,7 +90,10 @@ class CycleIssueViewSet(BaseViewSet):
order_by_param = request.GET.get("order_by", "created_at") order_by_param = request.GET.get("order_by", "created_at")
filters = issue_filters(request.query_params, "GET") filters = issue_filters(request.query_params, "GET")
issue_queryset = ( issue_queryset = (
Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id) Issue.issue_objects.filter(
issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
)
.filter(project_id=project_id) .filter(project_id=project_id)
.filter(workspace__slug=slug) .filter(workspace__slug=slug)
.filter(**filters) .filter(**filters)

16
apiserver/plane/app/views/module/archive.py
View file

@ -57,6 +57,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
Issue.issue_objects.filter( Issue.issue_objects.filter(
state__group="cancelled", state__group="cancelled",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate(cnt=Count("pk")) .annotate(cnt=Count("pk"))
@ -66,6 +67,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
Issue.issue_objects.filter( Issue.issue_objects.filter(
state__group="completed", state__group="completed",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate(cnt=Count("pk")) .annotate(cnt=Count("pk"))
@ -75,6 +77,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
Issue.issue_objects.filter( Issue.issue_objects.filter(
state__group="started", state__group="started",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate(cnt=Count("pk")) .annotate(cnt=Count("pk"))
@ -84,6 +87,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
Issue.issue_objects.filter( Issue.issue_objects.filter(
state__group="unstarted", state__group="unstarted",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate(cnt=Count("pk")) .annotate(cnt=Count("pk"))
@ -93,6 +97,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
Issue.issue_objects.filter( Issue.issue_objects.filter(
state__group="backlog", state__group="backlog",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate(cnt=Count("pk")) .annotate(cnt=Count("pk"))
@ -101,6 +106,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
total_issues = ( total_issues = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate(cnt=Count("pk")) .annotate(cnt=Count("pk"))
@ -111,6 +117,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="completed", state__group="completed",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate( .annotate(
@ -125,6 +132,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
Issue.issue_objects.filter( Issue.issue_objects.filter(
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate( .annotate(
@ -139,6 +147,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="backlog", state__group="backlog",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate( .annotate(
@ -153,6 +162,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="unstarted", state__group="unstarted",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate( .annotate(
@ -167,6 +177,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="started", state__group="started",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate( .annotate(
@ -181,6 +192,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="cancelled", state__group="cancelled",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate( .annotate(
@ -337,6 +349,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
project_id=self.kwargs.get("project_id"), project_id=self.kwargs.get("project_id"),
parent__isnull=False, parent__isnull=False,
issue_module__module_id=pk, issue_module__module_id=pk,
issue_module__deleted_at__isnull=True,
) )
.order_by() .order_by()
.annotate(count=Func(F("id"), function="Count")) .annotate(count=Func(F("id"), function="Count"))
@ -360,6 +373,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
assignee_distribution = ( assignee_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_module__module_id=pk, issue_module__module_id=pk,
issue_module__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -478,6 +492,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
assignee_distribution = ( assignee_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_module__module_id=pk, issue_module__module_id=pk,
issue_module__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -547,6 +562,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
label_distribution = ( label_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_module__module_id=pk, issue_module__module_id=pk,
issue_module__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )

17
apiserver/plane/app/views/module/base.py
View file

@ -85,6 +85,7 @@ class ModuleViewSet(BaseViewSet):
Issue.issue_objects.filter( Issue.issue_objects.filter(
state__group="cancelled", state__group="cancelled",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate(cnt=Count("pk")) .annotate(cnt=Count("pk"))
@ -94,6 +95,7 @@ class ModuleViewSet(BaseViewSet):
Issue.issue_objects.filter( Issue.issue_objects.filter(
state__group="completed", state__group="completed",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate(cnt=Count("pk")) .annotate(cnt=Count("pk"))
@ -103,6 +105,7 @@ class ModuleViewSet(BaseViewSet):
Issue.issue_objects.filter( Issue.issue_objects.filter(
state__group="started", state__group="started",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate(cnt=Count("pk")) .annotate(cnt=Count("pk"))
@ -112,6 +115,7 @@ class ModuleViewSet(BaseViewSet):
Issue.issue_objects.filter( Issue.issue_objects.filter(
state__group="unstarted", state__group="unstarted",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate(cnt=Count("pk")) .annotate(cnt=Count("pk"))
@ -121,6 +125,7 @@ class ModuleViewSet(BaseViewSet):
Issue.issue_objects.filter( Issue.issue_objects.filter(
state__group="backlog", state__group="backlog",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate(cnt=Count("pk")) .annotate(cnt=Count("pk"))
@ -129,6 +134,7 @@ class ModuleViewSet(BaseViewSet):
total_issues = ( total_issues = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate(cnt=Count("pk")) .annotate(cnt=Count("pk"))
@ -139,6 +145,7 @@ class ModuleViewSet(BaseViewSet):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="completed", state__group="completed",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate( .annotate(
@ -153,6 +160,7 @@ class ModuleViewSet(BaseViewSet):
Issue.issue_objects.filter( Issue.issue_objects.filter(
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate( .annotate(
@ -167,6 +175,7 @@ class ModuleViewSet(BaseViewSet):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="backlog", state__group="backlog",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate( .annotate(
@ -181,6 +190,7 @@ class ModuleViewSet(BaseViewSet):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="unstarted", state__group="unstarted",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate( .annotate(
@ -195,6 +205,7 @@ class ModuleViewSet(BaseViewSet):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="started", state__group="started",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate( .annotate(
@ -209,6 +220,7 @@ class ModuleViewSet(BaseViewSet):
estimate_point__estimate__type="points", estimate_point__estimate__type="points",
state__group="cancelled", state__group="cancelled",
issue_module__module_id=OuterRef("pk"), issue_module__module_id=OuterRef("pk"),
issue_module__deleted_at__isnull=True,
) )
.values("issue_module__module_id") .values("issue_module__module_id")
.annotate( .annotate(
@ -448,6 +460,7 @@ class ModuleViewSet(BaseViewSet):
project_id=self.kwargs.get("project_id"), project_id=self.kwargs.get("project_id"),
parent__isnull=False, parent__isnull=False,
issue_module__module_id=pk, issue_module__module_id=pk,
issue_module__deleted_at__isnull=True,
) )
.order_by() .order_by()
.annotate(count=Func(F("id"), function="Count")) .annotate(count=Func(F("id"), function="Count"))
@ -477,6 +490,7 @@ class ModuleViewSet(BaseViewSet):
assignee_distribution = ( assignee_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_module__module_id=pk, issue_module__module_id=pk,
issue_module__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -542,6 +556,7 @@ class ModuleViewSet(BaseViewSet):
label_distribution = ( label_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_module__module_id=pk, issue_module__module_id=pk,
issue_module__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -593,6 +608,7 @@ class ModuleViewSet(BaseViewSet):
assignee_distribution = ( assignee_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_module__module_id=pk, issue_module__module_id=pk,
issue_module__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )
@ -662,6 +678,7 @@ class ModuleViewSet(BaseViewSet):
label_distribution = ( label_distribution = (
Issue.issue_objects.filter( Issue.issue_objects.filter(
issue_module__module_id=pk, issue_module__module_id=pk,
issue_module__deleted_at__isnull=True,
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
) )

1
apiserver/plane/app/views/module/issue.py
View file

@ -58,6 +58,7 @@ class ModuleIssueViewSet(BaseViewSet):
project_id=self.kwargs.get("project_id"), project_id=self.kwargs.get("project_id"),
workspace__slug=self.kwargs.get("slug"), workspace__slug=self.kwargs.get("slug"),
issue_module__module_id=self.kwargs.get("module_id"), issue_module__module_id=self.kwargs.get("module_id"),
issue_module__deleted_at__isnull=True,
) )
.select_related("workspace", "project", "state", "parent") .select_related("workspace", "project", "state", "parent")
.prefetch_related("assignees", "labels", "issue_module__module") .prefetch_related("assignees", "labels", "issue_module__module")

6
apiserver/plane/app/views/workspace/cycle.py
View file

@ -33,6 +33,7 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
filter=Q( filter=Q(
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -44,6 +45,7 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__issue__deleted_at__isnull=True, issue_cycle__issue__deleted_at__isnull=True,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -55,6 +57,7 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__issue__deleted_at__isnull=True, issue_cycle__issue__deleted_at__isnull=True,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -66,6 +69,7 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__issue__deleted_at__isnull=True, issue_cycle__issue__deleted_at__isnull=True,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -77,6 +81,7 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__issue__deleted_at__isnull=True, issue_cycle__issue__deleted_at__isnull=True,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )
@ -88,6 +93,7 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
issue_cycle__issue__deleted_at__isnull=True, issue_cycle__issue__deleted_at__isnull=True,
issue_cycle__deleted_at__isnull=True,
), ),
) )
) )

6
apiserver/plane/app/views/workspace/module.py
View file

@ -45,6 +45,7 @@ class WorkspaceModulesEndpoint(BaseAPIView):
filter=Q( filter=Q(
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
), ),
@ -56,6 +57,7 @@ class WorkspaceModulesEndpoint(BaseAPIView):
issue_module__issue__state__group="completed", issue_module__issue__state__group="completed",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )
@ -67,6 +69,7 @@ class WorkspaceModulesEndpoint(BaseAPIView):
issue_module__issue__state__group="cancelled", issue_module__issue__state__group="cancelled",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )
@ -78,6 +81,7 @@ class WorkspaceModulesEndpoint(BaseAPIView):
issue_module__issue__state__group="started", issue_module__issue__state__group="started",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )
@ -89,6 +93,7 @@ class WorkspaceModulesEndpoint(BaseAPIView):
issue_module__issue__state__group="unstarted", issue_module__issue__state__group="unstarted",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )
@ -100,6 +105,7 @@ class WorkspaceModulesEndpoint(BaseAPIView):
issue_module__issue__state__group="backlog", issue_module__issue__state__group="backlog",
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
issue_module__deleted_at__isnull=True,
), ),
distinct=True, distinct=True,
) )

2
apiserver/plane/bgtasks/analytic_plot_export.py
View file

@ -158,6 +158,7 @@ def get_module_details(slug, filters):
workspace__slug=slug, workspace__slug=slug,
**filters, **filters,
issue_module__module_id__isnull=False, issue_module__module_id__isnull=False,
issue_module__deleted_at__isnull=True,
) )
.distinct("issue_module__module_id") .distinct("issue_module__module_id")
.order_by("issue_module__module_id") .order_by("issue_module__module_id")
@ -174,6 +175,7 @@ def get_cycle_details(slug, filters):
workspace__slug=slug, workspace__slug=slug,
**filters, **filters,
issue_cycle__cycle_id__isnull=False, issue_cycle__cycle_id__isnull=False,
issue_cycle__deleted_at__isnull=True,
) )
.distinct("issue_cycle__cycle_id") .distinct("issue_cycle__cycle_id")
.order_by("issue_cycle__cycle_id") .order_by("issue_cycle__cycle_id")

6
apiserver/plane/utils/analytics_plot.py
View file

@ -142,6 +142,7 @@ def burndown_plot(
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
estimate_point__isnull=False, estimate_point__isnull=False,
).values_list("estimate_point__value", flat=True) ).values_list("estimate_point__value", flat=True)
@ -153,6 +154,7 @@ def burndown_plot(
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
issue_module__module_id=module_id, issue_module__module_id=module_id,
issue_module__deleted_at__isnull=True,
estimate_point__isnull=False, estimate_point__isnull=False,
).values_list("estimate_point__value", flat=True) ).values_list("estimate_point__value", flat=True)
@ -179,6 +181,7 @@ def burndown_plot(
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
estimate_point__isnull=False, estimate_point__isnull=False,
) )
.annotate(date=TruncDate("completed_at")) .annotate(date=TruncDate("completed_at"))
@ -192,6 +195,7 @@ def burndown_plot(
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
issue_cycle__cycle_id=cycle_id, issue_cycle__cycle_id=cycle_id,
issue_cycle__deleted_at__isnull=True,
) )
.annotate(date=TruncDate("completed_at")) .annotate(date=TruncDate("completed_at"))
.values("date") .values("date")
@ -217,6 +221,7 @@ def burndown_plot(
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
issue_module__module_id=module_id, issue_module__module_id=module_id,
issue_module__deleted_at__isnull=True,
estimate_point__isnull=False, estimate_point__isnull=False,
) )
.annotate(date=TruncDate("completed_at")) .annotate(date=TruncDate("completed_at"))
@ -230,6 +235,7 @@ def burndown_plot(
workspace__slug=slug, workspace__slug=slug,
project_id=project_id, project_id=project_id,
issue_module__module_id=module_id, issue_module__module_id=module_id,
issue_module__deleted_at__isnull=True,
) )
.annotate(date=TruncDate("completed_at")) .annotate(date=TruncDate("completed_at"))
.values("date") .values("date")