vikunja
/
vikunja
6
43
Fork 72
Code Issues 151 Pull Requests 19 Packages Releases 32 Activity

Task filters #243

Merged
konrad merged 18 commits from feature/task-filter into master 2020-04-11 14:20:34 +00:00
Conversation 0 Commits 18 Files Changed 50 +18 -20
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2046ba78b5 - Show all commits

26
pkg/models/task_collection_sort_test.go
View File

@ -44,7 +44,7 @@ func TestSortParamValidation(t *testing.T) {
})
})
t.Run("Test valid sort by", func(t *testing.T) {
for _, test := range []sortProperty{
for _, test := range []string{
taskPropertyID,
taskPropertyText,
taskPropertyDescription,
@ -63,10 +63,10 @@ func TestSortParamValidation(t *testing.T) {
taskPropertyCreated,
taskPropertyUpdated,
} {
t.Run(test.String(), func(t *testing.T) {
t.Run(test, func(t *testing.T) {
s := &sortParam{
orderBy: orderAscending,
sortBy: test,
sortBy: sortProperty(test),
}
err := s.validate()
assert.NoError(t, err)
@ -185,7 +185,7 @@ type taskSortTestCase struct {
name string
wantAsc []*Task
wantDesc []*Task
sortProperty sortProperty
sortProperty string
}
var taskSortTestCases = []taskSortTestCase{
@ -692,7 +692,7 @@ func TestTaskSort(t *testing.T) {
t.Run("asc default", func(t *testing.T) {
by := []*sortParam{
{
sortBy: testCase.sortProperty,
sortBy: sortProperty(testCase.sortProperty),
},
}
@ -710,7 +710,7 @@ func TestTaskSort(t *testing.T) {
t.Run("asc", func(t *testing.T) {
by := []*sortParam{
{
sortBy: testCase.sortProperty,
sortBy: sortProperty(testCase.sortProperty),
orderBy: orderAscending,
},
}
@ -729,7 +729,7 @@ func TestTaskSort(t *testing.T) {
t.Run("desc", func(t *testing.T) {
by := []*sortParam{
{
sortBy: testCase.sortProperty,
sortBy: sortProperty(testCase.sortProperty),
orderBy: orderDescending,
},
}
@ -767,11 +767,11 @@ func TestTaskSort(t *testing.T) {
}
sortParams := []*sortParam{
{
sortBy: taskPropertyDone,
sortBy: sortProperty(taskPropertyDone),
orderBy: orderAscending,
},
{
sortBy: taskPropertyID,
sortBy: sortProperty(taskPropertyID),
orderBy: orderDescending,
},
}
@ -804,11 +804,11 @@ func TestTaskSort(t *testing.T) {
}
sortParams := []*sortParam{
{
sortBy: taskPropertyDone,
sortBy: sortProperty(taskPropertyDone),
orderBy: orderAscending,
},
{
sortBy: taskPropertyText,
sortBy: sortProperty(taskPropertyText),
orderBy: orderDescending,
},
}
@ -841,11 +841,11 @@ func TestTaskSort(t *testing.T) {
}
sortParams := []*sortParam{
{
sortBy: taskPropertyDone,
sortBy: sortProperty(taskPropertyDone),
orderBy: orderDescending,
},
{
sortBy: taskPropertyText,
sortBy: sortProperty(taskPropertyText),
orderBy: orderAscending,
},
}

12
pkg/models/task_collection_test.go
View File

@ -676,13 +676,11 @@ func TestTaskCollection_ReadAll(t *testing.T) {
db.LoadAndAssertFixtures(t)
lt := &TaskCollection{
ListID: tt.fields.ListID,
StartDateSortUnix: tt.fields.StartDateSortUnix,
EndDateSortUnix: tt.fields.EndDateSortUnix,
SortBy: tt.fields.SortBy,
OrderBy: tt.fields.OrderBy,
CRUDable: tt.fields.CRUDable,
Rights: tt.fields.Rights,
ListID: tt.fields.ListID,
SortBy: tt.fields.SortBy,
OrderBy: tt.fields.OrderBy,
CRUDable: tt.fields.CRUDable,
Rights: tt.fields.Rights,
}
got, _, _, err := lt.ReadAll(tt.args.a, tt.args.search, tt.args.page, 50)
if (err != nil) != tt.wantErr {