π₯π₯π₯ 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
[WEB-4133] chore: optimised the analytics endpoints (#7105)
Bavisetti Narayan9812129ad3cb
diff --git a/apiserver/plane/app/urls/analytic.py b/apiserver/plane/app/urls/analytic.pyindex 0eebd3108b..3e4172771b 100644--- a/apiserver/plane/app/urls/analytic.py+++ b/apiserver/plane/app/urls/analytic.py@@ -11,6 +11,9 @@ from plane.app.views import (AdvanceAnalyticsChartEndpoint,DefaultAnalyticsEndpoint,ProjectStatsEndpoint,+ ProjectAdvanceAnalyticsEndpoint,+ ProjectAdvanceAnalyticsStatsEndpoint,+ ProjectAdvanceAnalyticsChartEndpoint,)@@ -67,4 +70,19 @@ urlpatterns = [AdvanceAnalyticsChartEndpoint.as_view(),name="advance-analytics-chart",),+ path(+ "workspaces/<str:slug>/projects/<uuid:project_id>/advance-analytics/",+ ProjectAdvanceAnalyticsEndpoint.as_view(),+ name="project-advance-analytics",+ ),+ path(+ "workspaces/<str:slug>/projects/<uuid:project_id>/advance-analytics-stats/",+ ProjectAdvanceAnalyticsStatsEndpoint.as_view(),+ name="project-advance-analytics-stats",+ ),+ path(+ "workspaces/<str:slug>/projects/<uuid:project_id>/advance-analytics-charts/",+ ProjectAdvanceAnalyticsChartEndpoint.as_view(),+ name="project-advance-analytics-chart",+ ),]diff --git a/apiserver/plane/app/views/__init__.py b/apiserver/plane/app/views/__init__.pyindex 2034c55487..98dcab84fd 100644--- a/apiserver/plane/app/views/__init__.py+++ b/apiserver/plane/app/views/__init__.py@@ -205,6 +205,12 @@ from .analytic.advance import (AdvanceAnalyticsChartEndpoint,)+from .analytic.project_analytics import (+ ProjectAdvanceAnalyticsEndpoint,+ ProjectAdvanceAnalyticsStatsEndpoint,+ ProjectAdvanceAnalyticsChartEndpoint,+)+from .notification.base import (NotificationViewSet,UnreadNotificationEndpoint,diff --git a/apiserver/plane/app/views/analytic/advance.py b/apiserver/plane/app/views/analytic/advance.pyindex c55f5566b1..a79ab98c58 100644--- a/apiserver/plane/app/views/analytic/advance.py+++ b/apiserver/plane/app/views/analytic/advance.py@@ -5,7 +5,6 @@ from django.db.models import QuerySet, Q, Countfrom django.http import HttpRequestfrom django.db.models.functions import TruncMonthfrom django.utils import timezone-from datetime import timedeltafrom plane.app.views.base import BaseAPIViewfrom plane.app.permissions import ROLE, allow_permissionfrom plane.db.models import (@@ -17,12 +16,7 @@ from plane.db.models import (IssueView,ProjectPage,Workspace,- CycleIssue,- ModuleIssue,)-from django.db import models-from django.db.models import F, Case, When, Value-from django.db.models.functions import Concatfrom plane.utils.build_chart import build_analytics_chartfrom plane.utils.date_utils import (get_analytics_filters,@@ -118,25 +112,8 @@ class AdvanceAnalyticsEndpoint(AdvanceAnalyticsBaseView):),}- def get_work_items_stats(- self, cycle_id=None, module_id=None- ) -> Dict[str, Dict[str, int]]:- """- Returns work item stats for the workspace, or filtered by cycle_id or module_id if provided.- """- base_queryset = None- if cycle_id is not None:- cycle_issues = CycleIssue.objects.filter(- **self.filters["base_filters"], cycle_id=cycle_id- ).values_list("issue_id", flat=True)- base_queryset = Issue.issue_objects.filter(id__in=cycle_issues)- elif module_id is not None:- module_issues = ModuleIssue.objects.filter(- **self.filters["base_filters"], module_id=module_id- ).values_list("issue_id", flat=True)- base_queryset = Issue.issue_objects.filter(id__in=module_issues)- else:- base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])+ def get_work_items_stats(self) -> Dict[str, Dict[str, int]]:+ base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])return {"total_work_items": self.get_filtered_counts(base_queryset),@@ -165,11 +142,8 @@ class AdvanceAnalyticsEndpoint(AdvanceAnalyticsBaseView):status=status.HTTP_200_OK,)elif tab == "work-items":- # Optionally accept cycle_id or module_id as query params- cycle_id = request.GET.get("cycle_id", None)- module_id = request.GET.get("module_id", None)return Response(- self.get_work_items_stats(cycle_id=cycle_id, module_id=module_id),+ self.get_work_items_stats(),status=status.HTTP_200_OK,)return Response({"message": "Invalid tab"}, status=status.HTTP_400_BAD_REQUEST)@@ -188,8 +162,7 @@ class AdvanceAnalyticsStatsEndpoint(AdvanceAnalyticsBaseView):)return (- base_queryset.values("project_id", "project__name")- .annotate(+ base_queryset.values("project_id", "project__name").annotate(cancelled_work_items=Count("id", filter=Q(state__group="cancelled")),completed_work_items=Count("id", filter=Q(state__group="completed")),backlog_work_items=Count("id", filter=Q(state__group="backlog")),@@ -199,84 +172,19 @@ class AdvanceAnalyticsStatsEndpoint(AdvanceAnalyticsBaseView):.order_by("project_id"))- def get_work_items_stats(- self, cycle_id=None, module_id=None, peek_view=False- ) -> Dict[str, Dict[str, int]]:- base_queryset = None- if cycle_id is not None:- cycle_issues = CycleIssue.objects.filter(- **self.filters["base_filters"], cycle_id=cycle_id- ).values_list("issue_id", flat=True)- base_queryset = Issue.issue_objects.filter(id__in=cycle_issues)- elif module_id is not None:- module_issues = ModuleIssue.objects.filter(- **self.filters["base_filters"], module_id=module_id- ).values_list("issue_id", flat=True)- base_queryset = Issue.issue_objects.filter(id__in=module_issues)- elif peek_view:- base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])- else:- base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])- return (- base_queryset.values("project_id", "project__name")- .annotate(- cancelled_work_items=Count(- "id", filter=Q(state__group="cancelled")- ),- completed_work_items=Count(- "id", filter=Q(state__group="completed")- ),- backlog_work_items=Count("id", filter=Q(state__group="backlog")),- un_started_work_items=Count(- "id", filter=Q(state__group="unstarted")- ),- started_work_items=Count("id", filter=Q(state__group="started")),- )- .order_by("project_id")- )-+ def get_work_items_stats(self) -> Dict[str, Dict[str, int]]:+ base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])return (- base_queryset.annotate(display_name=F("assignees__display_name"))- .annotate(assignee_id=F("assignees__id"))- .annotate(avatar=F("assignees__avatar"))+ base_queryset+ .values("project_id", "project__name").annotate(- avatar_url=Case(- # If `avatar_asset` exists, use it to generate the asset URL- When(- assignees__avatar_asset__isnull=False,- then=Concat(- Value("/api/assets/v2/static/"),- "assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field- Value("/"),- ),- ),- # If `avatar_asset` is None, fall back to using `avatar` field directly- When(- assignees__avatar_asset__isnull=True, then="assignees__avatar"- ),- default=Value(None),- output_field=models.CharField(),- )- )- .values("display_name", "assignee_id", "avatar_url")- .annotate(- cancelled_work_items=Count(- "id", filter=Q(state__group="cancelled"), distinct=True- ),- completed_work_items=Count(- "id", filter=Q(state__group="completed"), distinct=True- ),- backlog_work_items=Count(- "id", filter=Q(state__group="backlog"), distinct=True- ),- un_started_work_items=Count(- "id", filter=Q(state__group="unstarted"), distinct=True- ),- started_work_items=Count(- "id", filter=Q(state__group="started"), distinct=True- ),+ cancelled_work_items=Count("id", filter=Q(state__group="cancelled")),+ completed_work_items=Count("id", filter=Q(state__group="completed")),+ backlog_work_items=Count("id", filter=Q(state__group="backlog")),+ un_started_work_items=Count("id", filter=Q(state__group="unstarted")),+ started_work_items=Count("id", filter=Q(state__group="started")),)- .order_by("display_name")+ .order_by("project_id"))@allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")@@ -285,14 +193,8 @@ class AdvanceAnalyticsStatsEndpoint(AdvanceAnalyticsBaseView):type = request.GET.get("type", "work-items")if type == "work-items":- # Optionally accept cycle_id or module_id as query params- cycle_id = request.GET.get("cycle_id", None)- module_id = request.GET.get("module_id", None)- peek_view = request.GET.get("peek_view", False)return Response(- self.get_work_items_stats(- cycle_id=cycle_id, module_id=module_id, peek_view=peek_view- ),+ self.get_work_items_stats(),status=status.HTTP_200_OK,)@@ -352,9 +254,7 @@ class AdvanceAnalyticsChartEndpoint(AdvanceAnalyticsBaseView):for key, value in data.items()]- def work_item_completion_chart(- self, cycle_id=None, module_id=None, peek_view=False- ) -> Dict[str, Any]:+ def work_item_completion_chart(self) -> Dict[str, Any]:# Get the base querysetqueryset = (Issue.issue_objects.filter(**self.filters["base_filters"])@@ -364,143 +264,62 @@ class AdvanceAnalyticsChartEndpoint(AdvanceAnalyticsBaseView):))- if cycle_id is not None and peek_view:- cycle_issues = CycleIssue.objects.filter(- **self.filters["base_filters"], cycle_id=cycle_id- ).values_list("issue_id", flat=True)- cycle = Cycle.objects.filter(id=cycle_id).first()- if cycle and cycle.start_date:- start_date = cycle.start_date.date()- end_date = cycle.end_date.date()- else:- return {"data": [], "schema": {}}- queryset = cycle_issues- elif module_id is not None and peek_view:- module_issues = ModuleIssue.objects.filter(- **self.filters["base_filters"], module_id=module_id- ).values_list("issue_id", flat=True)- module = Module.objects.filter(id=module_id).first()- if module and module.start_date:- start_date = module.start_date- end_date = module.target_date- else:- return {"data": [], "schema": {}}- queryset = module_issues- elif peek_view:- project_ids_str = self.request.GET.get("project_ids")- if project_ids_str:- project_id_list = [- pid.strip() for pid in project_ids_str.split(",") if pid.strip()- ]- else:- project_id_list = []- return {"data": [], "schema": {}}- project_id = project_id_list[0]- project = Project.objects.filter(id=project_id).first()- if project.created_at:- start_date = project.created_at.date().replace(day=1)- else:- return {"data": [], "schema": {}}- else:- workspace = Workspace.objects.get(slug=self._workspace_slug)- start_date = workspace.created_at.date().replace(day=1)-- if cycle_id or module_id:- # Get daily stats with optimized query- daily_stats = (- queryset.values("created_at__date")- .annotate(- created_count=Count("id"),- completed_count=Count(- "id", filter=Q(issue__state__group="completed")- ),- )- .order_by("created_at__date")- )-- # Create a dictionary of existing stats with summed counts- stats_dict = {- stat["created_at__date"].strftime("%Y-%m-%d"): {- "created_count": stat["created_count"],- "completed_count": stat["completed_count"],- }- for stat in daily_stats- }+ workspace = Workspace.objects.get(slug=self._workspace_slug)+ start_date = workspace.created_at.date().replace(day=1)- # Generate data for all days in the range- data = []- current_date = start_date- while current_date <= end_date:- date_str = current_date.strftime("%Y-%m-%d")- stats = stats_dict.get(- date_str, {"created_count": 0, "completed_count": 0}- )- data.append(- {- "key": date_str,- "name": date_str,- "count": stats["created_count"] + stats["completed_count"],- "completed_issues": stats["completed_count"],- "created_issues": stats["created_count"],- }- )- current_date += timedelta(days=1)- else:- # Apply date range filter if available- if self.filters["chart_period_range"]:- start_date, end_date = self.filters["chart_period_range"]- queryset = queryset.filter(- created_at__date__gte=start_date, created_at__date__lte=end_date- )+ # Apply date range filter if available+ if self.filters["chart_period_range"]:+ start_date, end_date = self.filters["chart_period_range"]+ queryset = queryset.filter(+ created_at__date__gte=start_date, created_at__date__lte=end_date+ )- # Annotate by month and count- monthly_stats = (- queryset.annotate(month=TruncMonth("created_at"))- .values("month")- .annotate(- created_count=Count("id"),- completed_count=Count("id", filter=Q(state__group="completed")),- )- .order_by("month")+ # Annotate by month and count+ monthly_stats = (+ queryset.annotate(month=TruncMonth("created_at"))+ .values("month")+ .annotate(+ created_count=Count("id"),+ completed_count=Count("id", filter=Q(state__group="completed")),)+ .order_by("month")+ )- # Create dictionary of month -> counts- stats_dict = {- stat["month"].strftime("%Y-%m-%d"): {- "created_count": stat["created_count"],- "completed_count": stat["completed_count"],- }- for stat in monthly_stats+ # Create dictionary of month -> counts+ stats_dict = {+ stat["month"].strftime("%Y-%m-%d"): {+ "created_count": stat["created_count"],+ "completed_count": stat["completed_count"],}+ for stat in monthly_stats+ }- # Generate monthly data (ensure months with 0 count are included)- data = []- # include the current date at the end- end_date = timezone.now().date()- last_month = end_date.replace(day=1)- current_month = start_date-- while current_month <= last_month:- date_str = current_month.strftime("%Y-%m-%d")- stats = stats_dict.get(- date_str, {"created_count": 0, "completed_count": 0}- )- data.append(- {- "key": date_str,- "name": date_str,- "count": stats["created_count"],- "completed_issues": stats["completed_count"],- "created_issues": stats["created_count"],- }+ # Generate monthly data (ensure months with 0 count are included)+ data = []+ # include the current date at the end+ end_date = timezone.now().date()+ last_month = end_date.replace(day=1)+ current_month = start_date++ while current_month <= last_month:+ date_str = current_month.strftime("%Y-%m-%d")+ stats = stats_dict.get(date_str, {"created_count": 0, "completed_count": 0})+ data.append(+ {+ "key": date_str,+ "name": date_str,+ "count": stats["created_count"],+ "completed_issues": stats["completed_count"],+ "created_issues": stats["created_count"],+ }+ )+ # Move to next month+ if current_month.month == 12:+ current_month = current_month.replace(+ year=current_month.year + 1, month=1)- # Move to next month- if current_month.month == 12:- current_month = current_month.replace(- year=current_month.year + 1, month=1- )- else:- current_month = current_month.replace(month=current_month.month + 1)+ else:+ current_month = current_month.replace(month=current_month.month + 1)schema = {"completed_issues": "completed_issues",@@ -515,8 +334,6 @@ class AdvanceAnalyticsChartEndpoint(AdvanceAnalyticsBaseView):type = request.GET.get("type", "projects")group_by = request.GET.get("group_by", None)x_axis = request.GET.get("x_axis", "PRIORITY")- cycle_id = request.GET.get("cycle_id", None)- module_id = request.GET.get("module_id", None)if type == "projects":return Response(self.project_chart(), status=status.HTTP_200_OK)@@ -530,19 +347,6 @@ class AdvanceAnalyticsChartEndpoint(AdvanceAnalyticsBaseView):))- # Apply cycle/module filters if present- if cycle_id is not None:- cycle_issues = CycleIssue.objects.filter(- **self.filters["base_filters"], cycle_id=cycle_id- ).values_list("issue_id", flat=True)- queryset = queryset.filter(id__in=cycle_issues)-- elif module_id is not None:- module_issues = ModuleIssue.objects.filter(- **self.filters["base_filters"], module_id=module_id- ).values_list("issue_id", flat=True)- queryset = queryset.filter(id__in=module_issues)-# Apply date range filter if availableif self.filters["chart_period_range"]:start_date, end_date = self.filters["chart_period_range"]@@ -556,14 +360,8 @@ class AdvanceAnalyticsChartEndpoint(AdvanceAnalyticsBaseView):)elif type == "work-items":- # Optionally accept cycle_id or module_id as query params- cycle_id = request.GET.get("cycle_id", None)- module_id = request.GET.get("module_id", None)- peek_view = request.GET.get("peek_view", False)return Response(- self.work_item_completion_chart(- cycle_id=cycle_id, module_id=module_id, peek_view=peek_view- ),+ self.work_item_completion_chart(),status=status.HTTP_200_OK,)diff --git a/apiserver/plane/app/views/analytic/project_analytics.py b/apiserver/plane/app/views/analytic/project_analytics.pynew file mode 100644index 0000000000..655f8e9898--- /dev/null+++ b/apiserver/plane/app/views/analytic/project_analytics.py@@ -0,0 +1,421 @@+from rest_framework.response import Response+from rest_framework import status+from typing import Dict, Any+from django.db.models import QuerySet, Q, Count+from django.http import HttpRequest+from django.db.models.functions import TruncMonth+from django.utils import timezone+from datetime import timedelta+from plane.app.views.base import BaseAPIView+from plane.app.permissions import ROLE, allow_permission+from plane.db.models import (+ Project,+ Issue,+ Cycle,+ Module,+ CycleIssue,+ ModuleIssue,+)+from django.db import models+from django.db.models import F, Case, When, Value+from django.db.models.functions import Concat+from plane.utils.build_chart import build_analytics_chart+from plane.utils.date_utils import (+ get_analytics_filters,+)+++class ProjectAdvanceAnalyticsBaseView(BaseAPIView):+ def initialize_workspace(self, slug: str, type: str) -> None:+ self._workspace_slug = slug+ self.filters = get_analytics_filters(+ slug=slug,+ type=type,+ user=self.request.user,+ date_filter=self.request.GET.get("date_filter", None),+ project_ids=self.request.GET.get("project_ids", None),+ )+++class ProjectAdvanceAnalyticsEndpoint(ProjectAdvanceAnalyticsBaseView):+ def get_filtered_counts(self, queryset: QuerySet) -> Dict[str, int]:+ def get_filtered_count() -> int:+ if self.filters["analytics_date_range"]:+ return queryset.filter(+ created_at__gte=self.filters["analytics_date_range"]["current"][+ "gte"+ ],+ created_at__lte=self.filters["analytics_date_range"]["current"][+ "lte"+ ],+ ).count()+ return queryset.count()++ return {+ "count": get_filtered_count(),+ }++ def get_work_items_stats(+ self, project_id, cycle_id=None, module_id=None+ ) -> Dict[str, Dict[str, int]]:+ """+ Returns work item stats for the workspace, or filtered by cycle_id or module_id if provided.+ """+ base_queryset = None+ if cycle_id is not None:+ cycle_issues = CycleIssue.objects.filter(+ **self.filters["base_filters"], cycle_id=cycle_id+ ).values_list("issue_id", flat=True)+ base_queryset = Issue.issue_objects.filter(id__in=cycle_issues)+ elif module_id is not None:+ module_issues = ModuleIssue.objects.filter(+ **self.filters["base_filters"], module_id=module_id+ ).values_list("issue_id", flat=True)+ base_queryset = Issue.issue_objects.filter(id__in=module_issues)+ else:+ base_queryset = Issue.issue_objects.filter(+ **self.filters["base_filters"], project_id=project_id+ )++ return {+ "total_work_items": self.get_filtered_counts(base_queryset),+ "started_work_items": self.get_filtered_counts(+ base_queryset.filter(state__group="started")+ ),+ "backlog_work_items": self.get_filtered_counts(+ base_queryset.filter(state__group="backlog")+ ),+ "un_started_work_items": self.get_filtered_counts(+ base_queryset.filter(state__group="unstarted")+ ),+ "completed_work_items": self.get_filtered_counts(+ base_queryset.filter(state__group="completed")+ ),+ }++ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])+ def get(self, request: HttpRequest, slug: str, project_id: str) -> Response:+ self.initialize_workspace(slug, type="analytics")++ # Optionally accept cycle_id or module_id as query params+ cycle_id = request.GET.get("cycle_id", None)+ module_id = request.GET.get("module_id", None)+ return Response(+ self.get_work_items_stats(+ cycle_id=cycle_id, module_id=module_id, project_id=project_id+ ),+ status=status.HTTP_200_OK,+ )+++class ProjectAdvanceAnalyticsStatsEndpoint(ProjectAdvanceAnalyticsBaseView):+ def get_project_issues_stats(self) -> QuerySet:+ # Get the base queryset with workspace and project filters+ base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])++ # Apply date range filter if available+ if self.filters["chart_period_range"]:+ start_date, end_date = self.filters["chart_period_range"]+ base_queryset = base_queryset.filter(+ created_at__date__gte=start_date, created_at__date__lte=end_date+ )++ return (+ base_queryset.values("project_id", "project__name")+ .annotate(+ cancelled_work_items=Count("id", filter=Q(state__group="cancelled")),+ completed_work_items=Count("id", filter=Q(state__group="completed")),+ backlog_work_items=Count("id", filter=Q(state__group="backlog")),+ un_started_work_items=Count("id", filter=Q(state__group="unstarted")),+ started_work_items=Count("id", filter=Q(state__group="started")),+ )+ .order_by("project_id")+ )++ def get_work_items_stats(+ self, project_id, cycle_id=None, module_id=None+ ) -> Dict[str, Dict[str, int]]:+ base_queryset = None+ if cycle_id is not None:+ cycle_issues = CycleIssue.objects.filter(+ **self.filters["base_filters"], cycle_id=cycle_id+ ).values_list("issue_id", flat=True)+ base_queryset = Issue.issue_objects.filter(id__in=cycle_issues)+ elif module_id is not None:+ module_issues = ModuleIssue.objects.filter(+ **self.filters["base_filters"], module_id=module_id+ ).values_list("issue_id", flat=True)+ base_queryset = Issue.issue_objects.filter(id__in=module_issues)+ else:+ base_queryset = Issue.issue_objects.filter(+ **self.filters["base_filters"], project_id=project_id+ )+ return (+ base_queryset.annotate(display_name=F("assignees__display_name"))+ .annotate(assignee_id=F("assignees__id"))+ .annotate(avatar=F("assignees__avatar"))+ .annotate(+ avatar_url=Case(+ # If `avatar_asset` exists, use it to generate the asset URL+ When(+ assignees__avatar_asset__isnull=False,+ then=Concat(+ Value("/api/assets/v2/static/"),+ "assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field+ Value("/"),+ ),+ ),+ # If `avatar_asset` is None, fall back to using `avatar` field directly+ When(+ assignees__avatar_asset__isnull=True, then="assignees__avatar"+ ),+ default=Value(None),+ output_field=models.CharField(),+ )+ )+ .values("display_name", "assignee_id", "avatar_url")+ .annotate(+ cancelled_work_items=Count(+ "id", filter=Q(state__group="cancelled"), distinct=True+ ),+ completed_work_items=Count(+ "id", filter=Q(state__group="completed"), distinct=True+ ),+ backlog_work_items=Count(+ "id", filter=Q(state__group="backlog"), distinct=True+ ),+ un_started_work_items=Count(+ "id", filter=Q(state__group="unstarted"), distinct=True+ ),+ started_work_items=Count(+ "id", filter=Q(state__group="started"), distinct=True+ ),+ )+ .order_by("display_name")+ )++ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])+ def get(self, request: HttpRequest, slug: str, project_id: str) -> Response:+ self.initialize_workspace(slug, type="chart")+ type = request.GET.get("type", "work-items")++ if type == "work-items":+ # Optionally accept cycle_id or module_id as query params+ cycle_id = request.GET.get("cycle_id", None)+ module_id = request.GET.get("module_id", None)+ return Response(+ self.get_work_items_stats(+ project_id=project_id, cycle_id=cycle_id, module_id=module_id+ ),+ status=status.HTTP_200_OK,+ )++ return Response({"message": "Invalid type"}, status=status.HTTP_400_BAD_REQUEST)+++class ProjectAdvanceAnalyticsChartEndpoint(ProjectAdvanceAnalyticsBaseView):+ def work_item_completion_chart(+ self, project_id, cycle_id=None, module_id=None+ ) -> Dict[str, Any]:+ # Get the base queryset+ queryset = (+ Issue.issue_objects.filter(**self.filters["base_filters"])+ .filter(project_id=project_id)+ .select_related("workspace", "state", "parent")+ .prefetch_related(+ "assignees", "labels", "issue_module__module", "issue_cycle__cycle"+ )+ )++ if cycle_id is not None:+ cycle_issues = CycleIssue.objects.filter(+ **self.filters["base_filters"], cycle_id=cycle_id+ ).values_list("issue_id", flat=True)+ cycle = Cycle.objects.filter(id=cycle_id).first()+ if cycle and cycle.start_date:+ start_date = cycle.start_date.date()+ end_date = cycle.end_date.date()+ else:+ return {"data": [], "schema": {}}+ queryset = cycle_issues++ elif module_id is not None:+ module_issues = ModuleIssue.objects.filter(+ **self.filters["base_filters"], module_id=module_id+ ).values_list("issue_id", flat=True)+ module = Module.objects.filter(id=module_id).first()+ if module and module.start_date:+ start_date = module.start_date+ end_date = module.target_date+ else:+ return {"data": [], "schema": {}}+ queryset = module_issues++ else:+ project = Project.objects.filter(id=project_id).first()+ if project.created_at:+ start_date = project.created_at.date().replace(day=1)+ else:+ return {"data": [], "schema": {}}++ if cycle_id or module_id:+ # Get daily stats with optimized query+ daily_stats = (+ queryset.values("created_at__date")+ .annotate(+ created_count=Count("id"),+ completed_count=Count(+ "id", filter=Q(issue__state__group="completed")+ ),+ )+ .order_by("created_at__date")+ )++ # Create a dictionary of existing stats with summed counts+ stats_dict = {+ stat["created_at__date"].strftime("%Y-%m-%d"): {+ "created_count": stat["created_count"],+ "completed_count": stat["completed_count"],+ }+ for stat in daily_stats+ }++ # Generate data for all days in the range+ data = []+ current_date = start_date+ while current_date <= end_date:+ date_str = current_date.strftime("%Y-%m-%d")+ stats = stats_dict.get(+ date_str, {"created_count": 0, "completed_count": 0}+ )+ data.append(+ {+ "key": date_str,+ "name": date_str,+ "count": stats["created_count"] + stats["completed_count"],+ "completed_issues": stats["completed_count"],+ "created_issues": stats["created_count"],+ }+ )+ current_date += timedelta(days=1)+ else:+ # Apply date range filter if available+ if self.filters["chart_period_range"]:+ start_date, end_date = self.filters["chart_period_range"]+ queryset = queryset.filter(+ created_at__date__gte=start_date, created_at__date__lte=end_date+ )++ # Annotate by month and count+ monthly_stats = (+ queryset.annotate(month=TruncMonth("created_at"))+ .values("month")+ .annotate(+ created_count=Count("id"),+ completed_count=Count("id", filter=Q(state__group="completed")),+ )+ .order_by("month")+ )++ # Create dictionary of month -> counts+ stats_dict = {+ stat["month"].strftime("%Y-%m-%d"): {+ "created_count": stat["created_count"],+ "completed_count": stat["completed_count"],+ }+ for stat in monthly_stats+ }++ # Generate monthly data (ensure months with 0 count are included)+ data = []+ # include the current date at the end+ end_date = timezone.now().date()+ last_month = end_date.replace(day=1)+ current_month = start_date++ while current_month <= last_month:+ date_str = current_month.strftime("%Y-%m-%d")+ stats = stats_dict.get(+ date_str, {"created_count": 0, "completed_count": 0}+ )+ data.append(+ {+ "key": date_str,+ "name": date_str,+ "count": stats["created_count"],+ "completed_issues": stats["completed_count"],+ "created_issues": stats["created_count"],+ }+ )+ # Move to next month+ if current_month.month == 12:+ current_month = current_month.replace(+ year=current_month.year + 1, month=1+ )+ else:+ current_month = current_month.replace(month=current_month.month + 1)++ schema = {+ "completed_issues": "completed_issues",+ "created_issues": "created_issues",+ }++ return {"data": data, "schema": schema}++ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])+ def get(self, request: HttpRequest, slug: str, project_id: str) -> Response:+ self.initialize_workspace(slug, type="chart")+ type = request.GET.get("type", "projects")+ group_by = request.GET.get("group_by", None)+ x_axis = request.GET.get("x_axis", "PRIORITY")+ cycle_id = request.GET.get("cycle_id", None)+ module_id = request.GET.get("module_id", None)++ if type == "custom-work-items":+ queryset = (+ Issue.issue_objects.filter(**self.filters["base_filters"])+ .filter(project_id=project_id)+ .select_related("workspace", "state", "parent")+ .prefetch_related(+ "assignees", "labels", "issue_module__module", "issue_cycle__cycle"+ )+ )++ # Apply cycle/module filters if present+ if cycle_id is not None:+ cycle_issues = CycleIssue.objects.filter(+ **self.filters["base_filters"], cycle_id=cycle_id+ ).values_list("issue_id", flat=True)+ queryset = queryset.filter(id__in=cycle_issues)++ elif module_id is not None:+ module_issues = ModuleIssue.objects.filter(+ **self.filters["base_filters"], module_id=module_id+ ).values_list("issue_id", flat=True)+ queryset = queryset.filter(id__in=module_issues)++ # Apply date range filter if available+ if self.filters["chart_period_range"]:+ start_date, end_date = self.filters["chart_period_range"]+ queryset = queryset.filter(+ created_at__date__gte=start_date, created_at__date__lte=end_date+ )++ return Response(+ build_analytics_chart(queryset, x_axis, group_by),+ status=status.HTTP_200_OK,+ )++ elif type == "work-items":+ # Optionally accept cycle_id or module_id as query params+ cycle_id = request.GET.get("cycle_id", None)+ module_id = request.GET.get("module_id", None)++ return Response(+ self.work_item_completion_chart(+ project_id=project_id, cycle_id=cycle_id, module_id=module_id+ ),+ status=status.HTTP_200_OK,+ )++ return Response({"message": "Invalid type"}, status=status.HTTP_400_BAD_REQUEST)diff --git a/web/core/components/analytics-v2/overview/project-insights.tsx b/web/core/components/analytics-v2/overview/project-insights.tsxindex 83054a885f..9c8f829a14 100644--- a/web/core/components/analytics-v2/overview/project-insights.tsx+++ b/web/core/components/analytics-v2/overview/project-insights.tsx@@ -39,8 +39,9 @@ const ProjectInsights = observer(() => {...(selectedProjects?.length > 0 && { project_ids: selectedProjects?.join(",") }),...(selectedCycle ? { cycle_id: selectedCycle } : {}),...(selectedModule ? { module_id: selectedModule } : {}),- ...(isPeekView ? { peek_view: true } : {}),- })+ },+ isPeekView+ ));return (diff --git a/web/core/components/analytics-v2/total-insights.tsx b/web/core/components/analytics-v2/total-insights.tsxindex 8a3ffe8b75..5fc8b2239e 100644--- a/web/core/components/analytics-v2/total-insights.tsx+++ b/web/core/components/analytics-v2/total-insights.tsx@@ -26,13 +26,17 @@ const TotalInsights: React.FC<{ analyticsType: TAnalyticsTabsV2Base; peekView?:const { data: totalInsightsData, isLoading } = useSWR(`total-insights-${analyticsType}-${selectedDuration}-${selectedProjects}-${selectedCycle}-${selectedModule}-${isPeekView}`,() =>- analyticsV2Service.getAdvanceAnalytics<IAnalyticsResponseV2>(workspaceSlug, analyticsType, {- // date_filter: selectedDuration,- ...(selectedProjects?.length > 0 ? { project_ids: selectedProjects.join(",") } : {}),- ...(selectedCycle ? { cycle_id: selectedCycle } : {}),- ...(selectedModule ? { module_id: selectedModule } : {}),- ...(isPeekView ? { peek_view: true } : {}),- })+ analyticsV2Service.getAdvanceAnalytics<IAnalyticsResponseV2>(+ workspaceSlug,+ analyticsType,+ {+ // date_filter: selectedDuration,+ ...(selectedProjects?.length > 0 ? { project_ids: selectedProjects.join(",") } : {}),+ ...(selectedCycle ? { cycle_id: selectedCycle } : {}),+ ...(selectedModule ? { module_id: selectedModule } : {}),+ },+ isPeekView+ ));return (<divdiff --git a/web/core/components/analytics-v2/work-items/created-vs-resolved.tsx b/web/core/components/analytics-v2/work-items/created-vs-resolved.tsxindex 873ac2ed77..46f3faf54e 100644--- a/web/core/components/analytics-v2/work-items/created-vs-resolved.tsx+++ b/web/core/components/analytics-v2/work-items/created-vs-resolved.tsx@@ -33,8 +33,9 @@ const CreatedVsResolved = observer(() => {...(selectedProjects?.length > 0 && { project_ids: selectedProjects?.join(",") }),...(selectedCycle ? { cycle_id: selectedCycle } : {}),...(selectedModule ? { module_id: selectedModule } : {}),- ...(isPeekView ? { peek_view: true } : {}),- })+ },+ isPeekView+ ));const parsedData: TChartData<string, string>[] = useMemo(() => {if (!createdVsResolvedData?.data) return [];diff --git a/web/core/components/analytics-v2/work-items/priority-chart.tsx b/web/core/components/analytics-v2/work-items/priority-chart.tsxindex 664824851e..c5b31bb168 100644--- a/web/core/components/analytics-v2/work-items/priority-chart.tsx+++ b/web/core/components/analytics-v2/work-items/priority-chart.tsx@@ -57,14 +57,18 @@ const PriorityChart = observer((props: Props) => {`customized-insights-chart-${workspaceSlug}-${selectedDuration}-${selectedProjects}-${selectedCycle}-${selectedModule}-${props.x_axis}-${props.y_axis}-${props.group_by}-${isPeekView}`,() =>- analyticsV2Service.getAdvanceAnalyticsCharts<TChart>(workspaceSlug, "custom-work-items", {- // date_filter: selectedDuration,- ...(selectedProjects?.length > 0 && { project_ids: selectedProjects?.join(",") }),- ...(selectedCycle ? { cycle_id: selectedCycle } : {}),- ...(selectedModule ? { module_id: selectedModule } : {}),- ...(isPeekView ? { peek_view: true } : {}),- ...props,- })+ analyticsV2Service.getAdvanceAnalyticsCharts<TChart>(+ workspaceSlug,+ "custom-work-items",+ {+ // date_filter: selectedDuration,+ ...(selectedProjects?.length > 0 && { project_ids: selectedProjects?.join(",") }),+ ...(selectedCycle ? { cycle_id: selectedCycle } : {}),+ ...(selectedModule ? { module_id: selectedModule } : {}),+ ...props,+ },+ isPeekView+ ));const parsedData = useMemo(() =>diff --git a/web/core/components/analytics-v2/work-items/workitems-insight-table.tsx b/web/core/components/analytics-v2/work-items/workitems-insight-table.tsxindex e428244925..1fd8343296 100644--- a/web/core/components/analytics-v2/work-items/workitems-insight-table.tsx+++ b/web/core/components/analytics-v2/work-items/workitems-insight-table.tsx@@ -31,13 +31,17 @@ const WorkItemsInsightTable = observer(() => {const { data: workItemsData, isLoading } = useSWR(`insights-table-work-items-${workspaceSlug}-${selectedDuration}-${selectedProjects}-${selectedCycle}-${selectedModule}-${isPeekView}`,() =>- analyticsV2Service.getAdvanceAnalyticsStats<WorkItemInsightColumns[]>(workspaceSlug, "work-items", {- // date_filter: selectedDuration,- ...(selectedProjects?.length > 0 ? { project_ids: selectedProjects.join(",") } : {}),- ...(selectedCycle ? { cycle_id: selectedCycle } : {}),- ...(selectedModule ? { module_id: selectedModule } : {}),- ...(isPeekView ? { peek_view: true } : {}),- })+ analyticsV2Service.getAdvanceAnalyticsStats<WorkItemInsightColumns[]>(+ workspaceSlug,+ "work-items",+ {+ // date_filter: selectedDuration,+ ...(selectedProjects?.length > 0 ? { project_ids: selectedProjects.join(",") } : {}),+ ...(selectedCycle ? { cycle_id: selectedCycle } : {}),+ ...(selectedModule ? { module_id: selectedModule } : {}),+ },+ isPeekView+ ));// derived valuesconst columnsLabels = useMemo(diff --git a/web/core/services/analytics-v2.service.ts b/web/core/services/analytics-v2.service.tsindex 87257cbc6b..05e1b78b72 100644--- a/web/core/services/analytics-v2.service.ts+++ b/web/core/services/analytics-v2.service.ts@@ -10,14 +10,18 @@ export class AnalyticsV2Service extends APIService {async getAdvanceAnalytics<T extends IAnalyticsResponseV2>(workspaceSlug: string,tab: TAnalyticsTabsV2Base,- params?: Record<string, any>+ params?: Record<string, any>,+ isPeekView?: boolean): Promise<T> {- return this.get(`/api/workspaces/${workspaceSlug}/advance-analytics/`, {- params: {- tab,- ...params,- },- })+ return this.get(+ this.processUrl<TAnalyticsTabsV2Base>("advance-analytics", workspaceSlug, tab, params, isPeekView),+ {+ params: {+ tab,+ ...params,+ },+ }+ ).then((res) => res?.data).catch((err) => {throw err?.response?.data;@@ -27,9 +31,17 @@ export class AnalyticsV2Service extends APIService {async getAdvanceAnalyticsStats<T>(workspaceSlug: string,tab: Exclude<TAnalyticsTabsV2Base, "overview">,- params?: Record<string, any>+ params?: Record<string, any>,+ isPeekView?: boolean): Promise<T> {- return this.get(`/api/workspaces/${workspaceSlug}/advance-analytics-stats/`, {+ const processedUrl = this.processUrl<Exclude<TAnalyticsTabsV2Base, "overview">>(+ "advance-analytics-stats",+ workspaceSlug,+ tab,+ params,+ isPeekView+ );+ return this.get(processedUrl, {params: {type: tab,...params,@@ -44,9 +56,17 @@ export class AnalyticsV2Service extends APIService {async getAdvanceAnalyticsCharts<T>(workspaceSlug: string,tab: TAnalyticsGraphsV2Base,- params?: Record<string, any>+ params?: Record<string, any>,+ isPeekView?: boolean): Promise<T> {- return this.get(`/api/workspaces/${workspaceSlug}/advance-analytics-charts/`, {+ const processedUrl = this.processUrl<TAnalyticsGraphsV2Base>(+ "advance-analytics-charts",+ workspaceSlug,+ tab,+ params,+ isPeekView+ );+ return this.get(processedUrl, {params: {type: tab,...params,@@ -57,4 +77,19 @@ export class AnalyticsV2Service extends APIService {throw err?.response?.data;});}++ processUrl<T extends string>(+ endpoint: string,+ workspaceSlug: string,+ tab: T,+ params?: Record<string, any>,+ isPeekView?: boolean+ ) {+ let processedUrl = `/api/workspaces/${workspaceSlug}`;+ if (isPeekView && tab === "work-items") {+ const projectId = params?.project_ids.split(",")[0];+ processedUrl += `/projects/${projectId}`;+ }+ return `${processedUrl}/${endpoint}`;+ }}