diff --git a/apiserver/plane/app/views/cycle.py b/apiserver/plane/app/views/cycle.py index 9a39b4585..7bf72783e 100644 --- a/apiserver/plane/app/views/cycle.py +++ b/apiserver/plane/app/views/cycle.py @@ -282,9 +282,8 @@ class CycleViewSet(WebhookMixin, BaseViewSet): return Response(data, status=status.HTTP_200_OK) - cycles = CycleSerializer(queryset, many=True, fields=fields if fields else None).data - cycle_dict = {str(cycle["id"]): cycle for cycle in cycles} - return Response(cycle_dict, status=status.HTTP_200_OK) + cycles = CycleSerializer(queryset, many=True).data + return Response(cycles, status=status.HTTP_200_OK) def create(self, request, slug, project_id): if ( diff --git a/apiserver/plane/app/views/module.py b/apiserver/plane/app/views/module.py index e2cc04bc0..8aef632e4 100644 --- a/apiserver/plane/app/views/module.py +++ b/apiserver/plane/app/views/module.py @@ -157,8 +157,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet): queryset = self.get_queryset() fields = [field for field in request.GET.get("fields", "").split(",") if field] modules = ModuleSerializer(queryset, many=True, fields=fields if fields else None).data - modules_dict = {str(module["id"]): module for module in modules} - return Response(modules_dict, status=status.HTTP_200_OK) + return Response(modules, status=status.HTTP_200_OK) def retrieve(self, request, slug, project_id, pk): queryset = self.get_queryset().get(pk=pk) diff --git a/apiserver/plane/app/views/page.py b/apiserver/plane/app/views/page.py index 497fa6bb1..482bdfbfe 100644 --- a/apiserver/plane/app/views/page.py +++ b/apiserver/plane/app/views/page.py @@ -157,10 +157,8 @@ class PageViewSet(BaseViewSet): def list(self, request, slug, project_id): queryset = self.get_queryset().filter(archived_at__isnull=True) - fields = [field for field in request.GET.get("fields", "").split(",") if field] - pages = PageSerializer(queryset, many=True, fields=fields if fields else None).data - pages_dict = {str(page["id"]): page for page in pages} - return Response(pages_dict, status=status.HTTP_200_OK) + pages = PageSerializer(queryset, many=True).data + return Response(pages, status=status.HTTP_200_OK) def archive(self, request, slug, project_id, page_id): page = Page.objects.get(pk=page_id, workspace__slug=slug, project_id=project_id) @@ -206,15 +204,13 @@ class PageViewSet(BaseViewSet): return Response(status=status.HTTP_204_NO_CONTENT) def archive_list(self, request, slug, project_id): - fields = [field for field in request.GET.get("fields", "").split(",") if field] pages = Page.objects.filter( project_id=project_id, workspace__slug=slug, ).filter(archived_at__isnull=False) - pages = PageSerializer(pages, many=True, fields=fields if fields else None).data - pages_dict = {str(page["id"]): page for page in pages} - return Response(pages_dict, status=status.HTTP_200_OK) + pages = PageSerializer(pages, many=True).data + return Response(pages, status=status.HTTP_200_OK) def destroy(self, request, slug, project_id, pk): diff --git a/apiserver/plane/app/views/project.py b/apiserver/plane/app/views/project.py index 7733e4b5c..aa98615fd 100644 --- a/apiserver/plane/app/views/project.py +++ b/apiserver/plane/app/views/project.py @@ -181,8 +181,7 @@ class ProjectViewSet(WebhookMixin, BaseViewSet): ).data, ) projects = ProjectListSerializer(projects, many=True, fields=fields if fields else None).data - project_dict = {str(project["id"]): project for project in projects} - return Response(project_dict, status=status.HTTP_200_OK) + return Response(projects, status=status.HTTP_200_OK) def create(self, request, slug): diff --git a/apiserver/plane/app/views/view.py b/apiserver/plane/app/views/view.py index 80809c2ad..3367a80f8 100644 --- a/apiserver/plane/app/views/view.py +++ b/apiserver/plane/app/views/view.py @@ -218,8 +218,7 @@ class IssueViewViewSet(BaseViewSet): queryset = self.get_queryset() fields = [field for field in request.GET.get("fields", "").split(",") if field] views = IssueViewSerializer(queryset, many=True, fields=fields if fields else None).data - views_dict = {str(view["id"]): view for view in views} - return Response(views_dict, status=status.HTTP_200_OK) + return Response(views, status=status.HTTP_200_OK) class IssueViewFavoriteViewSet(BaseViewSet):