updates

Author: evisdrenova

worker/internal/benthos/transformers/fullName.go

@@ -9,20 +9,24 @@ import (
 
 func init() {
 
-	spec := bloblang.NewPluginSpec().
-		Param(bloblang.NewBoolParam("preserve_length"))
+	spec := bloblang.NewPluginSpec().Param(bloblang.NewStringParam(("name"))).Param(bloblang.NewBoolParam("preserve_length"))
 
 	// register the plugin
-	err := bloblang.RegisterMethodV2("fullnametransformer", spec, func(args *bloblang.ParsedParams) (bloblang.Method, error) {
+	err := bloblang.RegisterFunctionV2("fullnametransformer", spec, func(args *bloblang.ParsedParams) (bloblang.Function, error) {
+
+		name, err := args.GetString("name")
+		if err != nil {
+			return nil, err
+		}
 
 		preserveLength, err := args.GetBool("preserve_length")
 		if err != nil {
 			return nil, err
 		}
-		return bloblang.StringMethod(func(s string) (any, error) {
-			res, err := GenerateFullName(s, preserveLength)
+		return func() (any, error) {
+			res, err := GenerateFullName(name, preserveLength)
 			return res, err
-		}), nil
+		}, nil
 	})
 
 	if err != nil {
@@ -32,15 +36,21 @@ func init() {
 }
 
 // generates a random full name
-func GenerateFullName(fn string, pl bool) (string, error) {
+func GenerateFullName(name string, pl bool) (string, error) {
 
-	if !pl {
-		res, err := GenerateFullNameWithRandomLength()
-		return res, err
+	if name != "" {
+		if !pl {
+			res, err := GenerateFullNameWithRandomLength()
+			return res, err
+		} else {
+			res, err := GenerateFullNameWithLength(name)
+			return res, err
+		}
 	} else {
-		res, err := GenerateFullNameWithLength(fn)
+		res, err := GenerateFullNameWithRandomLength()
 		return res, err
 	}
+
 }
 
 // main transformer logic goes here

worker/internal/benthos/transformers/fullName_test.go

@@ -1,6 +1,7 @@
 package neosync_transformers
 
 import (
+	"fmt"
 	"strings"
 	"testing"
 
@@ -29,15 +30,27 @@ func TestProcessFullNamePreserveLengthFalse(t *testing.T) {
 	assert.IsType(t, "", res, "The full name should be a string") // Check if the result is a string
 }
 
-func TestFullNameTransformer(t *testing.T) {
-	mapping := `root = this.fullnametransformer(true)`
+func TestFullNameTransformerWithValue(t *testing.T) {
+	testVal := "john smith"
+	mapping := fmt.Sprintf(`root = fullnametransformer(%q,true)`, testVal)
 	ex, err := bloblang.Parse(mapping)
 	assert.NoError(t, err, "failed to parse the full name transformer")
 
-	testVal := "john smith"
-
 	res, err := ex.Query(testVal)
 	assert.NoError(t, err)
 
 	assert.Len(t, res.(string), len(testVal), "Generated full name must be as long as input full name")
 }
+
+func TestFullNameTransformerWithNoValue(t *testing.T) {
+	testVal := ""
+	mapping := fmt.Sprintf(`root = fullnametransformer(%q,true)`, testVal)
+	ex, err := bloblang.Parse(mapping)
+	assert.NoError(t, err, "failed to parse the full name transformer")
+
+	res, err := ex.Query(testVal)
+	assert.NoError(t, err)
+
+	assert.IsType(t, res.(string), "", "Generated first name must be a string")
+	assert.NotEmpty(t, res.(string))
+}

worker/pkg/workflows/datasync/activities/activities.go

@@ -579,7 +579,7 @@ func computeMutationFunction(col *mgmtv1alpha1.JobMapping) (string, error) {
 		return fmt.Sprintf("this.%s.lastnametransformer(%t)", col.Column, pl), nil
 	case "full_name":
 		pl := col.Transformer.Config.GetFullNameConfig().PreserveLength
-		return fmt.Sprintf("this.%s.fullnametransformer(%t)", col.Column, pl), nil
+		return fmt.Sprintf("fullnametransformer(%s,%t)", col.Column, pl), nil
 	case "phone_number":
 		pl := col.Transformer.Config.GetPhoneNumberConfig().PreserveLength
 		ef := col.Transformer.Config.GetPhoneNumberConfig().E164Format