Skip to content

Commit

Permalink
[WEB-2626] chore: removed the deleted issue's count (#5837)
Browse files Browse the repository at this point in the history 
* chore: removed the deleted issue count

* chore: added issue manager in burn down
  • Loading branch information
@NarayanBavisetti
NarayanBavisetti authored Oct 15, 2024
1 parent 5f9af92 commit 6e63af7
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 2 deletions.
6 changes: 6 additions & 0 deletions apiserver/plane/app/views/cycle/archive.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand Down
8 changes: 8 additions & 0 deletions apiserver/plane/app/views/cycle/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand Down Expand Up @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand Down Expand Up @@ -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,
),
)
)
Expand Down
5 changes: 5 additions & 0 deletions apiserver/plane/app/views/workspace/cycle.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand All @@ -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,
),
)
)
Expand Down
4 changes: 2 additions & 2 deletions apiserver/plane/utils/analytics_plot.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down

0 comments on commit 6e63af7

Please sign in to comment.