fix #1 - implicit was not being tested

Author: sneljo1

.gitignore

@@ -1,2 +1,3 @@
 .idea
-chaincode
+vendor
+.vscode

query/query.go

@@ -1,12 +1,13 @@
 package query
 
 import (
+	"encoding/json"
 	"errors"
-	"github.com/wearetheledger/go-couchdb-query-engine/query/rules"
-	"reflect"
 	"fmt"
+	"reflect"
 	"strings"
-	"encoding/json"
+
+	"github.com/wearetheledger/go-couchdb-query-engine/query/rules"
 )
 
 var Registry []rules.IGenericRule
@@ -141,6 +142,8 @@ func ParseCouchDBQueryString(data map[string]interface{}, userQueryString string
 
 func test(data interface{}, userQuery interface{}) (bool, error) {
 
+	last := true
+
 	if canDecend(userQuery) && reflect.TypeOf(userQuery).Kind() == reflect.Map {
 
 		userQuery, ok := userQuery.(map[string]interface{})
@@ -164,23 +167,44 @@ func test(data interface{}, userQuery interface{}) (bool, error) {
 					return false, err1
 				}
 
-				return matched, nil
+				last = last && matched
 
 			} else {
 
 				dvp, dk := resolveSubdocumentQuery(data, k)
 
+				var result bool
+				var err1 error
+
 				if dvp != nil && len(dk) == 1 {
-					return test(dvp[dk[0]], v)
+					result, err1 = test(dvp[dk[0]], v)
+
+				} else {
+					result, err1 = test(nil, v)
 				}
 
-				return test(nil, v)
+				if err1 != nil {
+					return false, err1
+				}
+
+				last = last && result
+
 			}
 		}
 
+		return last, nil
+
 	} else {
 
-		return rules.Eq.Match(data, userQuery)
+		bool, err1 := rules.Eq.Match(data, userQuery)
+
+		if err1 != nil {
+			return false, err1
+		}
+
+		last = last && bool
+
+		return last, nil
 	}
 
 	return false, nil

test/implicit_and_test.go

@@ -0,0 +1,51 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/wearetheledger/go-couchdb-query-engine/query"
+)
+
+func TestImplicitAnd(t *testing.T) {
+
+	t.Run("Element should be returned when owner bob & size 3 with implicit and and explicit eq", func(t *testing.T) {
+
+		res, err := query.ParseCouchDBQuery(TestData, map[string]interface{}{
+			"selector": map[string]interface{}{
+				"owner": map[string]interface{}{
+					"$eq": "bob",
+				},
+				"size": map[string]interface{}{
+					"$eq": 3,
+				},
+			},
+		})
+
+		if err != nil {
+			t.Error(err)
+		}
+
+		if len(res) != 1 {
+			t.Error("Query should have returned 1 results")
+		}
+
+	})
+
+	t.Run("Element should be returned when owner bob & size 3 with implicit and and implicit eq", func(t *testing.T) {
+
+		res, err := query.ParseCouchDBQuery(TestData, map[string]interface{}{
+			"selector": map[string]interface{}{
+				"owner": "bob",
+				"size":  3,
+			},
+		})
+
+		if err != nil {
+			t.Error(err)
+		}
+
+		if len(res) != 1 {
+			t.Error("Query should have returned 1 results")
+		}
+	})
+}