[WEB-2626] chore: removed the deleted issue's count (#5837)

NarayanBavisetti · web-flow · commit 6e63af7ca904 · 2024-10-16T00:30:44.000+05:30
* chore: removed the deleted issue count

* chore: added issue manager in burn down
diff --git 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
@@ -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
@@ -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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ def get_queryset(self):`
`160`	`160`	`filter=Q(`
`161`	`161`	`issue_cycle__issue__archived_at__isnull=True,`
`162`	`162`	`issue_cycle__issue__is_draft=False,`
	`163`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`163`	`164`	`),`
`164`	`165`	`)`
`165`	`166`	`)`
`@@ -171,6 +172,7 @@ def get_queryset(self):`
`171`	`172`	`issue_cycle__issue__state__group="completed",`
`172`	`173`	`issue_cycle__issue__archived_at__isnull=True,`
`173`	`174`	`issue_cycle__issue__is_draft=False,`
	`175`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`174`	`176`	`),`
`175`	`177`	`)`
`176`	`178`	`)`
`@@ -182,6 +184,7 @@ def get_queryset(self):`
`182`	`184`	`issue_cycle__issue__state__group="cancelled",`
`183`	`185`	`issue_cycle__issue__archived_at__isnull=True,`
`184`	`186`	`issue_cycle__issue__is_draft=False,`
	`187`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`185`	`188`	`),`
`186`	`189`	`)`
`187`	`190`	`)`
`@@ -193,6 +196,7 @@ def get_queryset(self):`
`193`	`196`	`issue_cycle__issue__state__group="started",`
`194`	`197`	`issue_cycle__issue__archived_at__isnull=True,`
`195`	`198`	`issue_cycle__issue__is_draft=False,`
	`199`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`196`	`200`	`),`
`197`	`201`	`)`
`198`	`202`	`)`
`@@ -204,6 +208,7 @@ def get_queryset(self):`
`204`	`208`	`issue_cycle__issue__state__group="unstarted",`
`205`	`209`	`issue_cycle__issue__archived_at__isnull=True,`
`206`	`210`	`issue_cycle__issue__is_draft=False,`
	`211`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`207`	`212`	`),`
`208`	`213`	`)`
`209`	`214`	`)`
`@@ -215,6 +220,7 @@ def get_queryset(self):`
`215`	`220`	`issue_cycle__issue__state__group="backlog",`
`216`	`221`	`issue_cycle__issue__archived_at__isnull=True,`
`217`	`222`	`issue_cycle__issue__is_draft=False,`
	`223`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`218`	`224`	`),`
`219`	`225`	`)`
`220`	`226`	`)`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ def get_queryset(self):`
`102`	`102`	`filter=Q(`
`103`	`103`	`issue_cycle__issue__archived_at__isnull=True,`
`104`	`104`	`issue_cycle__issue__is_draft=False,`
	`105`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`105`	`106`	`),`
`106`	`107`	`)`
`107`	`108`	`)`
`@@ -113,6 +114,7 @@ def get_queryset(self):`
`113`	`114`	`issue_cycle__issue__state__group="completed",`
`114`	`115`	`issue_cycle__issue__archived_at__isnull=True,`
`115`	`116`	`issue_cycle__issue__is_draft=False,`
	`117`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`116`	`118`	`),`
`117`	`119`	`)`
`118`	`120`	`)`
`@@ -607,6 +609,7 @@ def post(self, request, slug, project_id, cycle_id):`
`607`	`609`	`issue_cycle__issue__state__group="completed",`
`608`	`610`	`issue_cycle__issue__archived_at__isnull=True,`
`609`	`611`	`issue_cycle__issue__is_draft=False,`
	`612`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`610`	`613`	`),`
`611`	`614`	`)`
`612`	`615`	`)`
`@@ -617,6 +620,7 @@ def post(self, request, slug, project_id, cycle_id):`
`617`	`620`	`issue_cycle__issue__state__group="cancelled",`
`618`	`621`	`issue_cycle__issue__archived_at__isnull=True,`
`619`	`622`	`issue_cycle__issue__is_draft=False,`
	`623`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`620`	`624`	`),`
