π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
fix: delete webhook for issues, issue_comments, projects (#6539)
shuaixra03a41ea5f55
diff --git a/apiserver/plane/api/views/project.py b/apiserver/plane/api/views/project.pyindex 824ca6b5e3..e98f35d573 100644--- a/apiserver/plane/api/views/project.py+++ b/apiserver/plane/api/views/project.py@@ -28,7 +28,7 @@ from plane.db.models import (Workspace,UserFavorite,)-from plane.bgtasks.webhook_task import model_activity+from plane.bgtasks.webhook_task import model_activity, webhook_activityfrom .base import BaseAPIView@@ -326,6 +326,19 @@ class ProjectAPIEndpoint(BaseAPIView):entity_type="project", entity_identifier=pk, project_id=pk).delete()project.delete()+ webhook_activity.delay(+ event="project",+ verb="deleted",+ field=None,+ old_value=None,+ new_value=None,+ actor_id=request.user.id,+ slug=slug,+ current_site=request.META.get("HTTP_ORIGIN"),+ event_id=project.id,+ old_identifier=None,+ new_identifier=None,+ )return Response(status=status.HTTP_204_NO_CONTENT)diff --git a/apiserver/plane/app/views/project/base.py b/apiserver/plane/app/views/project/base.pyindex 9123e6d87f..8988fc3ee4 100644--- a/apiserver/plane/app/views/project/base.py+++ b/apiserver/plane/app/views/project/base.py@@ -39,7 +39,7 @@ from plane.db.models import (WorkspaceMember,)from plane.utils.cache import cache_response-from plane.bgtasks.webhook_task import model_activity+from plane.bgtasks.webhook_task import model_activity, webhook_activityfrom plane.bgtasks.recent_visited_task import recent_visited_taskfrom plane.utils.exception_logger import log_exception@@ -462,7 +462,19 @@ class ProjectViewSet(BaseViewSet):):project = Project.objects.get(pk=pk)project.delete()-+ webhook_activity.delay(+ event="project",+ verb="deleted",+ field=None,+ old_value=None,+ new_value=None,+ actor_id=request.user.id,+ slug=slug,+ current_site=request.META.get("HTTP_ORIGIN"),+ event_id=project.id,+ old_identifier=None,+ new_identifier=None,+ )# Delete the project membersDeployBoard.objects.filter(project_id=pk, workspace__slug=slug).delete()diff --git a/apiserver/plane/bgtasks/issue_activities_task.py b/apiserver/plane/bgtasks/issue_activities_task.pyindex e0e2ea84e9..2113819797 100644--- a/apiserver/plane/bgtasks/issue_activities_task.py+++ b/apiserver/plane/bgtasks/issue_activities_task.py@@ -738,8 +738,10 @@ def delete_comment_activity(issue_activities,epoch,):+ requested_data = json.loads(requested_data) if requested_data is not None else Noneissue_activities.append(IssueActivity(+ issue_comment_id=requested_data.get("comment_id", None),issue_id=issue_id,project_id=project_id,workspace_id=workspace_id,diff --git a/apiserver/plane/bgtasks/webhook_task.py b/apiserver/plane/bgtasks/webhook_task.pyindex 141daf7962..c1ea01a4dc 100644--- a/apiserver/plane/bgtasks/webhook_task.py+++ b/apiserver/plane/bgtasks/webhook_task.py@@ -387,7 +387,11 @@ def webhook_activity(webhook=webhook.id,slug=slug,event=event,- event_data=get_model_data(event=event, event_id=event_id),+ event_data=(+ {"id": event_id}+ if verb == "deleted"+ else get_model_data(event=event, event_id=event_id)+ ),action=verb,current_site=current_site,activity={