From 4f20fa80f33c22e2c204e925bde962133e901f6c Mon Sep 17 00:00:00 2001 From: NarayanBavisetti Date: Thu, 17 Oct 2024 13:29:06 +0530 Subject: [PATCH] chore: added draft cycle and module in draft issue --- apiserver/plane/app/views/workspace/draft.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/apiserver/plane/app/views/workspace/draft.py b/apiserver/plane/app/views/workspace/draft.py index 51ed876de8..e54dde553b 100644 --- a/apiserver/plane/app/views/workspace/draft.py +++ b/apiserver/plane/app/views/workspace/draft.py @@ -260,9 +260,9 @@ def create_draft_to_issue(self, request, slug, draft_id): origin=request.META.get("HTTP_ORIGIN"), ) - if draft_issue.cycle_id: + if request.data.get("cycle_id", None): created_records = CycleIssue.objects.create( - cycle_id=draft_issue.cycle_id, + cycle_id=request.data.get("cycle_id", None), issue_id=serializer.data.get("id", None), project_id=draft_issue.project_id, workspace_id=draft_issue.workspace_id, @@ -289,7 +289,7 @@ def create_draft_to_issue(self, request, slug, draft_id): origin=request.META.get("HTTP_ORIGIN"), ) - if draft_issue.module_ids: + if request.data.get("module_ids", []): # bulk create the module ModuleIssue.objects.bulk_create( [ @@ -301,11 +301,11 @@ def create_draft_to_issue(self, request, slug, draft_id): created_by_id=draft_issue.created_by_id, updated_by_id=draft_issue.updated_by_id, ) - for module in draft_issue.module_ids + for module in request.data.get("module_ids", []) ], batch_size=10, ) - # Bulk Update the activity + # Update the activity _ = [ issue_activity.delay( type="module.activity.created", @@ -318,7 +318,7 @@ def create_draft_to_issue(self, request, slug, draft_id): notification=True, origin=request.META.get("HTTP_ORIGIN"), ) - for module in draft_issue.module_ids + for module in request.data.get("module_ids", []) ] # Update file assets @@ -332,12 +332,6 @@ def create_draft_to_issue(self, request, slug, draft_id): # delete the draft issue draft_issue.delete() - # delete the draft issue module - DraftIssueModule.objects.filter(draft_issue=draft_issue).delete() - - # delete the draft issue cycle - DraftIssueCycle.objects.filter(draft_issue=draft_issue).delete() - return Response(serializer.data, status=status.HTTP_201_CREATED) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)