update to provide custom seed and target key in single argument

Signed-off-by: Cole Bailey <[email protected]>

core/pkg/evaluator/fractional.go

@@ -56,25 +56,20 @@ func parseFractionalEvaluationData(values, data any) (string, []fractionalEvalua
 	if ok {
 		valuesArray = valuesArray[1:]
 	} else {
-		bucketBy, ok = dataMap[targetingKeyKey].(string)
+		targetingKey, ok := dataMap[targetingKeyKey].(string)
 		if !ok {
 			return "", nil, errors.New("bucketing value not supplied and no targetingKey in context")
 		}
-	}
 
-	seed, ok := valuesArray[0].(string)
-	if ok {
-		valuesArray = valuesArray[1:]
-	} else {
-		seed = properties.FlagKey
+		bucketBy = fmt.Sprintf("%s%s", properties.FlagKey, targetingKey)
 	}
 
 	feDistributions, err := parseFractionalEvaluationDistributions(valuesArray)
 	if err != nil {
 		return "", nil, err
 	}
 
-	return fmt.Sprintf("%s%s", seed, bucketBy), feDistributions, nil
+	return bucketBy, feDistributions, nil
 }
 
 func parseFractionalEvaluationDistributions(values []any) ([]fractionalEvaluationDistribution, error) {
@@ -121,6 +116,8 @@ func distributeValue(value string, feDistribution []fractionalEvaluationDistribu
 	hashRatio := math.Abs(float64(hashValue)) / math.MaxInt32
 	bucket := int(hashRatio * 100) // in range [0, 100]
 
+	fmt.Println(value, feDistribution)
+
 	rangeEnd := 0
 	for _, dist := range feDistribution {
 		rangeEnd += dist.percentage

core/pkg/evaluator/fractional_test.go

@@ -29,8 +29,7 @@ func TestFractionalEvaluation(t *testing.T) {
 											  },
 											  {
 												"fractional": [
-												  {"var": "email"},
-												  {"var": "$flagd.flagKey"},
+												  {"cat": [{"var": "$flagd.flagKey"}, {"var": "email"}]},
 												  [
 												  "red",
 												  25
@@ -70,8 +69,7 @@ func TestFractionalEvaluation(t *testing.T) {
 						},
 						{
 						"fractional": [
-							{"var": "email"},
-							"my-seed",
+							{"cat": ["my-seed", {"var": "email"}]},
 							["red",25],
 							["blue",25],
 							["green",25],
@@ -226,59 +224,6 @@ func TestFractionalEvaluation(t *testing.T) {
 			expectedValue:   "#FF0000",
 			expectedReason:  model.TargetingMatchReason,
 		},
-		"[email protected] with default seed": {
-			flags: Flags{
-				Flags: map[string]model.Flag{
-					"headerColor": {
-						State:          "ENABLED",
-						DefaultVariant: "red",
-						Variants: map[string]any{
-							"red":    "#FF0000",
-							"blue":   "#0000FF",
-							"green":  "#00FF00",
-							"yellow": "#FFFF00",
-						},
-						Targeting: []byte(`{
-							"if": [
-								{
-									"in": ["@faas.com", {
-										"var": ["email"]
-									}]
-								},
-								{
-									"fractional": [
-										{"var": "email"},
-										[
-										"red",
-										25
-									  	],
-									  	[
-										"blue",
-										25
-										],
-										[
-										"green",
-										25
-									  	],
-									  	[
-										"yellow",
-										25
-									  	]
-									]
-								}, null
-							]
-						}`),
-					},
-				},
-			},
-			flagKey: "headerColor",
-			context: map[string]any{
-				"email": "[email protected]",
-			},
-			expectedVariant: "green",
-			expectedValue:   "#00FF00",
-			expectedReason:  model.TargetingMatchReason,
-		},
 		"non even split": {
 			flags: Flags{
 				Flags: map[string]model.Flag{