Implement more basic operators

Co-authored-by: Koen Bollen <[email protected]>

Author: erikdubbelboer

README.md

@@ -13,8 +13,8 @@ Let's filter some lobbies in a multiplayer game:
   "$and": [
     {
       "$or": [                                // match two maps
-        { "map": { "$contains": "aztec" } },
-        { "map": { "$contains": "nuke" } }
+        { "map": { "$regex": "aztec" } },
+        { "map": { "$regex": "nuke" } }
       ]
     },
     { "password": "" },                       // no password set
@@ -27,15 +27,15 @@ Let's filter some lobbies in a multiplayer game:
 Converts to:
 ```sql
 (
-  "customdata"->>"map" LIKE ?
+  "customdata"->>"map" ~* $1
   OR
-  "customdata"->>"map" LIKE ?
-) 
-AND "password" = ? 
+  "customdata"->>"map" ~* $2
+)
+AND "password" = $3
 AND (
-  "playerCount" >= ?
+  "playerCount" >= $4
   AND
-  "playerCount" < ?
+  "playerCount" < $5
 )
 ```
 And values:

examples/basic_test.go

@@ -21,8 +21,8 @@ func ExampleNewConverter() {
 	}
 
 	fmt.Println(conditions)
-	fmt.Println(values)
+	fmt.Printf("%#v\n", values)
 	// Output:
-	// "meta"->>'name' = $1 AND "created_at" >= $2
-	// [John 2020-01-01T00:00:00Z]
+	// (("created_at" >= $1) AND ("meta"->>'name' = $2))
+	// []interface {}{"2020-01-01T00:00:00Z", "John"}
 }

examples/readme_test.go

@@ -0,0 +1,37 @@
+package examples
+
+import (
+	"fmt"
+
+	"github.com/poki/mongodb-filter-to-postgres/filter"
+)
+
+func ExampleNewConverter_README() {
+	converter := filter.NewConverter(filter.WithNestedJSONB("meta", "created_at", "updated_at"))
+
+	mongoFilterQuery := `{
+		"$and": [
+			{
+				"$or": [
+					{ "map": { "$regex": "aztec" } },
+					{ "map": { "$regex": "nuke" } }
+				]
+			},
+			{ "password": "" },
+			{
+				"playerCount": { "$gte": 2, "$lt": 10 }
+			}
+		]
+	}`
+	conditions, values, err := converter.Convert([]byte(mongoFilterQuery))
+	if err != nil {
+		panic(err)
+		// handle error
+	}
+
+	fmt.Println(conditions)
+	fmt.Printf("%#v\n", values)
+	// Output:
+	// ((("meta"->>'map' ~* ?) OR ("meta"->>'map' ~* ?)) AND ("meta"->>'password' = $3) AND (("meta"->>'playerCount' >= $4) AND ("meta"->>'playerCount' < $5)))
+	// []interface {}{"aztec", "nuke", "", 2, 10}
+}

filter/converter.go

@@ -8,8 +8,13 @@ import (
 )
 
 var BasicOperatorMap = map[string]string{
-	"$gt":  ">",
-	"$gte": ">=",
+	"$gt":    ">",
+	"$gte":   ">=",
+	"$lt":    "<",
+	"$lte":   "<=",
+	"$eq":    "=",
+	"$ne":    "!=",
+	"$regex": "~*",
 }
 
 type Converter struct {

filter/converter_test.go

@@ -153,6 +153,22 @@ func TestConverter_Convert(t *testing.T) {
 			[]any{"John", float64(3)},
 			nil,
 		},
+		{
+			"basic contains operator",
+			nil,
+			`{"name": {"$regex": "John"}}`,
+			`("name" ~* $1)`,
+			[]any{"John"},
+			nil,
+		},
+		{
+			"complex contains operator",
+			nil,
+			`{"$or": [{"name": {"$regex": "John"}}, {"name": {"$regex": "Jane"}}]}`,
+			`(("name" ~* $1) OR ("name" ~* $2))`,
+			[]any{"John", "Jane"},
+			nil,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {