feat: add is empty, is not empty, starts with, ends with filters operators #801
Conversation
ChibiBlasphem
force-pushed
the
christopher/add-aggregate-operators
branch
from
d92d4b2 to
06fef3a
Compare
| @@ -25,6 +25,10 @@ var validTypeForFilterOperators = map[ast.FilterOperator][]models.DataType{ | |||
| ast.FILTER_LESSER_OR_EQUAL: {models.Int, models.Float, models.String, models.Timestamp}, | |||
| ast.FILTER_IS_IN_LIST: {models.String}, | |||
| ast.FILTER_IS_NOT_IN_LIST: {models.String}, | |||
| ast.FILTER_IS_EMPTY: {models.Int, models.Float, models.String, models.Timestamp}, | |||
There was a problem hiding this comment.
just for the sake of completeness: could also work with bool type
| @@ -12,6 +12,12 @@ import ( | |||
| "github.com/checkmarble/marble-backend/models/ast" | |||
| ) | |||
|
|
|||
| // Define where to put that | |||
| type FilterWithType struct { | |||
There was a problem hiding this comment.
Prefer to put it into models (most generally) or optionally in the usecase where you are using it (if it's really a local type that you'll use just there)
There was a problem hiding this comment.
=> in this case, into models since you use it in the usecase and the repo
| } | ||
| return query.Where(orCondition), nil | ||
| case ast.FILTER_IS_NOT_EMPTY: | ||
| andCondition := squirrel.And{ |
There was a problem hiding this comment.
you can reduce code a little bit by avoiding the squirrel.And and just adding to the squirrel.NotEq conditionally
There was a problem hiding this comment.
That may be a stupid question, but I don't know how I can add the second NotEq conditionally on the first one.
There was a problem hiding this comment.
squirrel.And is just an alias wrapper over a go map[string]any, so just by setting the value in the map
There was a problem hiding this comment.
As I read the code squirrel.And is an alias for []Sqlizer, so I don't know how to add both NotEq without it. Can you suggest me some code for me to see what you mean?
There was a problem hiding this comment.
I'm sorry, I didn't write what I meant to write. I meant to say that squirrel.(Not)Eq is a wrapper over a map.
So you could do
notEq := squirrel.NotEq{fmt.Sprintf("%s.%s", tableName, fieldName): nil}
if fieldType == models.String {
notEq[fmt.Sprintf("%s.%s", tableName, fieldName)] = ""
}
return query.Where(notEq), nilThere was a problem hiding this comment.
Oh but won't the second one replace the first? The key being the same.
There was a problem hiding this comment.
ok you are right 🤦 sorry for misleading you
|
Btw, I understand "unary" from the context of the "main" ast, still feels like "unary" is not the exact word here but I don't have a better one TBH |
|
@ChibiBlasphem I think the thing that remains to do, would be to add the filter operators you created in file |
Frontend PR: checkmarble/marble-frontend#659