refact(featuremodel): Updated featuremodel variables from Array to Map. (#139)

Author: yasirfolio3

.travis.yml

@@ -39,7 +39,7 @@ jobs:
       env: GIMME_GO_VERSION=1.8.x
       before_script:
         # GO module was not introduced earlier. need symlink to search in GOPATH
-        - mkdir -p $GOPATH/src/github.com && pushd $GOPATH/src/github.com && ln -s $HOME/build/optimizely pkg && popd
+        - mkdir -p $GOPATH/src/github.com && pushd $GOPATH/src/github.com && ln -s $HOME/build/optimizely optimizely && popd
       script:
         # Need to download packages explicitly
         - go get -v -d ./...

pkg/client/client.go

@@ -248,7 +248,7 @@ func (o *OptimizelyClient) GetAllFeatureVariables(featureKey string, userContext
 		enabled = featureDecision.Variation.FeatureEnabled
 	}
 
-	for _, v := range feature.Variables {
+	for _, v := range feature.VariableMap {
 		variableMap[v.Key] = v.DefaultValue
 
 		if enabled {

pkg/client/client_test.go

@@ -1400,8 +1400,7 @@ func TestGetAllFeatureVariables(t *testing.T) {
 		Variations: map[string]entities.Variation{"22222": testVariation},
 	}
 	testFeature := getTestFeature(testFeatureKey, testExperiment)
-	testFeature.Variables = make([]entities.Variable, 1)
-	testFeature.Variables[0] = testVariable
+	testFeature.VariableMap = map[string]entities.Variable{testVariable.Key: testVariable}
 	mockConfig := getMockConfig(testFeatureKey, testVariableKey, testFeature, testVariable)
 	mockConfigManager := new(MockProjectConfigManager)
 	mockConfigManager.On("GetConfig").Return(mockConfig, nil)
@@ -1447,8 +1446,7 @@ func TestGetAllFeatureVariablesWithError(t *testing.T) {
 		Variations: map[string]entities.Variation{"22222": testVariation},
 	}
 	testFeature := getTestFeature(testFeatureKey, testExperiment)
-	testFeature.Variables = make([]entities.Variable, 1)
-	testFeature.Variables[0] = testVariable
+	testFeature.VariableMap = map[string]entities.Variable{testVariable.Key: testVariable}
 	mockConfig := getMockConfig(testFeatureKey, testVariableKey, testFeature, testVariable)
 	mockConfigManager := new(MockProjectConfigManager)
 	mockConfigManager.On("GetConfig").Return(mockConfig, nil)

pkg/config/datafileprojectconfig/config.go

@@ -99,12 +99,10 @@ func (c DatafileProjectConfig) GetVariableByKey(featureKey, variableKey string)
 	var variable entities.Variable
 	var err = fmt.Errorf(`variable with key "%s" not found`, featureKey)
 	if feature, ok := c.featureMap[featureKey]; ok {
-		for _, v := range feature.Variables {
-			if v.Key == variableKey {
-				variable = v
-				err = nil
-				break
-			}
+
+		if v, ok := feature.VariableMap[variableKey]; ok {
+			variable = v
+			err = nil
 		}
 	}
 	return variable, err

pkg/config/datafileprojectconfig/config_test.go

@@ -157,11 +157,10 @@ func TestGetVariableByKey(t *testing.T) {
 		Key: variableKey,
 	}
 
-	variables := make([]entities.Variable, 1)
-	variables[0] = variable
+	variableMap := map[string]entities.Variable{variable.Key: variable}
 
 	feature := entities.Feature{
-		Variables: variables,
+		VariableMap: variableMap,
 	}
 
 	featureMap := make(map[string]entities.Feature)

pkg/config/datafileprojectconfig/mappers/feature.go

@@ -42,17 +42,17 @@ func MapFeatures(featureFlags []datafileEntities.FeatureFlag, rolloutMap map[str
 			}
 		}
 
-		var variables = []entities.Variable{}
+		variableMap := map[string]entities.Variable{}
 		for _, variable := range featureFlag.Variables {
-			variables = append(variables, entities.Variable{
+			variableMap[variable.Key] = entities.Variable{
 				DefaultValue: variable.DefaultValue,
 				ID:           variable.ID,
 				Key:          variable.Key,
-				Type:         variable.Type})
+				Type:         variable.Type}
 		}
 
 		feature.FeatureExperiments = featureExperiments
-		feature.Variables = variables
+		feature.VariableMap = variableMap
 		featureMap[featureFlag.Key] = feature
 	}
 	return featureMap

pkg/config/datafileprojectconfig/mappers/feature_test.go

@@ -19,7 +19,7 @@ package mappers
 import (
 	"testing"
 
-	"github.com/json-iterator/go"
+	jsoniter "github.com/json-iterator/go"
 	datafileEntities "github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"
 	"github.com/optimizely/go-sdk/pkg/entities"
 	"github.com/stretchr/testify/assert"
@@ -62,7 +62,7 @@ func TestMapFeatures(t *testing.T) {
 			Key:                "test_feature_21111",
 			Rollout:            rollout,
 			FeatureExperiments: []entities.Experiment{experiment31111, experiment31112},
-			Variables:          []entities.Variable{variable},
+			VariableMap:        map[string]entities.Variable{variable.Key: variable},
 		},
 	}
 

pkg/entities/feature.go

@@ -23,7 +23,7 @@ type Feature struct {
 	Key                string
 	FeatureExperiments []Experiment
 	Rollout            Rollout
-	Variables          []Variable
+	VariableMap        map[string]Variable
 }
 
 // Rollout represents a feature rollout