From 7b804efbe2c7657cb16f9945cc984e8b7f557e55 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 29 Aug 2024 15:18:03 +0200
Subject: [PATCH] feat(event): simplify dispatching task updated event from
 only a task id

(cherry picked from commit 5a0d1f1dc6430f80788ae4cfacbe7da58f704841)
---
 pkg/models/label_task.go    | 12 +-----------
 pkg/models/task_position.go | 13 +------------
 pkg/models/tasks.go         | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/pkg/models/label_task.go b/pkg/models/label_task.go
index 3ff141f87..d179582bf 100644
--- a/pkg/models/label_task.go
+++ b/pkg/models/label_task.go
@@ -22,7 +22,6 @@ import (
 	"time"
 
 	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/events"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
@@ -100,16 +99,7 @@ func (lt *LabelTask) Create(s *xorm.Session, auth web.Auth) (err error) {
 		return err
 	}
 
-	t, err := GetTaskByIDSimple(s, lt.TaskID)
-	if err != nil {
-		return err
-	}
-
-	doer, _ := user.GetFromAuth(auth)
-	err = events.Dispatch(&TaskUpdatedEvent{
-		Task: &t,
-		Doer: doer,
-	})
+	err = triggerTaskUpdatedEventForTaskID(s, auth, lt.TaskID)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/models/task_position.go b/pkg/models/task_position.go
index 9a68ceeea..2db26fb49 100644
--- a/pkg/models/task_position.go
+++ b/pkg/models/task_position.go
@@ -20,8 +20,6 @@ import (
 	"math"
 
 	"code.vikunja.io/api/pkg/events"
-	"code.vikunja.io/api/pkg/user"
-
 	"code.vikunja.io/web"
 	"xorm.io/xorm"
 )
@@ -110,16 +108,7 @@ func (tp *TaskPosition) Update(s *xorm.Session, a web.Auth) (err error) {
 		return RecalculateTaskPositions(s, view, a)
 	}
 
-	task, err := GetTaskByIDSimple(s, tp.TaskID)
-	if err != nil {
-		return
-	}
-
-	doer, _ := user.GetFromAuth(a)
-	return events.Dispatch(&TaskUpdatedEvent{
-		Task: &task,
-		Doer: doer,
-	})
+	return triggerTaskUpdatedEventForTaskID(s, a, tp.TaskID)
 }
 
 func RecalculateTaskPositions(s *xorm.Session, view *ProjectView, a web.Auth) (err error) {
diff --git a/pkg/models/tasks.go b/pkg/models/tasks.go
index 0735a3dbb..94d23ed71 100644
--- a/pkg/models/tasks.go
+++ b/pkg/models/tasks.go
@@ -1580,3 +1580,17 @@ func (t *Task) ReadOne(s *xorm.Session, a web.Auth) (err error) {
 
 	return
 }
+
+func triggerTaskUpdatedEventForTaskID(s *xorm.Session, auth web.Auth, taskID int64) error {
+	t, err := GetTaskByIDSimple(s, taskID)
+	if err != nil {
+		return err
+	}
+
+	doer, _ := user.GetFromAuth(auth)
+	err = events.Dispatch(&TaskUpdatedEvent{
+		Task: &t,
+		Doer: doer,
+	})
+	return err
+}