From 3d7d3c8af1127b0bdd5a18615d05dbf811572147 Mon Sep 17 00:00:00 2001
From: Bavisetti Narayan <72156168+NarayanBavisetti@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:30:44 +0530
Subject: [PATCH] [WEB-2631] chore: changed the cascading logic for soft delete
 (#5829)

* chore: changed the cascading logic for soft delete

* chore: changed the delete key

* chore: added the key on delete in project base model
---
 apiserver/plane/app/views/workspace/draft.py | 2 +-
 apiserver/plane/bgtasks/deletion_task.py     | 4 ++--
 apiserver/plane/db/models/project.py         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apiserver/plane/app/views/workspace/draft.py b/apiserver/plane/app/views/workspace/draft.py
index d81dd5a50..cec9296f7 100644
--- a/apiserver/plane/app/views/workspace/draft.py
+++ b/apiserver/plane/app/views/workspace/draft.py
@@ -279,7 +279,7 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
                         {
                             "updated_cycle_issues": None,
                             "created_cycle_issues": serializers.serialize(
-                                "json", created_records
+                                "json", [created_records]
                             ),
                         }
                     ),
diff --git a/apiserver/plane/bgtasks/deletion_task.py b/apiserver/plane/bgtasks/deletion_task.py
index 35d72812d..b0b2a6eb2 100644
--- a/apiserver/plane/bgtasks/deletion_task.py
+++ b/apiserver/plane/bgtasks/deletion_task.py
@@ -21,8 +21,8 @@ def soft_delete_related_objects(
             try:
                 # Check if the field has CASCADE on delete
                 if (
-                    hasattr(field.remote_field, "on_delete")
-                    and field.remote_field.on_delete == models.CASCADE
+                    not hasattr(field.remote_field, "on_delete")
+                    or field.remote_field.on_delete == models.CASCADE
                 ):
                     if field.one_to_many:
                         related_objects = getattr(instance, field.name).all()
diff --git a/apiserver/plane/db/models/project.py b/apiserver/plane/db/models/project.py
index f970b121c..a44c84bc4 100644
--- a/apiserver/plane/db/models/project.py
+++ b/apiserver/plane/db/models/project.py
@@ -181,7 +181,7 @@ class ProjectBaseModel(BaseModel):
         Project, on_delete=models.CASCADE, related_name="project_%(class)s"
     )
     workspace = models.ForeignKey(
-        "db.Workspace", models.CASCADE, related_name="workspace_%(class)s"
+        "db.Workspace", on_delete=models.CASCADE, related_name="workspace_%(class)s"
     )
 
     class Meta: