feat: attachment and link count in issues list (#777)

makeplane · Apr 11, 2023 · 6279a04 · 6279a04 · vercel · Apr 11, 2023
1 parent ce26bed
commit 6279a04
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 0 deletions.
diff --git a/apiserver/plane/api/serializers/issue.py b/apiserver/plane/api/serializers/issue.py
@@ -522,6 +522,8 @@ class IssueLiteSerializer(BaseSerializer):
     sub_issues_count = serializers.IntegerField(read_only=True)
     cycle_id = serializers.UUIDField(read_only=True)
     module_id = serializers.UUIDField(read_only=True)
+    attachment_count = serializers.IntegerField(read_only=True)
+    link_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = Issue

diff --git a/apiserver/plane/api/views/cycle.py b/apiserver/plane/api/views/cycle.py
@@ -28,6 +28,8 @@
     CycleIssue,
     Issue,
     CycleFavorite,
+    IssueLink,
+    IssueAttachment,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.grouper import group_results
@@ -226,6 +228,20 @@ def list(self, request, slug, project_id, cycle_id):
                 .prefetch_related("labels")
                 .order_by(order_by)
                 .filter(**filters)
+                .annotate(
+                    link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
+                .annotate(
+                    attachment_count=IssueAttachment.objects.filter(
+                        issue=OuterRef("id")
+                    )
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
             )
 
             issues_data = IssueStateSerializer(issues, many=True).data

diff --git a/apiserver/plane/api/views/issue.py b/apiserver/plane/api/views/issue.py
@@ -148,6 +148,20 @@ def list(self, request, slug, project_id):
                 .filter(**filters)
                 .annotate(cycle_id=F("issue_cycle__id"))
                 .annotate(module_id=F("issue_module__id"))
+                .annotate(
+                    link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
+                .annotate(
+                    attachment_count=IssueAttachment.objects.filter(
+                        issue=OuterRef("id")
+                    )
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
             )
 
             issue_queryset = (

diff --git a/apiserver/plane/api/views/module.py b/apiserver/plane/api/views/module.py
@@ -31,6 +31,8 @@
     Issue,
     ModuleLink,
     ModuleFavorite,
+    IssueLink,
+    IssueAttachment,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.grouper import group_results
@@ -204,6 +206,20 @@ def list(self, request, slug, project_id, module_id):
                 .prefetch_related("labels")
                 .order_by(order_by)
                 .filter(**filters)
+                .annotate(
+                    link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
+                .annotate(
+                    attachment_count=IssueAttachment.objects.filter(
+                        issue=OuterRef("id")
+                    )
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
             )
 
             issues_data = IssueStateSerializer(issues, many=True).data