From a4f095fb5934f347799b18905628557f19289ff4 Mon Sep 17 00:00:00 2001
From: pablohashescobar <nikhilschacko@gmail.com>
Date: Fri, 3 Feb 2023 19:03:27 +0530
Subject: [PATCH] refactor: update cycle and module issue create

---
 apiserver/plane/api/views/cycle.py  | 56 ++++++++++++++++++-----------
 apiserver/plane/api/views/module.py | 51 ++++++++++++++++----------
 2 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/apiserver/plane/api/views/cycle.py b/apiserver/plane/api/views/cycle.py
index d1b291d9a..c8c3b7720 100644
--- a/apiserver/plane/api/views/cycle.py
+++ b/apiserver/plane/api/views/cycle.py
@@ -14,7 +14,6 @@ from plane.db.models import Cycle, CycleIssue, Issue
 
 
 class CycleViewSet(BaseViewSet):
-
     serializer_class = CycleSerializer
     model = Cycle
     permission_classes = [
@@ -41,7 +40,6 @@ class CycleViewSet(BaseViewSet):
 
 
 class CycleIssueViewSet(BaseViewSet):
-
     serializer_class = CycleIssueSerializer
     model = CycleIssue
 
@@ -79,7 +77,6 @@ class CycleIssueViewSet(BaseViewSet):
 
     def create(self, request, slug, project_id, cycle_id):
         try:
-
             issues = request.data.get("issues", [])
 
             if not len(issues):
@@ -91,29 +88,48 @@ class CycleIssueViewSet(BaseViewSet):
                 workspace__slug=slug, project_id=project_id, pk=cycle_id
             )
 
-            issues = Issue.objects.filter(
-                pk__in=issues, workspace__slug=slug, project_id=project_id
-            )
+            # Get all CycleIssues already created
+            cycle_issues = list(CycleIssue.objects.filter(issue_id__in=issues))
 
-            # Delete old records in order to maintain the database integrity
-            CycleIssue.objects.filter(issue_id__in=issues).delete()
+            records_to_update = []
+            record_to_create = []
+
+            for issue in issues:
+                cycle_issue = [
+                    cycle_issue
+                    for cycle_issue in cycle_issues
+                    if cycle_issue.issue_id in issues
+                ]
+                if len(cycle_issue):
+                    cycle_issue[0].cycle_id = cycle_id
+                    records_to_update.append(cycle_issue[0])
+                else:
+                    record_to_create.append(
+                        CycleIssue(
+                            project_id=project_id,
+                            workspace=cycle.workspace,
+                            created_by=request.user,
+                            updated_by=request.user,
+                            cycle=cycle,
+                            issue_id=issue,
+                        )
+                    )
 
             CycleIssue.objects.bulk_create(
-                [
-                    CycleIssue(
-                        project_id=project_id,
-                        workspace=cycle.workspace,
-                        created_by=request.user,
-                        updated_by=request.user,
-                        cycle=cycle,
-                        issue=issue,
-                    )
-                    for issue in issues
-                ],
+                record_to_create,
                 batch_size=10,
                 ignore_conflicts=True,
             )
-            return Response({"message": "Success"}, status=status.HTTP_200_OK)
+            CycleIssue.objects.bulk_update(
+                records_to_update,
+                ["cycle"],
+                batch_size=10,
+            )
+
+            # Return all Cycle Issues
+            return Response(
+                CycleIssueSerializer(self.get_queryset(), many=True).data, status=status.HTTP_200_OK
+            )
 
         except Cycle.DoesNotExist:
             return Response(
diff --git a/apiserver/plane/api/views/module.py b/apiserver/plane/api/views/module.py
index 9955ded76..31d7c7b1c 100644
--- a/apiserver/plane/api/views/module.py
+++ b/apiserver/plane/api/views/module.py
@@ -25,7 +25,6 @@ from plane.db.models import (
 
 
 class ModuleViewSet(BaseViewSet):
-
     model = Module
     permission_classes = [
         ProjectEntityPermission,
@@ -95,7 +94,6 @@ class ModuleViewSet(BaseViewSet):
 
 
 class ModuleIssueViewSet(BaseViewSet):
-
     serializer_class = ModuleIssueSerializer
     model = ModuleIssue
 
@@ -148,28 +146,45 @@ class ModuleIssueViewSet(BaseViewSet):
                 workspace__slug=slug, project_id=project_id, pk=module_id
             )
 
-            issues = Issue.objects.filter(
-                pk__in=issues, workspace__slug=slug, project_id=project_id
-            )
+            module_issues = list(ModuleIssue.objects.filter(issue_id__in=issues))
 
-            # Delete old records in order to maintain the database integrity
-            ModuleIssue.objects.filter(issue_id__in=issues).delete()
+            records_to_update = []
+            record_to_create = []
+
+            for issue in issues:
+                module_issue = [
+                    module_issue
+                    for module_issue in module_issues
+                    if module_issue.issue_id in issues
+                ]
+
+                if len(module_issue):
+                    module_issue[0].module_id = module_id
+                    records_to_update.append(module_issue[0])
+                else:
+                    record_to_create.append(
+                        ModuleIssue(
+                            module=module,
+                            issue=issue,
+                            project_id=project_id,
+                            workspace=module.workspace,
+                            created_by=request.user,
+                            updated_by=request.user,
+                        )
+                    )
 
             ModuleIssue.objects.bulk_create(
-                [
-                    ModuleIssue(
-                        module=module,
-                        issue=issue,
-                        project_id=project_id,
-                        workspace=module.workspace,
-                        created_by=request.user,
-                        updated_by=request.user,
-                    )
-                    for issue in issues
-                ],
+                record_to_create,
                 batch_size=10,
                 ignore_conflicts=True,
             )
+
+            ModuleIssue.objects.bulk_update(
+                records_to_update,
+                ["module"],
+                batch_size=10,
+            )
+
             return Response({"message": "Success"}, status=status.HTTP_200_OK)
         except Module.DoesNotExist:
             return Response(