ami/tl-vikunja
1
0
Fork 0
Code

fix(kanban): filter for tasks in buckets by assignee should not modify the filter directly

Browse Source 
Resolves https://github.com/go-vikunja/api/issues/84
This commit is contained in:
kolaente 2023-10-11 18:43:16 +02:00
parent 9cdccd7005
commit 58497f29e6
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/models/task_search.go
View File

@ -92,8 +92,13 @@ func (d *dbTaskSearcher) Search(opts *taskSearchOptions) (tasks []*Task, totalCo
// To still find tasks with nil values, we exclude 0s when comparing with >/< values. // To still find tasks with nil values, we exclude 0s when comparing with >/< values.
for _, f := range opts.filters { for _, f := range opts.filters {
if f.field == "reminders" { if f.field == "reminders" {
f.field = "reminder" // This is the name in the db filter, err := getFilterCond(&taskFilter{
filter, err := getFilterCond(f, opts.filterIncludeNulls) // recreating the struct here to avoid modifying it when reusing the opts struct
field: "reminder",
value: f.value,
comparator: f.comparator,
isNumeric: f.isNumeric,
}, opts.filterIncludeNulls)
if err != nil { if err != nil {
return nil, totalCount, err return nil, totalCount, err
} }
@ -105,8 +110,13 @@ func (d *dbTaskSearcher) Search(opts *taskSearchOptions) (tasks []*Task, totalCo
if f.comparator == taskFilterComparatorLike { if f.comparator == taskFilterComparatorLike {
return nil, totalCount, err return nil, totalCount, err
} }
f.field = "username" filter, err := getFilterCond(&taskFilter{
filter, err := getFilterCond(f, opts.filterIncludeNulls) // recreating the struct here to avoid modifying it when reusing the opts struct
field: "username",
value: f.value,
comparator: f.comparator,
isNumeric: f.isNumeric,
}, opts.filterIncludeNulls)
if err != nil { if err != nil {
return nil, totalCount, err return nil, totalCount, err
} }
@ -115,8 +125,13 @@ func (d *dbTaskSearcher) Search(opts *taskSearchOptions) (tasks []*Task, totalCo
} }
if f.field == "labels" || f.field == "label_id" { if f.field == "labels" || f.field == "label_id" {
f.field = "label_id" filter, err := getFilterCond(&taskFilter{
filter, err := getFilterCond(f, opts.filterIncludeNulls) // recreating the struct here to avoid modifying it when reusing the opts struct
field: "label_id",
value: f.value,
comparator: f.comparator,
isNumeric: f.isNumeric,
}, opts.filterIncludeNulls)
if err != nil { if err != nil {
return nil, totalCount, err return nil, totalCount, err
} }
@ -125,8 +140,13 @@ func (d *dbTaskSearcher) Search(opts *taskSearchOptions) (tasks []*Task, totalCo
} }
if f.field == "parent_project" || f.field == "parent_project_id" { if f.field == "parent_project" || f.field == "parent_project_id" {
f.field = "parent_project_id" filter, err := getFilterCond(&taskFilter{
filter, err := getFilterCond(f, opts.filterIncludeNulls) // recreating the struct here to avoid modifying it when reusing the opts struct
field: "parent_project_id",
value: f.value,
comparator: f.comparator,
isNumeric: f.isNumeric,
}, opts.filterIncludeNulls)
if err != nil { if err != nil {
return nil, totalCount, err return nil, totalCount, err
} }