thunderstrike/plane
thunderstrike/plane
2
0
Fork 0
forked from github/plane
Code Pull Requests Activity

[WEB-820] fix: state count in cycle and module (#4052)

Browse Source 
* fix: state count in cycle and module

* fix: issue manager change
This commit is contained in:
Bavisetti Narayan 2024-03-25 13:15:53 +05:30 committed by GitHub
parent 31b2fa2c14
commit 2429ac053d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 168 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
apiserver/plane/app/views/cycle/base.py
View File

@ -14,6 +14,8 @@ from django.db.models import (
When, When,
Value, Value,
CharField, CharField,
Subquery,
IntegerField,
) )
from django.utils import timezone from django.utils import timezone
from django.contrib.postgres.aggregates import ArrayAgg from django.contrib.postgres.aggregates import ArrayAgg
@ -71,6 +73,60 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
project_id=self.kwargs.get("project_id"), project_id=self.kwargs.get("project_id"),
workspace__slug=self.kwargs.get("slug"), 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( return self.filter_queryset(
super() super()
.get_queryset() .get_queryset()
@ -100,58 +156,39 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
) )
.annotate(is_favorite=Exists(favorite_subquery)) .annotate(is_favorite=Exists(favorite_subquery))
.annotate( .annotate(
completed_issues=Count( completed_issues=Coalesce(
"issue_cycle__issue__state__group", Subquery(completed_issues[:1]),
filter=Q( Value(0, output_field=IntegerField()),
issue_cycle__issue__state__group="completed",
issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False,
),
distinct=True,
) )
) )
.annotate( .annotate(
cancelled_issues=Count( cancelled_issues=Coalesce(
"issue_cycle__issue__state__group", Subquery(cancelled_issues[:1]),
filter=Q( Value(0, output_field=IntegerField()),
issue_cycle__issue__state__group="cancelled",
issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False,
),
distinct=True,
) )
) )
.annotate( .annotate(
started_issues=Count( started_issues=Coalesce(
"issue_cycle__issue__state__group", Subquery(started_issues[:1]),
filter=Q( Value(0, output_field=IntegerField()),
issue_cycle__issue__state__group="started",
issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False,
),
distinct=True,
) )
) )
.annotate( .annotate(
unstarted_issues=Count( unstarted_issues=Coalesce(
"issue_cycle__issue__state__group", Subquery(unstarted_issues[:1]),
filter=Q( Value(0, output_field=IntegerField()),
issue_cycle__issue__state__group="unstarted",
issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False,
),
distinct=True,
) )
) )
.annotate( .annotate(
backlog_issues=Count( backlog_issues=Coalesce(
"issue_cycle__issue__state__group", Subquery(backlog_issues[:1]),
filter=Q( Value(0, output_field=IntegerField()),
issue_cycle__issue__state__group="backlog", )
issue_cycle__issue__archived_at__isnull=True, )
issue_cycle__issue__is_draft=False, .annotate(
), total_issues=Coalesce(
distinct=True, Subquery(total_issues[:1]),
Value(0, output_field=IntegerField()),
) )
) )
.annotate( .annotate(
@ -193,19 +230,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
) )
def list(self, request, slug, project_id): def list(self, request, slug, project_id):
queryset = ( queryset = self.get_queryset().filter(archived_at__isnull=True)
self.get_queryset()
.filter(archived_at__isnull=True)
.annotate(
total_issues=Count(
"issue_cycle",
filter=Q(
issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False,
),
)
)
)
cycle_view = request.GET.get("cycle_view", "all") cycle_view = request.GET.get("cycle_view", "all")
# Update the order by # Update the order by
@ -407,6 +432,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
# meta fields # meta fields
"is_favorite", "is_favorite",
"cancelled_issues", "cancelled_issues",
"total_issues",
"completed_issues", "completed_issues",
"started_issues", "started_issues",
"unstarted_issues", "unstarted_issues",
@ -482,6 +508,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
"progress_snapshot", "progress_snapshot",
# meta fields # meta fields
"is_favorite", "is_favorite",
"total_issues",
"cancelled_issues", "cancelled_issues",
"completed_issues", "completed_issues",
"started_issues", "started_issues",
@ -495,32 +522,11 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
def retrieve(self, request, slug, project_id, pk): def retrieve(self, request, slug, project_id, pk):
queryset = ( queryset = (
self.get_queryset() self.get_queryset().filter(archived_at__isnull=True).filter(pk=pk)
.filter(archived_at__isnull=True)
.filter(pk=pk)
.annotate(
total_issues=Count(
"issue_cycle",
filter=Q(
issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False,
),
)
)
) )
data = ( data = (
self.get_queryset() self.get_queryset()
.filter(pk=pk) .filter(pk=pk)
.annotate(
total_issues=Issue.issue_objects.filter(
project_id=self.kwargs.get("project_id"),
parent__isnull=True,
issue_cycle__cycle_id=pk,
)
.order_by()
.annotate(count=Func(F("id"), function="Count"))
.values("count")
)
.annotate( .annotate(
sub_issues=Issue.issue_objects.filter( sub_issues=Issue.issue_objects.filter(
project_id=self.kwargs.get("project_id"), project_id=self.kwargs.get("project_id"),

148
apiserver/plane/app/views/module/base.py
View File

@ -3,7 +3,17 @@ import json
# Django Imports # Django Imports
from django.utils import timezone from django.utils import timezone
from django.db.models import Prefetch, F, OuterRef, Exists, Count, Q, Func from django.db.models import (
Prefetch,
F,
OuterRef,
Exists,
Count,
Q,
Func,
Subquery,
IntegerField,
)
from django.contrib.postgres.aggregates import ArrayAgg from django.contrib.postgres.aggregates import ArrayAgg
from django.contrib.postgres.fields import ArrayField from django.contrib.postgres.fields import ArrayField
from django.db.models import Value, UUIDField from django.db.models import Value, UUIDField
@ -61,6 +71,59 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
project_id=self.kwargs.get("project_id"), project_id=self.kwargs.get("project_id"),
workspace__slug=self.kwargs.get("slug"), workspace__slug=self.kwargs.get("slug"),
) )
cancelled_issues = (
Issue.issue_objects.filter(
state__group="cancelled",
issue_module__module_id=OuterRef("pk"),
)
.values("issue_module__module_id")
.annotate(cnt=Count("pk"))
.values("cnt")
)
completed_issues = (
Issue.issue_objects.filter(
state__group="completed",
issue_module__module_id=OuterRef("pk"),
)
.values("issue_module__module_id")
.annotate(cnt=Count("pk"))
.values("cnt")
)
started_issues = (
Issue.issue_objects.filter(
state__group="started",
issue_module__module_id=OuterRef("pk"),
)
.values("issue_module__module_id")
.annotate(cnt=Count("pk"))
.values("cnt")
)
unstarted_issues = (
Issue.issue_objects.filter(
state__group="unstarted",
issue_module__module_id=OuterRef("pk"),
)
.values("issue_module__module_id")
.annotate(cnt=Count("pk"))
.values("cnt")
)
backlog_issues = (
Issue.issue_objects.filter(
state__group="backlog",
issue_module__module_id=OuterRef("pk"),
)
.values("issue_module__module_id")
.annotate(cnt=Count("pk"))
.values("cnt")
)
total_issues = (
Issue.issue_objects.filter(
issue_module__module_id=OuterRef("pk"),
)
.values("issue_module__module_id")
.annotate(cnt=Count("pk"))
.values("cnt")
)
return ( return (
super() super()
.get_queryset() .get_queryset()
@ -80,68 +143,39 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
) )
) )
.annotate( .annotate(
total_issues=Count( completed_issues=Coalesce(
"issue_module", Subquery(completed_issues[:1]),
filter=Q( Value(0, output_field=IntegerField()),
issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False,
),
distinct=True,
),
)
.annotate(
completed_issues=Count(
"issue_module__issue__state__group",
filter=Q(
issue_module__issue__state__group="completed",
issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False,
),
distinct=True,
) )
) )
.annotate( .annotate(
cancelled_issues=Count( cancelled_issues=Coalesce(
"issue_module__issue__state__group", Subquery(cancelled_issues[:1]),
filter=Q( Value(0, output_field=IntegerField()),
issue_module__issue__state__group="cancelled",
issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False,
),
distinct=True,
) )
) )
.annotate( .annotate(
started_issues=Count( started_issues=Coalesce(
"issue_module__issue__state__group", Subquery(started_issues[:1]),
filter=Q( Value(0, output_field=IntegerField()),
issue_module__issue__state__group="started",
issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False,
),
distinct=True,
) )
) )
.annotate( .annotate(
unstarted_issues=Count( unstarted_issues=Coalesce(
"issue_module__issue__state__group", Subquery(unstarted_issues[:1]),
filter=Q( Value(0, output_field=IntegerField()),
issue_module__issue__state__group="unstarted",
issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False,
),
distinct=True,
) )
) )
.annotate( .annotate(
backlog_issues=Count( backlog_issues=Coalesce(
"issue_module__issue__state__group", Subquery(backlog_issues[:1]),
filter=Q( Value(0, output_field=IntegerField()),
issue_module__issue__state__group="backlog", )
issue_module__issue__archived_at__isnull=True, )
issue_module__issue__is_draft=False, .annotate(
), total_issues=Coalesce(
distinct=True, Subquery(total_issues[:1]),
Value(0, output_field=IntegerField()),
) )
) )
.annotate( .annotate(
@ -191,6 +225,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
"is_favorite", "is_favorite",
"cancelled_issues", "cancelled_issues",
"completed_issues", "completed_issues",
"total_issues",
"started_issues", "started_issues",
"unstarted_issues", "unstarted_issues",
"backlog_issues", "backlog_issues",
@ -246,16 +281,6 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
self.get_queryset() self.get_queryset()
.filter(archived_at__isnull=True) .filter(archived_at__isnull=True)
.filter(pk=pk) .filter(pk=pk)
.annotate(
total_issues=Issue.issue_objects.filter(
project_id=self.kwargs.get("project_id"),
parent__isnull=True,
issue_module__module_id=pk,
)
.order_by()
.annotate(count=Func(F("id"), function="Count"))
.values("count")
)
.annotate( .annotate(
sub_issues=Issue.issue_objects.filter( sub_issues=Issue.issue_objects.filter(
project_id=self.kwargs.get("project_id"), project_id=self.kwargs.get("project_id"),
@ -418,6 +443,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
"cancelled_issues", "cancelled_issues",
"completed_issues", "completed_issues",
"started_issues", "started_issues",
"total_issues",
"unstarted_issues", "unstarted_issues",
"backlog_issues", "backlog_issues",
"created_at", "created_at",