RHINENG-21424: handle null/notnull filters

Author: MichaelMraka

manager/controllers/filter.go

@@ -79,8 +79,8 @@ func checkValueCount(operator string, nValues int) bool {
 // Convert a single filter to where clauses
 func (t *FilterData) ToWhere(fieldName string, attributes database.AttrMap) (string, []any, error) {
 	var err error
-	transformedValues, transformedOperator := transformFilterParams(fieldName, t.Values, t.Operator)
-	var values = make([]interface{}, len(transformedValues))
+	transformedOperator, transformedValues := t.transformParams(fieldName)
+	var values = make([]any, len(transformedValues))
 	for i, v := range transformedValues {
 		fieldInfo, found := attributes[fieldName]
 		if !found {
@@ -123,39 +123,43 @@ func (t *FilterData) ToWhere(fieldName string, attributes database.AttrMap) (str
 	case OpNotNull:
 		return fmt.Sprintf("%s IS NOT NULL ", attributes[fieldName].DataQuery), []any{}, nil
 	default:
-		return "", []interface{}{}, errors.Errorf("Unknown filter : %s", t.Operator)
+		return "", []any{}, errors.Errorf("Unknown filter : %s", t.Operator)
 	}
 }
 
-// transformFilterParams Allow exceptions in ToWhere values usage (e.g. "other").
-func transformFilterParams(fieldName string, originalValues []string, originalOperator string) (
-	transformedValues []string, transformedOperator string) {
+func (t *FilterData) transformParams(fieldName string) (transformedOperator string, transformedValues []string) {
+	if len(t.Values) == 1 && (t.Values[0] == "null" || t.Values[0] == "notnull") {
+		// handle special cases filter=null and filter=notnull
+		return t.Values[0], []string{"0"}
+	}
 	if fieldName != "advisory_type_name" {
-		return originalValues, originalOperator
+		// no change
+		return t.Operator, t.Values
 	}
 
-	transformedValues = make([]string, 0, len(originalValues))
-	for _, originalValue := range originalValues {
+	// special case, in advisory_type_name filter expand "other" into list of what we mean by other
+	transformedValues = make([]string, 0, len(t.Values))
+	for _, originalValue := range t.Values {
 		if originalValue == "other" {
 			transformedValues = append(transformedValues, database.OtherAdvisoryTypes...)
 		} else {
 			transformedValues = append(transformedValues, originalValue)
 		}
 	}
 
-	if len(transformedValues) == len(originalValues) {
-		return originalValues, originalOperator
+	if len(transformedValues) == len(t.Values) {
+		return t.Operator, t.Values
 	}
 
-	switch originalOperator {
+	switch t.Operator {
 	case OpEq:
 		transformedOperator = OpIn
 	case OpNeq:
 		transformedOperator = OpNotIn
 	default:
-		transformedOperator = originalOperator
+		transformedOperator = t.Operator
 	}
-	return transformedValues, transformedOperator
+	return transformedOperator, transformedValues
 }
 
 func (t Filters) ToQueryParams() string {