Add session handling for task collections

pkg/models/task_collection.go

@@ -20,6 +20,7 @@ package models
 import (
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
+	"xorm.io/xorm"
 )
 
 // TaskCollection is a struct used to hold filter details and not clutter the Task struct with information not related to actual tasks.
@@ -100,17 +101,17 @@ func validateTaskField(fieldName string) error {
 // @Success 200 {array} models.Task "The tasks"
 // @Failure 500 {object} models.Message "Internal error"
 // @Router /lists/{listID}/tasks [get]
-func (tf *TaskCollection) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, totalItems int64, err error) {
+func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, totalItems int64, err error) {
 
 	// If the list id is < -1 this means we're dealing with a saved filter - in that case we get and populate the filter
 	// -1 is the favorites list which works as intended
 	if tf.ListID < -1 {
-		s, err := getSavedFilterSimpleByID(getSavedFilterIDFromListID(tf.ListID))
+		sf, err := getSavedFilterSimpleByID(s, getSavedFilterIDFromListID(tf.ListID))
 		if err != nil {
 			return nil, 0, 0, err
 		}
 
-		return s.getTaskCollection().ReadAll(a, search, page, perPage)
+		return sf.getTaskCollection().ReadAll(s, a, search, page, perPage)
 	}
 
 	if len(tf.SortByArr) > 0 {
@@ -166,10 +167,13 @@ func (tf *TaskCollection) ReadAll(a web.Auth, search string, page int, perPage i
 	// If the list ID is not set, we get all tasks for the user.
 	// This allows to use this function in Task.ReadAll with a possibility to deprecate the latter at some point.
 	if tf.ListID == 0 {
-		tf.Lists, _, _, err = getRawListsForUser(&listOptions{
-			user: &user.User{ID: a.GetID()},
-			page: -1,
-		})
+		tf.Lists, _, _, err = getRawListsForUser(
+			s,
+			&listOptions{
+				user: &user.User{ID: a.GetID()},
+				page: -1,
+			},
+		)
 		if err != nil {
 			return nil, 0, 0, err
 		}

pkg/models/task_collection_test.go

@@ -986,6 +986,8 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
+			s := x.NewSession()
+			defer s.Close()
 
 			lt := &TaskCollection{
 				ListID:  tt.fields.ListID,
@@ -1000,7 +1002,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 				CRUDable: tt.fields.CRUDable,
 				Rights:   tt.fields.Rights,
 			}
-			got, _, _, err := lt.ReadAll(tt.args.a, tt.args.search, tt.args.page, 50)
+			got, _, _, err := lt.ReadAll(s, tt.args.a, tt.args.search, tt.args.page, 50)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("Test %s, Task.ReadAll() error = %v, wantErr %v", tt.name, err, tt.wantErr)
 				return

pkg/routes/caldav/listStorageProvider.go

@@ -403,7 +403,7 @@ func (vcls *VikunjaCaldavListStorage) getListRessource(isCollection bool) (rr Vi
 		tk := models.TaskCollection{
 			ListID: vcls.list.ID,
 		}
-		iface, _, _, err := tk.ReadAll(vcls.user, "", 1, 1000)
+		iface, _, _, err := tk.ReadAll(s, vcls.user, "", 1, 1000)
 		if err != nil {
 			return rr, err
 		}