Add session handling for bulk task and related entities

pkg/models/bulk_task.go

@@ -19,6 +19,7 @@ package models
 import (
 	"code.vikunja.io/web"
 	"github.com/imdario/mergo"
+	"xorm.io/xorm"
 )
 
 // BulkTask is the definition of a bulk update task
@@ -29,9 +30,9 @@ type BulkTask struct {
 	Task
 }
 
-func (bt *BulkTask) checkIfTasksAreOnTheSameList() (err error) {
+func (bt *BulkTask) checkIfTasksAreOnTheSameList(s *xorm.Session) (err error) {
 	// Get the tasks
-	err = bt.GetTasksByIDs()
+	err = bt.GetTasksByIDs(s)
 	if err != nil {
 		return err
 	}
@@ -52,16 +53,16 @@ func (bt *BulkTask) checkIfTasksAreOnTheSameList() (err error) {
 }
 
 // CanUpdate checks if a user is allowed to update a task
-func (bt *BulkTask) CanUpdate(a web.Auth) (bool, error) {
+func (bt *BulkTask) CanUpdate(s *xorm.Session, a web.Auth) (bool, error) {
 
-	err := bt.checkIfTasksAreOnTheSameList()
+	err := bt.checkIfTasksAreOnTheSameList(s)
 	if err != nil {
 		return false, err
 	}
 
 	// A user can update an task if he has write acces to its list
 	l := &List{ID: bt.Tasks[0].ListID}
-	return l.CanWrite(nil, a)
+	return l.CanWrite(s, a)
 }
 
 // Update updates a bunch of tasks at once
@@ -77,23 +78,14 @@ func (bt *BulkTask) CanUpdate(a web.Auth) (bool, error) {
 // @Failure 403 {object} web.HTTPError "The user does not have access to the task (aka its list)"
 // @Failure 500 {object} models.Message "Internal error"
 // @Router /tasks/bulk [post]
-func (bt *BulkTask) Update() (err error) {
-
-	sess := x.NewSession()
-	defer sess.Close()
-
-	err = sess.Begin()
-	if err != nil {
-		return
-	}
-
+func (bt *BulkTask) Update(s *xorm.Session) (err error) {
 	for _, oldtask := range bt.Tasks {
 
 		// When a repeating task is marked as done, we update all deadlines and reminders and set it as undone
 		updateDone(oldtask, &bt.Task)
 
 		// Update the assignees
-		if err := oldtask.updateTaskAssignees(sess, bt.Assignees); err != nil {
+		if err := oldtask.updateTaskAssignees(s, bt.Assignees); err != nil {
 			return err
 		}
 
@@ -109,7 +101,7 @@ func (bt *BulkTask) Update() (err error) {
 			oldtask.Done = false
 		}
 
-		_, err = sess.ID(oldtask.ID).
+		_, err = s.ID(oldtask.ID).
 			Cols("title",
 				"description",
 				"done",
@@ -121,15 +113,9 @@ func (bt *BulkTask) Update() (err error) {
 				"end_date").
 			Update(oldtask)
 		if err != nil {
-			_ = sess.Rollback()
 			return err
 		}
 	}
 
-	err = sess.Commit()
-	if err != nil {
-		return
-	}
-
 	return
 }

pkg/models/bulk_task_test.go

@@ -57,18 +57,22 @@ func TestBulkTask_Update(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
 
+			s := x.NewSession()
+
 			bt := &BulkTask{
 				IDs:   tt.fields.IDs,
 				Tasks: tt.fields.Tasks,
 				Task:  tt.fields.Task,
 			}
-			allowed, _ := bt.CanUpdate(tt.fields.User)
+			allowed, _ := bt.CanUpdate(s, tt.fields.User)
 			if !allowed != tt.wantForbidden {
 				t.Errorf("BulkTask.Update() want forbidden, got %v, want %v", allowed, tt.wantForbidden)
 			}
-			if err := bt.Update(); (err != nil) != tt.wantErr {
+			if err := bt.Update(s); (err != nil) != tt.wantErr {
 				t.Errorf("BulkTask.Update() error = %v, wantErr %v", err, tt.wantErr)
 			}
+
+			s.Close()
 		})
 	}
 }

pkg/models/tasks.go

@@ -478,14 +478,14 @@ func GetTaskSimple(t *Task) (task Task, err error) {
 }
 
 // GetTasksByIDs returns all tasks for a list of ids
-func (bt *BulkTask) GetTasksByIDs() (err error) {
+func (bt *BulkTask) GetTasksByIDs(s *xorm.Session) (err error) {
 	for _, id := range bt.IDs {
 		if id < 1 {
 			return ErrTaskDoesNotExist{id}
 		}
 	}
 
-	err = x.In("id", bt.IDs).Find(&bt.Tasks)
+	err = s.In("id", bt.IDs).Find(&bt.Tasks)
 	if err != nil {
 		return
 	}