chore: bug fixes and improvement

apiserver/plane/app/serializers/issue.py

@@ -30,6 +30,8 @@
     CommentReaction,
     IssueVote,
     IssueRelation,
+    State,
+    Project,
 )
 
 
@@ -69,19 +71,16 @@ class Meta:
 ##TODO: Find a better way to write this serializer
 ## Find a better approach to save manytomany?
 class IssueCreateSerializer(BaseSerializer):
-    state_detail = StateSerializer(read_only=True, source="state")
-    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
-    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
-
-    assignees = serializers.ListField(
-        child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
+    # ids
+    state_id = serializers.PrimaryKeyRelatedField(source="state", queryset=State.objects.all(), required=False, allow_null=True)
+    parent_id = serializers.PrimaryKeyRelatedField(source='parent', queryset=Issue.objects.all(), required=False, allow_null=True)
+    label_ids = serializers.ListField(
+        child=serializers.PrimaryKeyRelatedField(queryset=Label.objects.all()),
         write_only=True,
         required=False,
     )
-
-    labels = serializers.ListField(
-        child=serializers.PrimaryKeyRelatedField(queryset=Label.objects.all()),
+    assignee_ids = serializers.ListField(
+        child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
         write_only=True,
         required=False,
     )
@@ -100,8 +99,10 @@ class Meta:
 
     def to_representation(self, instance):
         data = super().to_representation(instance)
-        data['assignees'] = [str(assignee.id) for assignee in instance.assignees.all()]
-        data['labels'] = [str(label.id) for label in instance.labels.all()]
+        assignee_ids = self.initial_data.get('assignee_ids')
+        data['assignee_ids'] = assignee_ids if assignee_ids else []
+        label_ids = self.initial_data.get('label_ids')
+        data['label_ids'] = label_ids if label_ids else []
         return data
 
     def validate(self, data):
@@ -114,8 +115,8 @@ def validate(self, data):
         return data
 
     def create(self, validated_data):
-        assignees = validated_data.pop("assignees", None)
-        labels = validated_data.pop("labels", None)
+        assignees = validated_data.pop("assignee_ids", None)
+        labels = validated_data.pop("label_ids", None)
 
         project_id = self.context["project_id"]
         workspace_id = self.context["workspace_id"]
@@ -173,8 +174,8 @@ def create(self, validated_data):
         return issue
 
     def update(self, instance, validated_data):
-        assignees = validated_data.pop("assignees", None)
-        labels = validated_data.pop("labels", None)
+        assignees = validated_data.pop("assignee_ids", None)
+        labels = validated_data.pop("labels_ids", None)
 
         # Related models
         project_id = instance.project_id
@@ -544,7 +545,7 @@ class IssueSerializer(DynamicBaseSerializer):
     attachment_count = serializers.IntegerField(read_only=True)
     link_count = serializers.IntegerField(read_only=True)
 
-    # is
+    # is_subscribed
     is_subscribed = serializers.BooleanField(read_only=True)
 
     class Meta:

apiserver/plane/app/views/base.py

@@ -99,6 +99,7 @@ def handle_exception(self, exc):
             response = super().handle_exception(exc)
             return response
         except Exception as e:
+            print(e) if settings.DEBUG else print("Server Error")
             if isinstance(e, IntegrityError):
                 return Response(
                     {"error": "The payload is not valid"},
@@ -124,8 +125,7 @@ def handle_exception(self, exc):
                     {"error": f"key {e} does not exist"},
                     status=status.HTTP_400_BAD_REQUEST,
                 )
-
-            print(e) if settings.DEBUG else print("Server Error")
+
             capture_exception(e)
             return Response({"error": "Something went wrong please try again later"}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 

apiserver/plane/app/views/cycle.py

@@ -31,6 +31,7 @@
     CycleSerializer,
     CycleIssueSerializer,
     CycleFavoriteSerializer,
+    IssueSerializer,
     IssueStateSerializer,
     CycleWriteSerializer,
     CycleUserPropertiesSerializer,
@@ -46,9 +47,9 @@
     IssueAttachment,
     Label,
     CycleUserProperties,
+    IssueSubscriber,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
-from plane.utils.grouper import group_results
 from plane.utils.issue_filters import issue_filters
 from plane.utils.analytics_plot import burndown_plot
 
@@ -322,6 +323,8 @@ def create(self, request, slug, project_id):
                     project_id=project_id,
                     owned_by=request.user,
                 )
+                cycle = self.get_queryset().filter(pk=serializer.data["id"]).first()
+                serializer = CycleSerializer(cycle)
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
         else:
@@ -548,6 +551,8 @@ def list(self, request, slug, project_id, cycle_id):
             .prefetch_related("labels")
             .order_by(order_by)
             .filter(**filters)
+            .annotate(cycle_id=F("issue_cycle__cycle_id"))
+            .annotate(module_id=F("issue_module__module_id"))
             .annotate(
                 link_count=IssueLink.objects.filter(issue=OuterRef("id"))
                 .order_by()
@@ -560,8 +565,15 @@ def list(self, request, slug, project_id, cycle_id):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
+            .annotate(
+                is_subscribed=Exists(
+                    IssueSubscriber.objects.filter(
+                        subscriber=self.request.user, issue_id=OuterRef("id")
+                    )
+                )
+            )
         )
-        serializer = IssueStateSerializer(
+        serializer = IssueSerializer(
             issues, many=True, fields=fields if fields else None
         )
         return Response(serializer.data, status=status.HTTP_200_OK)
@@ -652,8 +664,10 @@ def create(self, request, slug, project_id, cycle_id):
         )
 
         # Return all Cycle Issues
+        issues = self.get_queryset().values_list("issue_id", flat=True)
+
         return Response(
-            CycleIssueSerializer(self.get_queryset(), many=True).data,
+            IssueSerializer(Issue.objects.filter(pk__in=issues), many=True).data,
             status=status.HTTP_200_OK,
         )
 

apiserver/plane/app/views/issue.py

@@ -34,11 +34,11 @@
 # Module imports
 from . import BaseViewSet, BaseAPIView, WebhookMixin
 from plane.app.serializers import (
-    IssueCreateSerializer,
     IssueActivitySerializer,
     IssueCommentSerializer,
     IssuePropertySerializer,
     IssueSerializer,
+    IssueCreateSerializer,
     LabelSerializer,
     IssueFlatSerializer,
     IssueLinkSerializer,
@@ -110,12 +110,7 @@ def get_serializer_class(self):
 
     def get_queryset(self):
         return (
-            Issue.issue_objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
+            Issue.issue_objects
             .filter(project_id=self.kwargs.get("project_id"))
             .filter(workspace__slug=self.kwargs.get("slug"))
             .select_related("project")
@@ -143,13 +138,11 @@ def get_queryset(self):
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
-            )
-            .annotate(
-                is_subscribed=Exists(
-                    IssueSubscriber.objects.filter(
-                        subscriber=self.request.user, issue_id=OuterRef("id")
-                    )
-                )
+            ).annotate(
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
             )
         ).distinct()
 
@@ -251,16 +244,13 @@ def create(self, request, slug, project_id):
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
             )
+            issue = self.get_queryset().filter(pk=serializer.data["id"]).first()
+            serializer = IssueSerializer(issue)
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def retrieve(self, request, slug, project_id, pk=None):
-        issue = Issue.issue_objects.annotate(
-            sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
-            .order_by()
-            .annotate(count=Func(F("id"), function="Count"))
-            .values("count")
-        ).get(workspace__slug=slug, project_id=project_id, pk=pk)
+        issue = self.get_queryset().filter(pk=pk).first()
         return Response(
             IssueSerializer(issue, fields=self.fields, expand=self.expand).data,
             status=status.HTTP_200_OK,
@@ -284,7 +274,8 @@ def partial_update(self, request, slug, project_id, pk=None):
                 current_instance=current_instance,
                 epoch=int(timezone.now().timestamp()),
             )
-            return Response(serializer.data, status=status.HTTP_200_OK)
+            issue = self.get_queryset().filter(pk=pk).first()
+            return Response(IssueSerializer(issue).data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def destroy(self, request, slug, project_id, pk=None):
@@ -719,13 +710,6 @@ def get(self, request, slug, project_id, issue_id):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                is_subscribed=Exists(
-                    IssueSubscriber.objects.filter(
-                        subscriber=self.request.user, issue_id=OuterRef("id")
-                    )
-                )
-            )
             .prefetch_related(
                 Prefetch(
                     "issue_reactions",
@@ -1080,7 +1064,7 @@ def list(self, request, slug, project_id):
             else issue_queryset.filter(parent__isnull=True)
         )
 
-        issues = IssueLiteSerializer(
+        issues = IssueSerializer(
             issue_queryset, many=True, fields=fields if fields else None
         ).data
         return Response(issues, status=status.HTTP_200_OK)
@@ -1163,16 +1147,6 @@ def list(self, request, slug, project_id, issue_id):
                 project_id=project_id,
                 is_active=True,
             )
-            .annotate(
-                is_subscribed=Exists(
-                    IssueSubscriber.objects.filter(
-                        workspace__slug=slug,
-                        project_id=project_id,
-                        issue_id=issue_id,
-                        subscriber=OuterRef("member"),
-                    )
-                )
-            )
             .select_related("member")
         )
         serializer = ProjectMemberLiteSerializer(members, many=True)
@@ -1613,7 +1587,7 @@ def list(self, request, slug, project_id):
         else:
             issue_queryset = issue_queryset.order_by(order_by_param)
 
-        issues = IssueLiteSerializer(
+        issues = IssueSerializer(
             issue_queryset, many=True, fields=fields if fields else None
         ).data
         return Response(issues, status=status.HTTP_200_OK)

apiserver/plane/app/views/module.py

@@ -20,7 +20,7 @@
     ModuleIssueSerializer,
     ModuleLinkSerializer,
     ModuleFavoriteSerializer,
-    IssueStateSerializer,
+    IssueSerializer,
     ModuleUserPropertiesSerializer,
 )
 from plane.app.permissions import ProjectEntityPermission, ProjectLitePermission
@@ -33,6 +33,7 @@
     ModuleFavorite,
     IssueLink,
     IssueAttachment,
+    IssueSubscriber,
     ModuleUserProperties,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
@@ -353,6 +354,8 @@ def list(self, request, slug, project_id, module_id):
             .prefetch_related("labels")
             .order_by(order_by)
             .filter(**filters)
+            .annotate(cycle_id=F("issue_cycle__cycle_id"))
+            .annotate(module_id=F("issue_module__module_id"))
             .annotate(
                 link_count=IssueLink.objects.filter(issue=OuterRef("id"))
                 .order_by()
@@ -365,8 +368,15 @@ def list(self, request, slug, project_id, module_id):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
+            .annotate(
+                is_subscribed=Exists(
+                    IssueSubscriber.objects.filter(
+                        subscriber=self.request.user, issue_id=OuterRef("id")
+                    )
+                )
+            )
         )
-        serializer = IssueStateSerializer(
+        serializer = IssueSerializer(
             issues, many=True, fields=fields if fields else None
         )
         return Response(serializer.data, status=status.HTTP_200_OK)
@@ -447,8 +457,10 @@ def create(self, request, slug, project_id, module_id):
             epoch=int(timezone.now().timestamp()),
         )
 
+        issues = self.get_queryset().values_list("issue_id", flat=True)
+
         return Response(
-            ModuleIssueSerializer(self.get_queryset(), many=True).data,
+            IssueSerializer(Issue.objects.filter(pk__in=issues), many=True).data,
             status=status.HTTP_200_OK,
         )
 

apiserver/plane/app/views/view.py

@@ -24,7 +24,7 @@
 from plane.app.serializers import (
     GlobalViewSerializer,
     IssueViewSerializer,
-    IssueLiteSerializer,
+    IssueSerializer,
     IssueViewFavoriteSerializer,
 )
 from plane.app.permissions import (
@@ -42,6 +42,7 @@
     IssueReaction,
     IssueLink,
     IssueAttachment,
+    IssueSubscriber,
 )
 from plane.utils.issue_filters import issue_filters
 from plane.utils.grouper import group_results
@@ -127,6 +128,19 @@ def list(self, request, slug):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
+            .annotate(
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                is_subscribed=Exists(
+                    IssueSubscriber.objects.filter(
+                        subscriber=self.request.user, issue_id=OuterRef("id")
+                    )
+                )
+            )
         )
 
         # Priority Ordering
@@ -185,7 +199,7 @@ def list(self, request, slug):
         else:
             issue_queryset = issue_queryset.order_by(order_by_param)
 
-        serializer = IssueLiteSerializer(
+        serializer = IssueSerializer(
             issue_queryset, many=True, fields=fields if fields else None
         )
         return Response(serializer.data, status=status.HTTP_200_OK)