Update xorm to use the new import path (#133)

Fix ineffassign

Fix getting all labels including the ones not associated to a task

Signed-off-by: kolaente <k@knt.li>

Fix logging sql queries

Signed-off-by: kolaente <k@knt.li>

Start fixing getting all labels

Update xormigrate

Update xorm to use the new import path

Co-authored-by: kolaente <k@knt.li>
Reviewed-on: https://kolaente.dev/vikunja/api/pulls/133

pkg/db/db.go

@@ -21,12 +21,12 @@ import (
 	"code.vikunja.io/api/pkg/log"
 	"encoding/gob"
 	"fmt"
-	"github.com/go-xorm/core"
-	"github.com/go-xorm/xorm"
 	"strconv"
 	"time"
+	"xorm.io/core"
+	"xorm.io/xorm"
 
-	xrc "github.com/go-xorm/xorm-redis-cache"
+	xrc "gitea.com/xorm/xorm-redis-cache"
 
 	_ "github.com/go-sql-driver/mysql" // Because.
 	_ "github.com/mattn/go-sqlite3"    // Because.
@@ -62,8 +62,9 @@ func CreateDBEngine() (engine *xorm.Engine, err error) {
 	}
 
 	engine.SetMapper(core.GonicMapper{})
-	engine.ShowSQL(config.LogDatabase.GetString() != "off")
-	engine.SetLogger(xorm.NewSimpleLogger(log.GetLogWriter("database")))
+	logger := xorm.NewSimpleLogger(log.GetLogWriter("database"))
+	logger.ShowSQL(config.LogDatabase.GetString() != "off")
+	engine.SetLogger(logger)
 
 	// Cache
 	// We have to initialize the cache here to avoid import cycles

pkg/db/test.go

@@ -20,9 +20,9 @@ package db
 import (
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/log"
-	"github.com/go-xorm/core"
-	"github.com/go-xorm/xorm"
 	"os"
+	"xorm.io/core"
+	"xorm.io/xorm"
 )
 
 // CreateTestEngine creates an instance of the db engine which lives in memory
@@ -46,8 +46,9 @@ func CreateTestEngine() (engine *xorm.Engine, err error) {
 	}
 
 	engine.SetMapper(core.GonicMapper{})
-	engine.ShowSQL(os.Getenv("UNIT_TESTS_VERBOSE") == "1")
-	engine.SetLogger(xorm.NewSimpleLogger(log.GetLogWriter("database")))
+	logger := xorm.NewSimpleLogger(log.GetLogWriter("database"))
+	logger.ShowSQL(os.Getenv("UNIT_TESTS_VERBOSE") == "1")
+	engine.SetLogger(logger)
 	x = engine
 	return
 }

pkg/files/db.go

@@ -20,7 +20,7 @@ import (
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/log"
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 var x *xorm.Engine

pkg/migration/20190324205606.go

@@ -17,8 +17,8 @@
 package migration
 
 import (
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 // Used for rollback

pkg/migration/20190328074430.go

@@ -17,8 +17,8 @@
 package migration
 
 import (
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 // Used for rollback

pkg/migration/20190430111111.go

@@ -17,8 +17,8 @@
 package migration
 
 import (
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 type listTask20190430111111 struct {

pkg/migration/20190511202210.go

@@ -18,8 +18,8 @@ package migration
 
 import (
 	"code.vikunja.io/api/pkg/utils"
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 type listTask20190511202210 struct {

pkg/migration/20190514192749.go

@@ -17,8 +17,8 @@
 package migration
 
 import (
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 type listTask20190514192749 struct {

pkg/migration/20190524205441.go

@@ -17,8 +17,8 @@
 package migration
 
 import (
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 type taskReminder20190524205441 struct {

pkg/migration/20190718200716.go

@@ -17,8 +17,8 @@
 package migration
 
 import (
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 func init() {

pkg/migration/20190818210133.go

@@ -19,8 +19,8 @@ package migration
 
 import (
 	"code.vikunja.io/api/pkg/models"
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 type linkSharing20190818210133 struct {

pkg/migration/20190920185205.go

@@ -18,8 +18,8 @@
 package migration
 
 import (
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 type task20190920185205 struct {

pkg/migration/20190922205826.go

@@ -19,8 +19,8 @@ package migration
 
 import (
 	"code.vikunja.io/api/pkg/models"
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 // TaskRelation represents a kind of relation between two tasks

pkg/migration/20191008194238.go

@@ -17,8 +17,8 @@
 package migration
 
 import (
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 type file20191008194238 struct {

pkg/migration/20191010131430.go

@@ -18,8 +18,8 @@
 package migration
 
 import (
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 type taskAttachment20191010131430 struct {

pkg/migration/20191207204427.go

@@ -18,8 +18,8 @@
 package migration
 
 import (
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 type list20191207204427 struct {

pkg/migration/20191207220736.go

@@ -18,8 +18,8 @@
 package migration
 
 import (
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 type task20191207220736 struct {

pkg/migration/20200120201756.go

@@ -17,8 +17,8 @@
 package migration
 
 import (
-	"github.com/go-xorm/xorm"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 type status20200120201756 struct {

pkg/migration/migration.go

@@ -24,11 +24,11 @@ import (
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/modules/migration"
 	"code.vikunja.io/api/pkg/user"
-	"github.com/go-xorm/xorm"
 	"github.com/olekukonko/tablewriter"
 	"os"
 	"sort"
 	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
 )
 
 // You can get the id string for new migrations by running `date +%Y%m%d%H%M%S` on a unix system.

pkg/models/label_rights.go

@@ -19,7 +19,7 @@ package models
 import (
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"github.com/go-xorm/builder"
+	"xorm.io/builder"
 )
 
 // CanUpdate checks if a user can update a label

pkg/models/label_task.go

@@ -20,7 +20,7 @@ import (
 	"code.vikunja.io/api/pkg/timeutil"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"github.com/go-xorm/builder"
+	"xorm.io/builder"
 )
 
 // LabelTask represents a relation between a label and a task
@@ -149,15 +149,6 @@ type LabelByTaskIDsOptions struct {
 // Helper function to get all labels for a set of tasks
 // Used when getting all labels for one task as well when getting all lables
 func getLabelsByTaskIDs(opts *LabelByTaskIDsOptions) (ls []*labelWithTaskID, resultCount int, totalEntries int64, err error) {
-	// Include unused labels. Needed to be able to show a list of all unused labels a user
-	// has access to.
-	var uidOrNil interface{}
-	var requestOrNil interface{}
-	if opts.GetUnusedLabels {
-		uidOrNil = opts.User.ID
-		requestOrNil = "label_task.label_id != null OR labels.created_by_id = ?"
-	}
-
 	// We still need the task ID when we want to get all labels for a task, but because of this, we get the same label
 	// multiple times when it is associated to more than one task.
 	// Because of this whole thing, we need this extra switch here to only group by Task IDs if needed.
@@ -169,11 +160,15 @@ func getLabelsByTaskIDs(opts *LabelByTaskIDsOptions) (ls []*labelWithTaskID, res
 
 	// Get all labels associated with these tasks
 	var labels []*labelWithTaskID
+	cond := builder.And(builder.In("label_task.task_id", opts.TaskIDs), builder.NotNull{"label_task.label_id"})
+	if opts.GetUnusedLabels {
+		cond = builder.Or(cond, builder.Eq{"labels.created_by_id": opts.User.ID})
+	}
+
 	err = x.Table("labels").
 		Select("labels.*, label_task.task_id").
 		Join("LEFT", "label_task", "label_task.label_id = labels.id").
-		Where(requestOrNil, uidOrNil).
-		Or(builder.In("label_task.task_id", opts.TaskIDs)).
+		Where(cond).
 		And("labels.title LIKE ?", "%"+opts.Search+"%").
 		GroupBy(groupBy).
 		Limit(getLimitFromPageIndex(opts.Page, opts.PerPage)).
@@ -204,10 +199,13 @@ func getLabelsByTaskIDs(opts *LabelByTaskIDsOptions) (ls []*labelWithTaskID, res
 	}
 
 	// Get the total number of entries
+	condCount := builder.And(builder.In("label_task.task_id", opts.TaskIDs), builder.NotNull{"label_task.label_id"})
+	if opts.GetUnusedLabels {
+		condCount = builder.Or(cond, builder.Eq{"labels.created_by_id": opts.User.ID})
+	}
 	totalEntries, err = x.Table("labels").
 		Join("LEFT", "label_task", "label_task.label_id = labels.id").
-		Where(requestOrNil, uidOrNil).
-		Or(builder.In("label_task.task_id", opts.TaskIDs)).
+		Where(condCount).
 		And("labels.title LIKE ?", "%"+opts.Search+"%").
 		GroupBy(groupBy).
 		Count(&Label{})

pkg/models/label_test.go

@@ -17,6 +17,7 @@
 package models
 
 import (
+	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/timeutil"
 	"code.vikunja.io/api/pkg/user"
 	"gopkg.in/d4l3k/messagediff.v1"
@@ -119,6 +120,7 @@ func TestLabel_ReadAll(t *testing.T) {
 				CRUDable:    tt.fields.CRUDable,
 				Rights:      tt.fields.Rights,
 			}
+			db.LoadAndAssertFixtures(t)
 			gotLs, _, _, err := l.ReadAll(tt.args.a, tt.args.search, tt.args.page, 0)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("Label.ReadAll() error = %v, wantErr %v", err, tt.wantErr)

pkg/models/list_rights.go

@@ -19,7 +19,7 @@ package models
 import (
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"github.com/go-xorm/builder"
+	"xorm.io/builder"
 )
 
 // CanWrite return whether the user can write on that list or not

pkg/models/models.go

@@ -21,7 +21,7 @@ import (
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/log"
 	_ "github.com/go-sql-driver/mysql" // Because.
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 
 	_ "github.com/mattn/go-sqlite3" // Because.
 )

pkg/models/namespace_rights.go

@@ -18,7 +18,7 @@ package models
 
 import (
 	"code.vikunja.io/web"
-	"github.com/go-xorm/builder"
+	"xorm.io/builder"
 )
 
 // CanWrite checks if a user has write access to a namespace

pkg/models/teams.go

@@ -21,7 +21,7 @@ import (
 	"code.vikunja.io/api/pkg/timeutil"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"github.com/go-xorm/builder"
+	"xorm.io/builder"
 )
 
 // Team holds a team object

pkg/models/user_list.go

@@ -19,7 +19,7 @@ package models
 
 import (
 	"code.vikunja.io/api/pkg/user"
-	"github.com/go-xorm/builder"
+	"xorm.io/builder"
 )
 
 // ListUIDs hold all kinds of user IDs from accounts who have somehow access to a list

pkg/modules/migration/db.go

@@ -20,7 +20,7 @@ import (
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/log"
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 var x *xorm.Engine

pkg/user/db.go

@@ -21,7 +21,7 @@ import (
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/log"
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 var x *xorm.Engine