diff --git a/pkg/models/kanban_test.go b/pkg/models/kanban_test.go index 8ff69a9df..5993ed9ab 100644 --- a/pkg/models/kanban_test.go +++ b/pkg/models/kanban_test.go @@ -81,9 +81,7 @@ func TestBucket_ReadAll(t *testing.T) { b := &Bucket{ ProjectID: 1, TaskCollection: TaskCollection{ - FilterBy: []string{"title"}, - FilterComparator: []string{"like"}, - FilterValue: []string{"done"}, + Filter: "title ~ 'done'", }, } bucketsInterface, _, _, err := b.ReadAll(s, testuser, "", -1, 0) diff --git a/pkg/models/task_collection.go b/pkg/models/task_collection.go index 99fc58431..f8fd6cbac 100644 --- a/pkg/models/task_collection.go +++ b/pkg/models/task_collection.go @@ -33,18 +33,6 @@ type TaskCollection struct { OrderBy []string `query:"order_by" json:"order_by"` OrderByArr []string `query:"order_by[]" json:"-"` - // Deprecated: The field name of the field to filter by - FilterBy []string `query:"filter_by" json:"filter_by"` - FilterByArr []string `query:"filter_by[]" json:"-"` - // Deprecated: The value of the field name to filter by - FilterValue []string `query:"filter_value" json:"filter_value"` - FilterValueArr []string `query:"filter_value[]" json:"-"` - // Deprecated: The comparator for field and value - FilterComparator []string `query:"filter_comparator" json:"filter_comparator"` - FilterComparatorArr []string `query:"filter_comparator[]" json:"-"` - // Deprecated: The way all filter conditions are concatenated together, can be either "and" or "or"., - FilterConcat string `query:"filter_concat" json:"filter_concat"` - Filter string `query:"filter" json:"filter"` // If set to true, the result will also include null values diff --git a/pkg/models/task_collection_filter.go b/pkg/models/task_collection_filter.go index a5017edd9..32e12acf1 100644 --- a/pkg/models/task_collection_filter.go +++ b/pkg/models/task_collection_filter.go @@ -150,24 +150,6 @@ func getTaskFiltersByCollections(c *TaskCollection) (filters []*taskFilter, err return } - if len(c.FilterByArr) > 0 { - c.FilterBy = append(c.FilterBy, c.FilterByArr...) - } - - if len(c.FilterValueArr) > 0 { - c.FilterValue = append(c.FilterValue, c.FilterValueArr...) - } - - if len(c.FilterComparatorArr) > 0 { - c.FilterComparator = append(c.FilterComparator, c.FilterComparatorArr...) - } - - //if c.FilterConcat != "" && c.FilterConcat != filterConcatAnd && c.FilterConcat != filterConcatOr { - // return nil, ErrInvalidTaskFilterConcatinator{ - // Concatinator: taskFilterConcatinator(c.FilterConcat), - // } - //} - parsedFilter, err := fexpr.Parse(c.Filter) if err != nil { return nil, err diff --git a/pkg/models/task_collection_test.go b/pkg/models/task_collection_test.go index 494135fc8..6185888c8 100644 --- a/pkg/models/task_collection_test.go +++ b/pkg/models/task_collection_test.go @@ -677,12 +677,8 @@ func TestTaskCollection_ReadAll(t *testing.T) { SortBy []string // Is a string, since this is the place where a query string comes from the user OrderBy []string - FilterBy []string - FilterValue []string - FilterComparator []string FilterIncludeNulls bool - - Filter string + Filter string CRUDable web.CRUDable Rights web.Rights @@ -1392,9 +1388,6 @@ func TestTaskCollection_ReadAll(t *testing.T) { SortBy: tt.fields.SortBy, OrderBy: tt.fields.OrderBy, - FilterBy: tt.fields.FilterBy, - FilterValue: tt.fields.FilterValue, - FilterComparator: tt.fields.FilterComparator, FilterIncludeNulls: tt.fields.FilterIncludeNulls, Filter: tt.fields.Filter,