Skip to content

Commit 6df9809

Browse files
NarayanBavisettiNarayanBavisetti
authored
chore: filter the deleted issues stats (#5893)
1 parent 295f094 commit 6df9809

File tree

13 files changed

+140
-5
lines changed

13 files changed

+140
-5
lines changed

‎apiserver/plane/api/views/cycle.py‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ def get_queryset(self):
7878
filter=Q(
7979
issue_cycle__issue__archived_at__isnull=True,
8080
issue_cycle__issue__is_draft=False,
81+
issue_cycle__deleted_at__isnull=True,
8182
),
8283
)
8384
)
@@ -88,6 +89,7 @@ def get_queryset(self):
8889
issue_cycle__issue__state__group="completed",
8990
issue_cycle__issue__archived_at__isnull=True,
9091
issue_cycle__issue__is_draft=False,
92+
issue_cycle__deleted_at__isnull=True,
9193
),
9294
)
9395
)
@@ -98,6 +100,7 @@ def get_queryset(self):
98100
issue_cycle__issue__state__group="cancelled",
99101
issue_cycle__issue__archived_at__isnull=True,
100102
issue_cycle__issue__is_draft=False,
103+
issue_cycle__deleted_at__isnull=True,
101104
),
102105
)
103106
)
@@ -108,6 +111,7 @@ def get_queryset(self):
108111
issue_cycle__issue__state__group="started",
109112
issue_cycle__issue__archived_at__isnull=True,
110113
issue_cycle__issue__is_draft=False,
114+
issue_cycle__deleted_at__isnull=True,
111115
),
112116
)
113117
)
@@ -118,6 +122,7 @@ def get_queryset(self):
118122
issue_cycle__issue__state__group="unstarted",
119123
issue_cycle__issue__archived_at__isnull=True,
120124
issue_cycle__issue__is_draft=False,
125+
issue_cycle__deleted_at__isnull=True,
121126
),
122127
)
123128
)
@@ -128,6 +133,7 @@ def get_queryset(self):
128133
issue_cycle__issue__state__group="backlog",
129134
issue_cycle__issue__archived_at__isnull=True,
130135
issue_cycle__issue__is_draft=False,
136+
issue_cycle__deleted_at__isnull=True,
131137
),
132138
)
133139
)
@@ -437,6 +443,7 @@ def get_queryset(self):
437443
filter=Q(
438444
issue_cycle__issue__archived_at__isnull=True,
439445
issue_cycle__issue__is_draft=False,
446+
issue_cycle__deleted_at__isnull=True,
440447
),
441448
)
442449
)
@@ -447,6 +454,7 @@ def get_queryset(self):
447454
issue_cycle__issue__state__group="completed",
448455
issue_cycle__issue__archived_at__isnull=True,
449456
issue_cycle__issue__is_draft=False,
457+
issue_cycle__deleted_at__isnull=True,
450458
),
451459
)
452460
)
@@ -457,6 +465,7 @@ def get_queryset(self):
457465
issue_cycle__issue__state__group="cancelled",
458466
issue_cycle__issue__archived_at__isnull=True,
459467
issue_cycle__issue__is_draft=False,
468+
issue_cycle__deleted_at__isnull=True,
460469
),
461470
)
462471
)
@@ -467,6 +476,7 @@ def get_queryset(self):
467476
issue_cycle__issue__state__group="started",
468477
issue_cycle__issue__archived_at__isnull=True,
469478
issue_cycle__issue__is_draft=False,
479+
issue_cycle__deleted_at__isnull=True,
470480
),
471481
)
472482
)
@@ -477,6 +487,7 @@ def get_queryset(self):
477487
issue_cycle__issue__state__group="unstarted",
478488
issue_cycle__issue__archived_at__isnull=True,
479489
issue_cycle__issue__is_draft=False,
490+
issue_cycle__deleted_at__isnull=True,
480491
),
481492
)
482493
)
@@ -487,6 +498,7 @@ def get_queryset(self):
487498
issue_cycle__issue__state__group="backlog",
488499
issue_cycle__issue__archived_at__isnull=True,
489500
issue_cycle__issue__is_draft=False,
501+
issue_cycle__deleted_at__isnull=True,
490502
),
491503
)
492504
)
@@ -500,6 +512,7 @@ def get_queryset(self):
500512
issue_cycle__issue__state__group="completed",
501513
issue_cycle__issue__archived_at__isnull=True,
502514
issue_cycle__issue__is_draft=False,
515+
issue_cycle__deleted_at__isnull=True,
503516
),
504517
)
505518
)
@@ -510,6 +523,7 @@ def get_queryset(self):
510523
issue_cycle__issue__state__group="started",
511524
issue_cycle__issue__archived_at__isnull=True,
512525
issue_cycle__issue__is_draft=False,
526+
issue_cycle__deleted_at__isnull=True,
513527
),
514528
)
515529
)
@@ -615,7 +629,10 @@ def get(self, request, slug, project_id, cycle_id, issue_id=None):
615629
# List
616630
order_by = request.GET.get("order_by", "created_at")
617631
issues = (
618-
Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id)
632+
Issue.issue_objects.filter(
633+
issue_cycle__cycle_id=cycle_id,
634+
issue_cycle__deleted_at__isnull=True,
635+
)
619636
.annotate(
620637
sub_issues_count=Issue.issue_objects.filter(
621638
parent=OuterRef("id")
@@ -812,6 +829,7 @@ def post(self, request, slug, project_id, cycle_id):
812829
filter=Q(
813830
issue_cycle__issue__archived_at__isnull=True,
814831
issue_cycle__issue__is_draft=False,
832+
issue_cycle__deleted_at__isnull=True,
815833
),
816834
)
817835
)
@@ -822,6 +840,7 @@ def post(self, request, slug, project_id, cycle_id):
822840
issue_cycle__issue__state__group="completed",
823841
issue_cycle__issue__archived_at__isnull=True,
824842
issue_cycle__issue__is_draft=False,
843+
issue_cycle__deleted_at__isnull=True,
825844
),
826845
)
827846
)
@@ -832,6 +851,7 @@ def post(self, request, slug, project_id, cycle_id):
832851
issue_cycle__issue__state__group="cancelled",
833852
issue_cycle__issue__archived_at__isnull=True,
834853
issue_cycle__issue__is_draft=False,
854+
issue_cycle__deleted_at__isnull=True,
835855
),
836856
)
837857
)
@@ -842,6 +862,7 @@ def post(self, request, slug, project_id, cycle_id):
842862
issue_cycle__issue__state__group="started",
843863
issue_cycle__issue__archived_at__isnull=True,
844864
issue_cycle__issue__is_draft=False,
865+
issue_cycle__deleted_at__isnull=True,
845866
),
846867
)
847868
)
@@ -852,6 +873,7 @@ def post(self, request, slug, project_id, cycle_id):
852873
issue_cycle__issue__state__group="unstarted",
853874
issue_cycle__issue__archived_at__isnull=True,
854875
issue_cycle__issue__is_draft=False,
876+
issue_cycle__deleted_at__isnull=True,
855877
),
856878
)
857879
)
@@ -862,6 +884,7 @@ def post(self, request, slug, project_id, cycle_id):
862884
issue_cycle__issue__state__group="backlog",
863885
issue_cycle__issue__archived_at__isnull=True,
864886
issue_cycle__issue__is_draft=False,
887+
issue_cycle__deleted_at__isnull=True,
865888
),
866889
)
867890
)
@@ -878,6 +901,7 @@ def post(self, request, slug, project_id, cycle_id):
878901
assignee_estimate_data = (
879902
Issue.issue_objects.filter(
880903
issue_cycle__cycle_id=cycle_id,
904+
issue_cycle__deleted_at__isnull=True,
881905
workspace__slug=slug,
882906
project_id=project_id,
883907
)
@@ -953,6 +977,7 @@ def post(self, request, slug, project_id, cycle_id):
953977
label_distribution_data = (
954978
Issue.issue_objects.filter(
955979
issue_cycle__cycle_id=cycle_id,
980+
issue_cycle__deleted_at__isnull=True,
956981
workspace__slug=slug,
957982
project_id=project_id,
958983
)
@@ -1014,6 +1039,7 @@ def post(self, request, slug, project_id, cycle_id):
10141039
assignee_distribution = (
10151040
Issue.issue_objects.filter(
10161041
issue_cycle__cycle_id=cycle_id,
1042+
issue_cycle__deleted_at__isnull=True,
10171043
workspace__slug=slug,
10181044
project_id=project_id,
10191045
)
@@ -1092,6 +1118,7 @@ def post(self, request, slug, project_id, cycle_id):
10921118
label_distribution = (
10931119
Issue.issue_objects.filter(
10941120
issue_cycle__cycle_id=cycle_id,
1121+
issue_cycle__deleted_at__isnull=True,
10951122
workspace__slug=slug,
10961123
project_id=project_id,
10971124
)

‎apiserver/plane/api/views/module.py‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ def get_queryset(self):
7171
filter=Q(
7272
issue_module__issue__archived_at__isnull=True,
7373
issue_module__issue__is_draft=False,
74+
issue_module__deleted_at__isnull=True,
7475
),
7576
distinct=True,
7677
),
@@ -82,6 +83,7 @@ def get_queryset(self):
8283
issue_module__issue__state__group="completed",
8384
issue_module__issue__archived_at__isnull=True,
8485
issue_module__issue__is_draft=False,
86+
issue_module__deleted_at__isnull=True,
8587
),
8688
distinct=True,
8789
)
@@ -93,6 +95,7 @@ def get_queryset(self):
9395
issue_module__issue__state__group="cancelled",
9496
issue_module__issue__archived_at__isnull=True,
9597
issue_module__issue__is_draft=False,
98+
issue_module__deleted_at__isnull=True,
9699
),
97100
distinct=True,
98101
)
@@ -104,6 +107,7 @@ def get_queryset(self):
104107
issue_module__issue__state__group="started",
105108
issue_module__issue__archived_at__isnull=True,
106109
issue_module__issue__is_draft=False,
110+
issue_module__deleted_at__isnull=True,
107111
),
108112
distinct=True,
109113
)
@@ -115,6 +119,7 @@ def get_queryset(self):
115119
issue_module__issue__state__group="unstarted",
116120
issue_module__issue__archived_at__isnull=True,
117121
issue_module__issue__is_draft=False,
122+
issue_module__deleted_at__isnull=True,
118123
),
119124
distinct=True,
120125
)
@@ -126,6 +131,7 @@ def get_queryset(self):
126131
issue_module__issue__state__group="backlog",
127132
issue_module__issue__archived_at__isnull=True,
128133
issue_module__issue__is_draft=False,
134+
issue_module__deleted_at__isnull=True,
129135
),
130136
distinct=True,
131137
)
@@ -367,7 +373,10 @@ def get_queryset(self):
367373
def get(self, request, slug, project_id, module_id):
368374
order_by = request.GET.get("order_by", "created_at")
369375
issues = (
370-
Issue.issue_objects.filter(issue_module__module_id=module_id)
376+
Issue.issue_objects.filter(
377+
issue_module__module_id=module_id,
378+
issue_module__deleted_at__isnull=True,
379+
)
371380
.annotate(
372381
sub_issues_count=Issue.issue_objects.filter(
373382
parent=OuterRef("id")
@@ -552,6 +561,7 @@ def get_queryset(self):
552561
filter=Q(
553562
issue_module__issue__archived_at__isnull=True,
554563
issue_module__issue__is_draft=False,
564+
issue_module__deleted_at__isnull=True,
555565
),
556566
distinct=True,
557567
),
@@ -563,6 +573,7 @@ def get_queryset(self):
563573
issue_module__issue__state__group="completed",
564574
issue_module__issue__archived_at__isnull=True,
565575
issue_module__issue__is_draft=False,
576+
issue_module__deleted_at__isnull=True,
566577
),
567578
distinct=True,
568579
)
@@ -574,6 +585,7 @@ def get_queryset(self):
574585
issue_module__issue__state__group="cancelled",
575586
issue_module__issue__archived_at__isnull=True,
576587
issue_module__issue__is_draft=False,
588+
issue_module__deleted_at__isnull=True,
577589
),
578590
distinct=True,
579591
)
@@ -585,6 +597,7 @@ def get_queryset(self):
585597
issue_module__issue__state__group="started",
586598
issue_module__issue__archived_at__isnull=True,
587599
issue_module__issue__is_draft=False,
600+
issue_module__deleted_at__isnull=True,
588601
),
589602
distinct=True,
590603
)
@@ -596,6 +609,7 @@ def get_queryset(self):
596609
issue_module__issue__state__group="unstarted",
597610
issue_module__issue__archived_at__isnull=True,
598611
issue_module__issue__is_draft=False,
612+
issue_module__deleted_at__isnull=True,
599613
),
600614
distinct=True,
601615
)
@@ -607,6 +621,7 @@ def get_queryset(self):
607621
issue_module__issue__state__group="backlog",
608622
issue_module__issue__archived_at__isnull=True,
609623
issue_module__issue__is_draft=False,
624+
issue_module__deleted_at__isnull=True,
610625
),
611626
distinct=True,
612627
)

‎apiserver/plane/app/views/analytic/base.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ def get(self, request, slug):
171171
workspace__slug=slug,
172172
**filters,
173173
issue_cycle__cycle_id__isnull=False,
174+
issue_cycle__deleted_at__isnull=True,
174175
)
175176
.distinct("issue_cycle__cycle_id")
176177
.order_by("issue_cycle__cycle_id")
@@ -189,6 +190,7 @@ def get(self, request, slug):
189190
workspace__slug=slug,
190191
**filters,
191192
issue_module__module_id__isnull=False,
193+
issue_module__deleted_at__isnull=True,
192194
)
193195
.distinct("issue_module__module_id")
194196
.order_by("issue_module__module_id")

0 commit comments

Comments
 (0)