diff --git a/apps/api/plane/app/views/analytic/project_analytics.py b/apps/api/plane/app/views/analytic/project_analytics.py index 064e556a2cd..f93a05f22ad 100644 --- a/apps/api/plane/app/views/analytic/project_analytics.py +++ b/apps/api/plane/app/views/analytic/project_analytics.py @@ -193,7 +193,7 @@ def work_item_completion_chart(self, project_id, cycle_id=None, module_id=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() + cycle = Cycle.objects.filter(id=cycle_id, workspace__slug=self._workspace_slug).first() if cycle and cycle.start_date: start_date = cycle.start_date.date() end_date = cycle.end_date.date() @@ -205,7 +205,7 @@ def work_item_completion_chart(self, project_id, cycle_id=None, module_id=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() + module = Module.objects.filter(id=module_id, workspace__slug=self._workspace_slug).first() if module and module.start_date: start_date = module.start_date end_date = module.target_date