From ca6d1946dafc4c9f41f9cdcc3a8e6a8a8fcc00a0 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 23 Feb 2023 17:43:23 +0100
Subject: [PATCH] fix(tasks): make sure tasks are sorted by position before
 recalculating them

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

diff --git a/pkg/models/tasks.go b/pkg/models/tasks.go
index c082dd16c..f51495b88 100644
--- a/pkg/models/tasks.go
+++ b/pkg/models/tasks.go
@@ -1248,7 +1248,10 @@ func (t *Task) Update(s *xorm.Session, a web.Auth) (err error) {
 func recalculateTaskKanbanPositions(s *xorm.Session, bucketID int64) (err error) {
 
 	allTasks := []*Task{}
-	err = s.Where("bucket_id = ?", bucketID).Find(&allTasks)
+	err = s.
+		Where("bucket_id = ?", bucketID).
+		OrderBy("kanban_position asc").
+		Find(&allTasks)
 	if err != nil {
 		return
 	}
@@ -1273,7 +1276,10 @@ func recalculateTaskKanbanPositions(s *xorm.Session, bucketID int64) (err error)
 func recalculateTaskPositions(s *xorm.Session, listID int64) (err error) {
 
 	allTasks := []*Task{}
-	err = s.Where("list_id = ?", listID).Find(&allTasks)
+	err = s.
+		Where("list_id = ?", listID).
+		OrderBy("position asc").
+		Find(&allTasks)
 	if err != nil {
 		return
 	}