From c49b0d61518165b8789922303e144d7eb0574288 Mon Sep 17 00:00:00 2001 From: pablohashescobar <118773738+pablohashescobar@users.noreply.github.com> Date: Wed, 17 May 2023 00:46:41 +0530 Subject: [PATCH] fix: issue assignee multiple values (#1056) * fix: issue assignee multiple values * chore: return first name and last name * dev: keys update and also send data when segmented --- apiserver/plane/api/views/analytic.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/apiserver/plane/api/views/analytic.py b/apiserver/plane/api/views/analytic.py index 1691f3af6..28ffceab7 100644 --- a/apiserver/plane/api/views/analytic.py +++ b/apiserver/plane/api/views/analytic.py @@ -76,17 +76,21 @@ class AnalyticsEndpoint(BaseAPIView): ) ) - assignee_avatars = {} - if x_axis in ["assignees__email"]: - assignee_avatars = Issue.objects.filter( - workspace__slug=slug, **filters - ).values("assignees__avatar") + assignee_details = {} + if x_axis in ["assignees__email"] or segment in ["assignees__email"]: + assignee_details = ( + Issue.objects.filter(workspace__slug=slug, **filters, assignees__avatar__isnull=False) + .order_by("assignees__id") + .distinct("assignees__id") + .values("assignees__avatar", "assignees__email", "assignees__first_name", "assignees__last_name") + ) + return Response( { "total": total_issues, "distribution": distribution, - "extras": {"colors": colors, "assignee_avatars": assignee_avatars}, + "extras": {"colors": colors, "assignee_details": assignee_details}, }, status=status.HTTP_200_OK, )