Merge branch 'stage-release' of https://github.com/makeplane/plane into feat/issue_view

apiserver/plane/api/serializers/issue.py

@@ -37,6 +37,7 @@ class IssueFlatSerializer(BaseSerializer):
             "priority",
             "start_date",
             "target_date",
+            "sequence_id",
         ]
 
 

apiserver/plane/api/urls.py

@@ -52,7 +52,6 @@ from plane.api.views import (
     AddMemberToProjectEndpoint,
     ProjectJoinEndpoint,
     BulkDeleteIssuesEndpoint,
-    BulkAssignIssuesToCycleEndpoint,
     ProjectUserViewsEndpoint,
     ModuleViewSet,
     ModuleIssueViewSet,
@@ -444,11 +443,6 @@ urlpatterns = [
         ),
         name="project-cycle",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/bulk-assign-issues/",
-        BulkAssignIssuesToCycleEndpoint.as_view(),
-        name="bulk-assign-cycle-issues",
-    ),
     ## End Cycles
     # Issue
     path(

apiserver/plane/api/views/__init__.py

@@ -38,7 +38,7 @@ from .workspace import (
 from .state import StateViewSet
 from .shortcut import ShortCutViewSet
 from .view import ViewViewSet
-from .cycle import CycleViewSet, CycleIssueViewSet, BulkAssignIssuesToCycleEndpoint
+from .cycle import CycleViewSet, CycleIssueViewSet
 from .asset import FileAssetEndpoint
 from .issue import (
     IssueViewSet,

apiserver/plane/api/views/cycle.py

@@ -1,9 +1,10 @@
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
+from sentry_sdk import capture_exception
 
 # Module imports
-from . import BaseViewSet, BaseAPIView
+from . import BaseViewSet
 from plane.api.serializers import CycleSerializer, CycleIssueSerializer
 from plane.api.permissions import ProjectEntityPermission
 from plane.db.models import Cycle, CycleIssue, Issue
@@ -66,26 +67,27 @@ class CycleIssueViewSet(BaseViewSet):
             .distinct()
         )
 
-
-class BulkAssignIssuesToCycleEndpoint(BaseAPIView):
-
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def post(self, request, slug, project_id, cycle_id):
+    def create(self, request, slug, project_id, cycle_id):
         try:
 
-            issue_ids = request.data.get("issue_ids")
+            issues = request.data.get("issue", [])
+
+            if not len(issues):
+                return Response(
+                    {"error": "Issues are required"}, status=status.HTTP_400_BAD_REQUEST
+                )
 
             cycle = Cycle.objects.get(
                 workspace__slug=slug, project_id=project_id, pk=cycle_id
             )
 
             issues = Issue.objects.filter(
-                pk__in=issue_ids, workspace__slug=slug, project_id=project_id
+                pk__in=issues, workspace__slug=slug, project_id=project_id
             )
 
+            # Delete old records in order to maintain the database integrity
+            CycleIssue.objects.filter(issue_id__in=issues).delete()
+
             CycleIssue.objects.bulk_create(
                 [
                     CycleIssue(
@@ -107,3 +109,9 @@ class BulkAssignIssuesToCycleEndpoint(BaseAPIView):
             return Response(
                 {"error": "Cycle not found"}, status=status.HTTP_404_NOT_FOUND
             )
+        except Exception as e:
+            capture_exception(e)
+            return Response(
+                {"error": "Something went wrong please try again later"},
+                status=status.HTTP_200_OK,
+            )

apiserver/plane/api/views/module.py

@@ -5,6 +5,7 @@ from django.db.models import Prefetch
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
+from sentry_sdk import capture_exception
 
 # Module imports
 from . import BaseViewSet
@@ -71,6 +72,13 @@ class ModuleViewSet(BaseViewSet):
                     {"name": "The module name is already taken"},
                     status=status.HTTP_410_GONE,
                 )
+        except Exception as e:
+            capture_exception(e)
+            return Response(
+                {"error": "Something went wrong please try again later"},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            )
+  
 
 
 class ModuleIssueViewSet(BaseViewSet):
@@ -107,3 +115,40 @@ class ModuleIssueViewSet(BaseViewSet):
             .select_related("issue")
             .distinct()
         )
+
+    def create(self, request, slug, project_id, module_id):
+        try:
+            issues = request.data.get("issues", [])
+            if not len(issues):
+                return Response(
+                    {"error": "Issues are required"}, status=status.HTTP_400_BAD_REQUEST
+                )
+            module = Module.objects.get(
+                workspace__slug=slug, project_id=project_id, pk=module_id
+            )
+            ModuleIssue.objects.bulk_create(
+                [
+                    ModuleIssue(
+                        module=module,
+                        issue_id=issue,
+                        project_id=project_id,
+                        workspace=module.workspace,
+                        created_by=request.user,
+                        updated_by=request.user,
+                    )
+                    for issue in issues
+                ],
+                batch_size=10,
+                ignore_conflicts=True,
+            )
+            return Response({"message": "Success"}, status=status.HTTP_200_OK)
+        except Module.DoesNotExist:
+            return Response(
+                {"error": "Module Does not exists"}, status=status.HTTP_400_BAD_REQUEST
+            )
+        except Exception as e:
+            capture_exception(e)
+            return Response(
+                {"error": "Something went wrong please try again later"},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            )

apiserver/plane/api/views/people.py

@@ -52,7 +52,6 @@ class PeopleEndpoint(BaseAPIView):
 class UserEndpoint(BaseViewSet):
     serializer_class = UserSerializer
     model = User
-    serializers = {}
 
     def get_object(self):
         return self.request.user

apiserver/plane/api/views/project.py

@@ -632,7 +632,7 @@ class ProjectMemberUserEndpoint(BaseAPIView):
         try:
 
             project_member = ProjectMember.objects.get(
-                project=project_id, workpsace__slug=slug, member=request.user
+                project_id=project_id, workspace__slug=slug, member=request.user
             )
             serializer = ProjectMemberSerializer(project_member)
 

apiserver/plane/db/migrations/0012_user_my_issues_prop.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.14 on 2022-12-20 09:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0011_auto_20221216_0259'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='my_issues_prop',
+            field=models.JSONField(null=True),
+        ),
+    ]

apiserver/plane/db/models/user.py

@@ -66,6 +66,7 @@ class User(AbstractBaseUser, PermissionsMixin):
     last_login_uagent = models.TextField(blank=True)
     token_updated_at = models.DateTimeField(null=True)
     last_workspace_id = models.UUIDField(null=True)
+    my_issues_prop = models.JSONField(null=True)
 
     USERNAME_FIELD = "email"