`621`	`625`	`)`
`622`	`626`	`)`
`@@ -627,6 +631,7 @@ def post(self, request, slug, project_id, cycle_id):`
`627`	`631`	`issue_cycle__issue__state__group="started",`
`628`	`632`	`issue_cycle__issue__archived_at__isnull=True,`
`629`	`633`	`issue_cycle__issue__is_draft=False,`
	`634`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`630`	`635`	`),`
`631`	`636`	`)`
`632`	`637`	`)`
`@@ -637,6 +642,7 @@ def post(self, request, slug, project_id, cycle_id):`
`637`	`642`	`issue_cycle__issue__state__group="unstarted",`
`638`	`643`	`issue_cycle__issue__archived_at__isnull=True,`
`639`	`644`	`issue_cycle__issue__is_draft=False,`
	`645`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`640`	`646`	`),`
`641`	`647`	`)`
`642`	`648`	`)`
`@@ -647,6 +653,7 @@ def post(self, request, slug, project_id, cycle_id):`
`647`	`653`	`issue_cycle__issue__state__group="backlog",`
`648`	`654`	`issue_cycle__issue__archived_at__isnull=True,`
`649`	`655`	`issue_cycle__issue__is_draft=False,`
	`656`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`650`	`657`	`),`
`651`	`658`	`)`
`652`	`659`	`)`
`@@ -1210,6 +1217,7 @@ def get(self, request, slug, project_id, cycle_id):`
`1210`	`1217`	`filter=Q(`
`1211`	`1218`	`issue_cycle__issue__archived_at__isnull=True,`
`1212`	`1219`	`issue_cycle__issue__is_draft=False,`
	`1220`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`1213`	`1221`	`),`
`1214`	`1222`	`)`
`1215`	`1223`	`)`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ def get(self, request, slug):`
`43`	`43`	`issue_cycle__issue__state__group="completed",`
`44`	`44`	`issue_cycle__issue__archived_at__isnull=True,`
`45`	`45`	`issue_cycle__issue__is_draft=False,`
	`46`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`46`	`47`	`),`
`47`	`48`	`)`
`48`	`49`	`)`
`@@ -53,6 +54,7 @@ def get(self, request, slug):`
`53`	`54`	`issue_cycle__issue__state__group="cancelled",`
`54`	`55`	`issue_cycle__issue__archived_at__isnull=True,`
`55`	`56`	`issue_cycle__issue__is_draft=False,`
	`57`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`56`	`58`	`),`
`57`	`59`	`)`
`58`	`60`	`)`
`@@ -63,6 +65,7 @@ def get(self, request, slug):`
`63`	`65`	`issue_cycle__issue__state__group="started",`
`64`	`66`	`issue_cycle__issue__archived_at__isnull=True,`
`65`	`67`	`issue_cycle__issue__is_draft=False,`
	`68`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`66`	`69`	`),`
`67`	`70`	`)`
`68`	`71`	`)`
`@@ -73,6 +76,7 @@ def get(self, request, slug):`
`73`	`76`	`issue_cycle__issue__state__group="unstarted",`
`74`	`77`	`issue_cycle__issue__archived_at__isnull=True,`
`75`	`78`	`issue_cycle__issue__is_draft=False,`
	`79`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`76`	`80`	`),`
`77`	`81`	`)`
`78`	`82`	`)`
`@@ -83,6 +87,7 @@ def get(self, request, slug):`
`83`	`87`	`issue_cycle__issue__state__group="backlog",`
`84`	`88`	`issue_cycle__issue__archived_at__isnull=True,`
`85`	`89`	`issue_cycle__issue__is_draft=False,`
	`90`	`+ issue_cycle__issue__deleted_at__isnull=True,`
`86`	`91`	`),`
`87`	`92`	`)`
`88`	`93`	`)`