π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
fix: optimize cycles endpoint for sql (#4065)
Nikhil7452e4013471
diff --git a/apiserver/plane/app/views/cycle/base.py b/apiserver/plane/app/views/cycle/base.pyindex 3246b09973..48e475a74a 100644--- a/apiserver/plane/app/views/cycle/base.py+++ b/apiserver/plane/app/views/cycle/base.py@@ -1,56 +1,56 @@# Python importsimport json+from django.contrib.postgres.aggregates import ArrayAgg+from django.contrib.postgres.fields import ArrayField+# Django importsfrom django.db.models import (- Func,- F,- Q,+ Case,+ CharField,+ Count,Exists,+ F,+ Func,OuterRef,- Count,Prefetch,- Case,- When,+ Q,+ UUIDField,Value,- CharField,- Subquery,- IntegerField,+ When,)-from django.utils import timezone-from django.contrib.postgres.aggregates import ArrayAgg-from django.contrib.postgres.fields import ArrayField-from django.db.models import UUIDFieldfrom django.db.models.functions import Coalesce+from django.utils import timezone+from rest_framework import status# Third party importsfrom rest_framework.response import Response-from rest_framework import status-# Module imports-from .. import BaseViewSet, BaseAPIView, WebhookMixin-from plane.app.serializers import (- CycleSerializer,- CycleFavoriteSerializer,- CycleWriteSerializer,- CycleUserPropertiesSerializer,-)from plane.app.permissions import (ProjectEntityPermission,ProjectLitePermission,)+from plane.app.serializers import (+ CycleFavoriteSerializer,+ CycleSerializer,+ CycleUserPropertiesSerializer,+ CycleWriteSerializer,+)+from plane.bgtasks.issue_activites_task import issue_activityfrom plane.db.models import (- User,Cycle,+ CycleFavorite,CycleIssue,+ CycleUserProperties,Issue,- CycleFavorite,Label,- CycleUserProperties,+ User,)-from plane.bgtasks.issue_activites_task import issue_activityfrom plane.utils.analytics_plot import burndown_plot+# Module imports+from .. import BaseAPIView, BaseViewSet, WebhookMixin+class CycleViewSet(WebhookMixin, BaseViewSet):serializer_class = CycleSerializer@@ -73,60 +73,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):project_id=self.kwargs.get("project_id"),workspace__slug=self.kwargs.get("slug"),)- cancelled_issues = (- Issue.issue_objects.filter(- state__group="cancelled",- issue_cycle__cycle_id=OuterRef("pk"),- )- .values("issue_cycle__cycle_id")- .annotate(cnt=Count("pk"))- .values("cnt")- )- completed_issues = (- Issue.issue_objects.filter(- state__group="completed",- issue_cycle__cycle_id=OuterRef("pk"),- )- .values("issue_cycle__cycle_id")- .annotate(cnt=Count("pk"))- .values("cnt")- )- started_issues = (- Issue.issue_objects.filter(- state__group="started",- issue_cycle__cycle_id=OuterRef("pk"),- )- .values("issue_cycle__cycle_id")- .annotate(cnt=Count("pk"))- .values("cnt")- )- unstarted_issues = (- Issue.issue_objects.filter(- state__group="unstarted",- issue_cycle__cycle_id=OuterRef("pk"),- )- .values("issue_cycle__cycle_id")- .annotate(cnt=Count("pk"))- .values("cnt")- )- backlog_issues = (- Issue.issue_objects.filter(- state__group="backlog",- issue_cycle__cycle_id=OuterRef("pk"),- )- .values("issue_cycle__cycle_id")- .annotate(cnt=Count("pk"))- .values("cnt")- )- total_issues = (- Issue.issue_objects.filter(- issue_cycle__cycle_id=OuterRef("pk"),- )- .values("issue_cycle__cycle_id")- .annotate(cnt=Count("pk"))- .values("cnt")- )-return self.filter_queryset(super().get_queryset()@@ -156,39 +102,62 @@ class CycleViewSet(WebhookMixin, BaseViewSet):).annotate(is_favorite=Exists(favorite_subquery)).annotate(- completed_issues=Coalesce(- Subquery(completed_issues[:1]),- Value(0, output_field=IntegerField()),+ total_issues=Count(+ "issue_cycle",+ filter=Q(+ issue_cycle__issue__archived_at__isnull=True,+ issue_cycle__issue__is_draft=False,+ ),)).annotate(- cancelled_issues=Coalesce(- Subquery(cancelled_issues[:1]),- Value(0, output_field=IntegerField()),+ completed_issues=Count(+ "issue_cycle__issue__state__group",+ filter=Q(+ issue_cycle__issue__state__group="completed",+ issue_cycle__issue__archived_at__isnull=True,+ issue_cycle__issue__is_draft=False,+ ),)).annotate(- started_issues=Coalesce(- Subquery(started_issues[:1]),- Value(0, output_field=IntegerField()),+ cancelled_issues=Count(+ "issue_cycle__issue__state__group",+ filter=Q(+ issue_cycle__issue__state__group="cancelled",+ issue_cycle__issue__archived_at__isnull=True,+ issue_cycle__issue__is_draft=False,+ ),)).annotate(- unstarted_issues=Coalesce(- Subquery(unstarted_issues[:1]),- Value(0, output_field=IntegerField()),+ started_issues=Count(+ "issue_cycle__issue__state__group",+ filter=Q(+ issue_cycle__issue__state__group="started",+ issue_cycle__issue__archived_at__isnull=True,+ issue_cycle__issue__is_draft=False,+ ),)).annotate(- backlog_issues=Coalesce(- Subquery(backlog_issues[:1]),- Value(0, output_field=IntegerField()),+ unstarted_issues=Count(+ "issue_cycle__issue__state__group",+ filter=Q(+ issue_cycle__issue__state__group="unstarted",+ issue_cycle__issue__archived_at__isnull=True,+ issue_cycle__issue__is_draft=False,+ ),)).annotate(- total_issues=Coalesce(- Subquery(total_issues[:1]),- Value(0, output_field=IntegerField()),+ backlog_issues=Count(+ "issue_cycle__issue__state__group",+ filter=Q(+ issue_cycle__issue__state__group="backlog",+ issue_cycle__issue__archived_at__isnull=True,+ issue_cycle__issue__is_draft=False,+ ),)).annotate(@@ -217,9 +186,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):distinct=True,filter=~Q(issue_cycle__issue__assignees__id__isnull=True- )- & Q(- issue_cycle__issue__assignees__member_project__is_active=True),),Value([], output_field=ArrayField(UUIDField())),@@ -384,8 +350,8 @@ class CycleViewSet(WebhookMixin, BaseViewSet):"external_id","progress_snapshot",# meta fields- "total_issues","is_favorite",+ "total_issues","cancelled_issues","completed_issues","started_issues",