start adding more complex filter support
This commit is contained in:
@@ -6,6 +6,7 @@ import (
|
|||||||
"net/url"
|
"net/url"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Query error.
|
// Query error.
|
||||||
@@ -14,7 +15,11 @@ var (
|
|||||||
ErrTooManyFilters = errors.New("too many filters")
|
ErrTooManyFilters = errors.New("too many filters")
|
||||||
)
|
)
|
||||||
|
|
||||||
var filterRegexp = regexp.MustCompile("^([A-z0-9]+) (eq|neq|gt|gte|lt|lte|in|not in|like|not like) (.+)$")
|
var (
|
||||||
|
filterRegexp = regexp.MustCompile("^([A-z0-9]+) (eq|neq|gt|gte|lt|lte|in|not in|like|not like) (.+)$")
|
||||||
|
|
||||||
|
sliceSeparator = ","
|
||||||
|
)
|
||||||
|
|
||||||
// Filter represents a filter as used in, most likely, a database query.
|
// Filter represents a filter as used in, most likely, a database query.
|
||||||
type Filter struct {
|
type Filter struct {
|
||||||
@@ -23,27 +28,89 @@ type Filter struct {
|
|||||||
Value string `json:"value"` // Value to filter by.
|
Value string `json:"value"` // Value to filter by.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// BoolSlice retrieves the filter value as a slice of bools.
|
||||||
|
func (filter Filter) BoolSlice() ([]bool, error) {
|
||||||
|
values := strings.Split(filter.Value, sliceSeparator)
|
||||||
|
bools := []bool{}
|
||||||
|
for _, value := range values {
|
||||||
|
boolValue, err := strconv.ParseBool(value)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
bools = append(bools, boolValue)
|
||||||
|
}
|
||||||
|
return bools, nil
|
||||||
|
}
|
||||||
|
|
||||||
// BoolValue retrieves the filter value as a bool.
|
// BoolValue retrieves the filter value as a bool.
|
||||||
func (filter Filter) BoolValue() (bool, error) {
|
func (filter Filter) BoolValue() (bool, error) {
|
||||||
return strconv.ParseBool(filter.Value)
|
return strconv.ParseBool(filter.Value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Float32Slice retrieves the filter value as a slice of float32s.
|
||||||
|
func (filter Filter) Float32Slice() ([]float32, error) {
|
||||||
|
values := strings.Split(filter.Value, sliceSeparator)
|
||||||
|
floats := []float32{}
|
||||||
|
for _, value := range values {
|
||||||
|
floatValue, err := strconv.ParseFloat(value, 32)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
floats = append(floats, float32(floatValue))
|
||||||
|
}
|
||||||
|
return floats, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Float32Value retrieves the filter value as a float32.
|
// Float32Value retrieves the filter value as a float32.
|
||||||
func (filter Filter) Float32Value() (float32, error) {
|
func (filter Filter) Float32Value() (float32, error) {
|
||||||
value, err := strconv.ParseFloat(filter.Value, 32)
|
value, err := strconv.ParseFloat(filter.Value, 32)
|
||||||
return float32(value), err
|
return float32(value), err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Float64Slice retrieves the filter value as a slice of float64s.
|
||||||
|
func (filter Filter) Float64Slice() ([]float64, error) {
|
||||||
|
values := strings.Split(filter.Value, sliceSeparator)
|
||||||
|
floats := []float64{}
|
||||||
|
for _, value := range values {
|
||||||
|
floatValue, err := strconv.ParseFloat(value, 64)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
floats = append(floats, float64(floatValue))
|
||||||
|
}
|
||||||
|
return floats, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Float64Value retrieves the filter value as a float64.
|
// Float64Value retrieves the filter value as a float64.
|
||||||
func (filter Filter) Float64Value() (float64, error) {
|
func (filter Filter) Float64Value() (float64, error) {
|
||||||
return strconv.ParseFloat(filter.Value, 64)
|
return strconv.ParseFloat(filter.Value, 64)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IntSlice retrieves the filter value as a slice of ints.
|
||||||
|
func (filter Filter) IntSlice() ([]int, error) {
|
||||||
|
values := strings.Split(filter.Value, sliceSeparator)
|
||||||
|
ints := []int{}
|
||||||
|
for _, value := range values {
|
||||||
|
intValue, err := strconv.Atoi(value)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
ints = append(ints, int(intValue))
|
||||||
|
}
|
||||||
|
return ints, nil
|
||||||
|
}
|
||||||
|
|
||||||
// IntValue retrieves the filter value as an int.
|
// IntValue retrieves the filter value as an int.
|
||||||
func (filter Filter) IntValue() (int, error) {
|
func (filter Filter) IntValue() (int, error) {
|
||||||
return strconv.Atoi(filter.Value)
|
return strconv.Atoi(filter.Value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// StringSlice retrieves the filter value as a slice of strings.
|
||||||
|
func (filter Filter) StringSlice() ([]string, error) {
|
||||||
|
strings := strings.Split(filter.Value, sliceSeparator)
|
||||||
|
return strings, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Filters is a slice of Filter structs.
|
// Filters is a slice of Filter structs.
|
||||||
type Filters []Filter
|
type Filters []Filter
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user