From a20f6ac8155729a3bf60e4a264ddb39953a9c138 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 28 Jan 2024 12:23:25 +0100
Subject: [PATCH] fix(task): delete the task after all related attributes to
 prevent task not found errors

---
 pkg/models/tasks.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/models/tasks.go b/pkg/models/tasks.go
index 0af84a480..c87d88b68 100644
--- a/pkg/models/tasks.go
+++ b/pkg/models/tasks.go
@@ -1432,10 +1432,6 @@ func (t *Task) Delete(s *xorm.Session, a web.Auth) (err error) {
 		return err
 	}
 
-	if _, err = s.ID(t.ID).Delete(Task{}); err != nil {
-		return err
-	}
-
 	// Delete assignees
 	if _, err = s.Where("task_id = ?", t.ID).Delete(TaskAssginee{}); err != nil {
 		return err
@@ -1484,6 +1480,12 @@ func (t *Task) Delete(s *xorm.Session, a web.Auth) (err error) {
 		return
 	}
 
+	// Actually delete the task
+	_, err = s.ID(t.ID).Delete(Task{})
+	if err != nil {
+		return err
+	}
+
 	doer, _ := user.GetFromAuth(a)
 	err = events.Dispatch(&TaskDeletedEvent{
 		Task: fullTask,