From 4055b538b4b67568c1381f0dca359ac48ef5c4a8 Mon Sep 17 00:00:00 2001 From: pablohashescobar Date: Fri, 1 Sep 2023 09:38:48 +0530 Subject: [PATCH 1/2] chore: cycle endpoint to return display name as well in the assignee distribution --- apiserver/plane/api/views/cycle.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apiserver/plane/api/views/cycle.py b/apiserver/plane/api/views/cycle.py index a3d89fa8182..07d41e1d183 100644 --- a/apiserver/plane/api/views/cycle.py +++ b/apiserver/plane/api/views/cycle.py @@ -191,8 +191,7 @@ def list(self, request, slug, project_id): workspace__slug=slug, project_id=project_id, ) - .annotate(first_name=F("assignees__first_name")) - .annotate(last_name=F("assignees__last_name")) + .annotate(display_name=F("assignees__display_name")) .annotate(assignee_id=F("assignees__id")) .annotate(avatar=F("assignees__avatar")) .values("first_name", "last_name", "assignee_id", "avatar") From 6a2811c9b4ba2f84a53bc2d402bdf42e8685d46e Mon Sep 17 00:00:00 2001 From: pablohashescobar Date: Fri, 1 Sep 2023 10:01:36 +0530 Subject: [PATCH 2/2] fix: value error --- apiserver/plane/api/views/cycle.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apiserver/plane/api/views/cycle.py b/apiserver/plane/api/views/cycle.py index 07d41e1d183..3dca6c3126e 100644 --- a/apiserver/plane/api/views/cycle.py +++ b/apiserver/plane/api/views/cycle.py @@ -194,7 +194,7 @@ def list(self, request, slug, project_id): .annotate(display_name=F("assignees__display_name")) .annotate(assignee_id=F("assignees__id")) .annotate(avatar=F("assignees__avatar")) - .values("first_name", "last_name", "assignee_id", "avatar") + .values("display_name", "assignee_id", "avatar") .annotate(total_issues=Count("assignee_id")) .annotate( completed_issues=Count( @@ -208,7 +208,7 @@ def list(self, request, slug, project_id): filter=Q(completed_at__isnull=True), ) ) - .order_by("first_name", "last_name") + .order_by("display_name") ) label_distribution = (