Fix lt and lte operators (#150)

Signed-off-by: Clément Salaün <[email protected]> Co-authored-by: Maxence Maireaux <[email protected]>
formancehq · Feb 3, 2022 · a4fe5fa · a4fe5fa
1 parent a35c801
commit a4fe5fa
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 4 deletions.
diff --git a/pkg/core/expr.go b/pkg/core/expr.go
@@ -92,7 +92,7 @@ type ExprLt struct {
 }
 
 func (o *ExprLt) Eval(ctx EvalContext) bool {
-	return o.Op1.eval(ctx).(float64) > o.Op2.eval(ctx).(float64)
+	return o.Op1.eval(ctx).(float64) < o.Op2.eval(ctx).(float64)
 }
 
 func (e ExprLt) MarshalJSON() ([]byte, error) {
@@ -122,7 +122,7 @@ type ExprLte struct {
 }
 
 func (o *ExprLte) Eval(ctx EvalContext) bool {
-	return o.Op1.eval(ctx).(float64) >= o.Op2.eval(ctx).(float64)
+	return o.Op1.eval(ctx).(float64) <= o.Op2.eval(ctx).(float64)
 }
 
 func (e ExprLte) MarshalJSON() ([]byte, error) {

diff --git a/pkg/core/expr_test.go b/pkg/core/expr_test.go
@@ -3,8 +3,9 @@ package core
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestRules(t *testing.T) {
@@ -44,6 +45,57 @@ func TestRules(t *testing.T) {
 			},
 			shouldBeAccepted: true,
 		},
+		{
+			rule: map[string]interface{}{
+				"$or": []interface{}{
+					map[string]interface{}{
+						"$gte": []interface{}{
+							"$balance", float64(0),
+						},
+					},
+					map[string]interface{}{
+						"$lte": []interface{}{
+							"$balance", float64(0),
+						},
+					},
+				},
+			},
+			context: EvalContext{
+				Variables: map[string]interface{}{
+					"balance": float64(-100),
+				},
+				Metadata: map[string]json.RawMessage{},
+			},
+			shouldBeAccepted: true,
+		},
+		{
+			rule: map[string]interface{}{
+				"$lt": []interface{}{
+					"$balance", float64(0),
+				},
+			},
+			context: EvalContext{
+				Variables: map[string]interface{}{
+					"balance": float64(100),
+				},
+				Metadata: map[string]json.RawMessage{},
+			},
+			shouldBeAccepted: false,
+		},
+		{
+			rule: map[string]interface{}{
+				"$lte": []interface{}{
+					"$balance", float64(0),
+				},
+			},
+			context: EvalContext{
+				Variables: map[string]interface{}{
+					"balance": float64(0),
+				},
+				Metadata: map[string]json.RawMessage{},
+			},
+			shouldBeAccepted: true,
+		},
 		{
 			rule: map[string]interface{}{
 				"$and": []interface{}{

diff --git a/pkg/ledger/ledger.go b/pkg/ledger/ledger.go
@@ -3,9 +3,10 @@ package ledger
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/numary/ledger/pkg/storage"
 	"github.com/pkg/errors"
-	"time"
 
 	"github.com/numary/ledger/pkg/core"
 	"github.com/numary/ledger/pkg/ledger/query"