From 6e63af7ca904be34affc17ac81367dd058bcb973 Mon Sep 17 00:00:00 2001 From: Bavisetti Narayan <72156168+NarayanBavisetti@users.noreply.github.com> Date: Wed, 16 Oct 2024 00:30:44 +0530 Subject: [PATCH] [WEB-2626] chore: removed the deleted issue's count (#5837) * chore: removed the deleted issue count * chore: added issue manager in burn down --- apiserver/plane/app/views/cycle/archive.py | 6 ++++++ apiserver/plane/app/views/cycle/base.py | 8 ++++++++ apiserver/plane/app/views/workspace/cycle.py | 5 +++++ apiserver/plane/utils/analytics_plot.py | 4 ++-- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/apiserver/plane/app/views/cycle/archive.py b/apiserver/plane/app/views/cycle/archive.py index a03a9fddda6..2209b47a457 100644 --- a/apiserver/plane/app/views/cycle/archive.py +++ b/apiserver/plane/app/views/cycle/archive.py @@ -160,6 +160,7 @@ def get_queryset(self): filter=Q( issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -171,6 +172,7 @@ def get_queryset(self): issue_cycle__issue__state__group="completed", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -182,6 +184,7 @@ def get_queryset(self): issue_cycle__issue__state__group="cancelled", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -193,6 +196,7 @@ def get_queryset(self): issue_cycle__issue__state__group="started", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -204,6 +208,7 @@ def get_queryset(self): issue_cycle__issue__state__group="unstarted", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -215,6 +220,7 @@ def get_queryset(self): issue_cycle__issue__state__group="backlog", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) diff --git a/apiserver/plane/app/views/cycle/base.py b/apiserver/plane/app/views/cycle/base.py index 9ad6ecb363d..e3620762fd5 100644 --- a/apiserver/plane/app/views/cycle/base.py +++ b/apiserver/plane/app/views/cycle/base.py @@ -102,6 +102,7 @@ def get_queryset(self): filter=Q( issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -113,6 +114,7 @@ def get_queryset(self): issue_cycle__issue__state__group="completed", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -607,6 +609,7 @@ def post(self, request, slug, project_id, cycle_id): issue_cycle__issue__state__group="completed", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -617,6 +620,7 @@ def post(self, request, slug, project_id, cycle_id): issue_cycle__issue__state__group="cancelled", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -627,6 +631,7 @@ def post(self, request, slug, project_id, cycle_id): issue_cycle__issue__state__group="started", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -637,6 +642,7 @@ def post(self, request, slug, project_id, cycle_id): issue_cycle__issue__state__group="unstarted", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -647,6 +653,7 @@ def post(self, request, slug, project_id, cycle_id): issue_cycle__issue__state__group="backlog", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -1210,6 +1217,7 @@ def get(self, request, slug, project_id, cycle_id): filter=Q( issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) diff --git a/apiserver/plane/app/views/workspace/cycle.py b/apiserver/plane/app/views/workspace/cycle.py index f642416e3bb..5dfbafc41ed 100644 --- a/apiserver/plane/app/views/workspace/cycle.py +++ b/apiserver/plane/app/views/workspace/cycle.py @@ -43,6 +43,7 @@ def get(self, request, slug): issue_cycle__issue__state__group="completed", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -53,6 +54,7 @@ def get(self, request, slug): issue_cycle__issue__state__group="cancelled", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -63,6 +65,7 @@ def get(self, request, slug): issue_cycle__issue__state__group="started", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -73,6 +76,7 @@ def get(self, request, slug): issue_cycle__issue__state__group="unstarted", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) @@ -83,6 +87,7 @@ def get(self, request, slug): issue_cycle__issue__state__group="backlog", issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__is_draft=False, + issue_cycle__issue__deleted_at__isnull=True, ), ) ) diff --git a/apiserver/plane/utils/analytics_plot.py b/apiserver/plane/utils/analytics_plot.py index 1770e95ae95..ea6e51e761f 100644 --- a/apiserver/plane/utils/analytics_plot.py +++ b/apiserver/plane/utils/analytics_plot.py @@ -138,7 +138,7 @@ def burndown_plot( estimate__type="points", ).exists() if estimate_type and plot_type == "points" and cycle_id: - issue_estimates = Issue.objects.filter( + issue_estimates = Issue.issue_objects.filter( workspace__slug=slug, project_id=project_id, issue_cycle__cycle_id=cycle_id, @@ -149,7 +149,7 @@ def burndown_plot( total_estimate_points = sum(issue_estimates) if estimate_type and plot_type == "points" and module_id: - issue_estimates = Issue.objects.filter( + issue_estimates = Issue.issue_objects.filter( workspace__slug=slug, project_id=project_id, issue_module__module_id=module_id,