Allow the reduce function work with string values (#54)

* Added test array with string * Allow the reduce function work with string values * Update unsupported type for reduce Co-authored-by: Juliano Galgaro <[email protected]>
diegoholiveira · Jul 21, 2022 · d34d6a7 · d34d6a7
1 parent b3253f2
commit d34d6a7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/arrays.go b/arrays.go
@@ -102,6 +102,9 @@ func reduce(values, data interface{}) interface{} {
 		} else if isNumber(parsed[2]) {
 			accumulator = toNumber(parsed[2])
 			valueType = "number"
+		} else if isString(parsed[2]) {
+			accumulator = toString(parsed[2])
+			valueType = "string"
 		} else {
 			panic(ErrReduceDataType{
 				dataType: fmt.Sprintf("%T", parsed[2]),
@@ -129,6 +132,8 @@ func reduce(values, data interface{}) interface{} {
 			context["accumulator"] = isTrue(v)
 		case "number":
 			context["accumulator"] = toNumber(v)
+		case "string":
+			context["accumulator"] = toString(v)
 		}
 	}
 

diff --git a/arrays_test.go b/arrays_test.go
@@ -88,3 +88,24 @@ func TestReduceBoolValues(t *testing.T) {
 
 	assert.Equal(t, expected, result)
 }
+
+func TestReduceStringValues(t *testing.T) {
+	var parsed interface{}
+
+	err := json.Unmarshal([]byte(`[
+		["a",null,"b"],
+		{"cat":[{"var":"current"}, {"var":"accumulator"}]},
+		""
+	]`), &parsed)
+	if err != nil {
+		panic(err)
+	}
+
+	result := reduce(parsed, nil)
+
+	var expected interface{}
+
+	json.Unmarshal([]byte(`"ba"`), &expected) // nolint:errcheck
+
+	assert.Equal(t, expected, result)
+}
diff --git a/jsonlogic_test.go b/jsonlogic_test.go
@@ -593,7 +593,7 @@ func TestReduceFilterAndNotContains(t *testing.T) {
 }
 
 func TestReduceWithUnsupportedValue(t *testing.T) {
-	b := []byte(`{"reduce":[{"filter":[{"var":"data"},{"==":[{"var":""},""]}]},{"cat":[{"var":"current"},{"var":"accumulator"}]},"str"]}`)
+	b := []byte(`{"reduce":[{"filter":[{"var":"data"},{"==":[{"var":""},""]}]},{"cat":[{"var":"current"},{"var":"accumulator"}]},null]}`)
 
 	rule := map[string]interface{}{}
 	_ = json.Unmarshal(b, &rule)
@@ -602,7 +602,7 @@ func TestReduceWithUnsupportedValue(t *testing.T) {
 	}
 
 	_, err := ApplyInterface(rule, data)
-	assert.EqualError(t, err, "The type \"string\" is not supported")
+	assert.EqualError(t, err, "The type \"<nil>\" is not supported")
 }
 
 func TestAddOperator(t *testing.T) {