fix: fixed query to elasticsearch with not filters

Author: Codehardt

decisiontree.go

@@ -1,5 +1,10 @@
 package evalostic
 
+import (
+	"fmt"
+	"strings"
+)
+
 type decisionTreeEntry struct {
 	value int
 	ci    bool
@@ -11,6 +16,29 @@ type decisionTreeNode struct {
 	outputs     []int
 }
 
+func (n *decisionTreeNode) String() string {
+	return n.string(decisionTreeEntry{value: -1}, 0)
+}
+
+func (n *decisionTreeNode) string(entry decisionTreeEntry, depth int) string {
+	indent := strings.Repeat("  ", depth)
+	var c string
+	var nc string
+	for entry, child := range n.children {
+		s := child.string(entry, depth+1)
+		c += s
+	}
+	for entry, child := range n.notChildren {
+		s := child.string(entry, depth+1)
+		nc += s
+	}
+	res := fmt.Sprintf("%s-entry: %d\n%s children:\n%s%s not children:\n%s", indent, entry.value, indent, c, indent, nc)
+	if len(n.outputs) > 0 {
+		res += fmt.Sprintf("%s match!\n", indent)
+	}
+	return res
+}
+
 func (n *decisionTreeNode) add(path andPathIndex, output int) {
 	if len(path) == 0 {
 		n.outputs = append(n.outputs, output)

export.go

@@ -9,7 +9,7 @@ import (
 // `"foo" OR "baz"` will be compiled to
 // {"bool":{"should":[{"wildcard":{"raw":{"case_insensitive":false,"value":"*foo*"}}},{"wildcard":{"raw":{"case_insensitive":false,"value":"*bar*"}}}]}}
 func (e *Evalostic) ExportElasticSearchQuery(wildcardField string) string {
-	b, _ := json.Marshal(e.ExportElasticSearchQueryMap(wildcardField))
+	b, _ := json.MarshalIndent(e.ExportElasticSearchQueryMap(wildcardField), "", "  ")
 	return string(b)
 }
 
@@ -21,7 +21,7 @@ func (e *Evalostic) ExportElasticSearchQueryMap(wildcardField string) map[string
 	for k, v := range e.strings {
 		indexToStrings[v] = k
 	}
-	query := e.exportElasticSearchQuerySub(wildcardField, indexToStrings, decisionTreeEntry{value: -1}, e.decisionTree)
+	query := e.exportElasticSearchQuerySub(wildcardField, indexToStrings, decisionTreeEntry{value: -1}, e.decisionTree, false)
 	if query == nil {
 		return make(map[string]interface{})
 	}
@@ -30,8 +30,7 @@ func (e *Evalostic) ExportElasticSearchQueryMap(wildcardField string) map[string
 
 var wildcardReplacer = strings.NewReplacer("\\", "\\\\", "*", "\\*", "?", "\\?")
 
-func (e *Evalostic) exportElasticSearchQuerySub(wildcardField string, indexToStrings map[int]string, entry decisionTreeEntry, node *decisionTreeNode) map[string]interface{} {
-
+func (e *Evalostic) exportElasticSearchQuerySub(wildcardField string, indexToStrings map[int]string, entry decisionTreeEntry, node *decisionTreeNode, not bool) map[string]interface{} {
 	isLeaf := len(node.outputs) != 0
 	wildcard := map[string]interface{}{
 		"wildcard": map[string]interface{}{
@@ -41,6 +40,13 @@ func (e *Evalostic) exportElasticSearchQuerySub(wildcardField string, indexToStr
 			},
 		},
 	}
+	if not {
+		wildcard = map[string]interface{}{
+			"bool": map[string]interface{}{
+				"must_not": []interface{}{wildcard},
+			},
+		}
+	}
 	if entry.value == -1 {
 		// special case: do not use root node as wildcard
 		wildcard = nil
@@ -50,20 +56,20 @@ func (e *Evalostic) exportElasticSearchQuerySub(wildcardField string, indexToStr
 		return wildcard
 	}
 
-	var should, shouldNot []map[string]interface{}
+	var should []map[string]interface{}
 
 	for subEntry, subNode := range node.children {
-		if subQuery := e.exportElasticSearchQuerySub(wildcardField, indexToStrings, subEntry, subNode); subQuery != nil {
+		if subQuery := e.exportElasticSearchQuerySub(wildcardField, indexToStrings, subEntry, subNode, false); subQuery != nil {
 			should = append(should, subQuery)
 		}
 	}
 	for subEntry, subNode := range node.notChildren {
-		if subQuery := e.exportElasticSearchQuerySub(wildcardField, indexToStrings, subEntry, subNode); subQuery != nil {
-			shouldNot = append(shouldNot, subQuery)
+		if subQuery := e.exportElasticSearchQuerySub(wildcardField, indexToStrings, subEntry, subNode, true); subQuery != nil {
+			should = append(should, subQuery)
 		}
 	}
 
-	toQuery := func(should []map[string]interface{}, not bool) map[string]interface{} {
+	toQuery := func(should []map[string]interface{}) map[string]interface{} {
 		if len(should) == 0 {
 			return nil
 		}
@@ -77,22 +83,10 @@ func (e *Evalostic) exportElasticSearchQuerySub(wildcardField string, indexToStr
 				},
 			}
 		}
-		if not {
-			// wrap OR conditions with a NOT
-			res = map[string]interface{}{
-				"bool": map[string]interface{}{
-					"must_not": []interface{}{res},
-				},
-			}
-		}
 		return res
 	}
 
-	notChildQuery := toQuery(shouldNot, true)
-	if notChildQuery != nil {
-		should = append(should, notChildQuery)
-	}
-	childQuery := toQuery(should, false)
+	childQuery := toQuery(should)
 	if childQuery == nil {
 		return nil
 	}

export_test.go

@@ -1,6 +1,9 @@
 package evalostic
 
-import "testing"
+import (
+	"fmt"
+	"testing"
+)
 
 func TestElasticSearchQueryExport(t *testing.T) {
 	for _, condition := range []string{
@@ -20,3 +23,18 @@ func TestElasticSearchQueryExport(t *testing.T) {
 		t.Logf("%s: %s", condition, query)
 	}
 }
+
+func TestElasticSearchQueryExport2(t *testing.T) {
+	for _, condition := range []string{
+		`"A" AND NOT ("B" OR "C" OR "D")`,
+	} {
+		fmt.Println(condition)
+		fmt.Println("-----")
+		ev, err := New([]string{condition})
+		if err != nil {
+			t.Fatalf("could not parse %s: %s", condition, err)
+		}
+		query := ev.ExportElasticSearchQuery("raw")
+		t.Logf("%s: %s", condition, query)
+	}
+}