chore: handling the archived module ids in the issue list and issue d…

…etail endpoints (#5343)
makeplane · Aug 9, 2024 · f457048 · f457048
1 parent 24b1e71
commit f457048
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/apiserver/plane/app/views/inbox/base.py b/apiserver/plane/app/views/inbox/base.py
@@ -160,7 +160,8 @@ def get_queryset(self):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
+                        filter=~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),

diff --git a/apiserver/plane/app/views/issue/base.py b/apiserver/plane/app/views/issue/base.py
@@ -64,7 +64,6 @@
 
 
 class IssueListEndpoint(BaseAPIView):
-
     permission_classes = [
         ProjectEntityPermission,
     ]
@@ -438,7 +437,8 @@ def retrieve(self, request, slug, project_id, pk=None):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
+                        filter=~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -626,7 +626,6 @@ def delete(self, request, slug, project_id):
             project_id=project_id,
             is_active=True,
         ).exists():
-
             return Response(
                 {"error": "Only admin can perform this action"},
                 status=status.HTTP_403_FORBIDDEN,

diff --git a/apiserver/plane/app/views/view/base.py b/apiserver/plane/app/views/view/base.py
@@ -223,7 +223,8 @@ def get_queryset(self):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
+                        filter=~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),

diff --git a/apiserver/plane/utils/grouper.py b/apiserver/plane/utils/grouper.py
@@ -18,7 +18,6 @@
 
 
 def issue_queryset_grouper(queryset, group_by, sub_group_by):
-
     FIELD_MAPPER = {
         "label_ids": "labels__id",
         "assignee_ids": "assignees__id",
@@ -30,7 +29,10 @@ def issue_queryset_grouper(queryset, group_by, sub_group_by):
         "label_ids": ("labels__id", ~Q(labels__id__isnull=True)),
         "module_ids": (
             "issue_module__module_id",
-            ~Q(issue_module__module_id__isnull=True),
+            (
+                ~Q(issue_module__module_id__isnull=True)
+                & Q(issue_module__module__archived_at__isnull=True)
+            ),
         ),
     }
     default_annotations = {
@@ -51,7 +53,6 @@ def issue_queryset_grouper(queryset, group_by, sub_group_by):
 
 
 def issue_on_results(issues, group_by, sub_group_by):
-
     FIELD_MAPPER = {
         "labels__id": "label_ids",
         "assignees__id": "assignee_ids",