Add unit tests for datafile project config. (#103)

Author: Mike Davis

optimizely/config/datafileprojectconfig/config.go

@@ -18,7 +18,6 @@
 package datafileprojectconfig
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig/mappers"
@@ -76,47 +75,13 @@ func (c DatafileProjectConfig) GetBotFiltering() bool {
 	return c.botFiltering
 }
 
-// NewDatafileProjectConfig initializes a new datafile from a json byte array using the default JSON datafile parser
-func NewDatafileProjectConfig(jsonDatafile []byte) (*DatafileProjectConfig, error) {
-	datafile, err := Parse(jsonDatafile)
-	if err != nil {
-		logger.Error("Error parsing datafile.", err)
-		return nil, err
-	}
-
-	attributeMap, attributeKeyToIDMap := mappers.MapAttributes(datafile.Attributes)
-	experimentMap, experimentKeyMap := mappers.MapExperiments(datafile.Experiments)
-	rolloutMap := mappers.MapRollouts(datafile.Rollouts)
-	eventMap := mappers.MapEvents(datafile.Events)
-	mergedAudiences := append(datafile.TypedAudiences, datafile.Audiences...)
-	config := &DatafileProjectConfig{
-		accountID:            datafile.AccountID,
-		anonymizeIP:          datafile.AnonymizeIP,
-		attributeKeyToIDMap:  attributeKeyToIDMap,
-		audienceMap:          mappers.MapAudiences(mergedAudiences),
-		attributeMap:         attributeMap,
-		botFiltering:         datafile.BotFiltering,
-		experimentKeyToIDMap: experimentKeyMap,
-		experimentMap:        experimentMap,
-		eventMap:             eventMap,
-		featureMap:           mappers.MapFeatures(datafile.FeatureFlags, rolloutMap, experimentMap),
-		projectID:            datafile.ProjectID,
-		revision:             datafile.Revision,
-		rolloutMap:           rolloutMap,
-	}
-
-	logger.Info("Datafile is valid.")
-	return config, nil
-}
-
 // GetEventByKey returns the event with the given key
 func (c DatafileProjectConfig) GetEventByKey(eventKey string) (entities.Event, error) {
 	if event, ok := c.eventMap[eventKey]; ok {
 		return event, nil
 	}
 
-	errMessage := fmt.Sprintf("Event with key %s not found", eventKey)
-	return entities.Event{}, errors.New(errMessage)
+	return entities.Event{}, fmt.Errorf(`event with key "%s" not found`, eventKey)
 }
 
 // GetFeatureByKey returns the feature with the given key
@@ -125,15 +90,14 @@ func (c DatafileProjectConfig) GetFeatureByKey(featureKey string) (entities.Feat
 		return feature, nil
 	}
 
-	errMessage := fmt.Sprintf("Feature with key %s not found", featureKey)
-	return entities.Feature{}, errors.New(errMessage)
+	return entities.Feature{}, fmt.Errorf(`feature with key "%s" not found`, featureKey)
 }
 
 // GetVariableByKey returns the featureVariable with the given key
 func (c DatafileProjectConfig) GetVariableByKey(featureKey, variableKey string) (entities.Variable, error) {
 
 	var variable entities.Variable
-	var err = fmt.Errorf("variable with key %s not found", featureKey)
+	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 {
@@ -149,11 +113,12 @@ func (c DatafileProjectConfig) GetVariableByKey(featureKey, variableKey string)
 // GetAttributeByKey returns the attribute with the given key
 func (c DatafileProjectConfig) GetAttributeByKey(key string) (entities.Attribute, error) {
 	if attributeID, ok := c.attributeKeyToIDMap[key]; ok {
-		return c.attributeMap[attributeID], nil
+		if attribute, ok := c.attributeMap[attributeID]; ok {
+			return attribute, nil
+		}
 	}
 
-	errMessage := fmt.Sprintf(`Attribute with key "%s" not found`, key)
-	return entities.Attribute{}, errors.New(errMessage)
+	return entities.Attribute{}, fmt.Errorf(`attribute with key "%s" not found`, key)
 }
 
 // GetFeatureList returns an array of all the features
@@ -170,8 +135,7 @@ func (c DatafileProjectConfig) GetAudienceByID(audienceID string) (entities.Audi
 		return audience, nil
 	}
 
-	errMessage := fmt.Sprintf(`Audience with ID "%s" not found`, audienceID)
-	return entities.Audience{}, errors.New(errMessage)
+	return entities.Audience{}, fmt.Errorf(`audience with ID "%s" not found`, audienceID)
 }
 
 // GetAudienceMap returns the audience map
@@ -182,12 +146,12 @@ func (c DatafileProjectConfig) GetAudienceMap() map[string]entities.Audience {
 // GetExperimentByKey returns the experiment with the given key
 func (c DatafileProjectConfig) GetExperimentByKey(experimentKey string) (entities.Experiment, error) {
 	if experimentID, ok := c.experimentKeyToIDMap[experimentKey]; ok {
-		experiment := c.experimentMap[experimentID]
-		return experiment, nil
+		if experiment, ok := c.experimentMap[experimentID]; ok {
+			return experiment, nil
+		}
 	}
 
-	errMessage := fmt.Sprintf(`Experiment with key "%s" not found`, experimentKey)
-	return entities.Experiment{}, errors.New(errMessage)
+	return entities.Experiment{}, fmt.Errorf(`experiment with key "%s" not found`, experimentKey)
 }
 
 // GetGroupByID returns the group with the given ID
@@ -196,6 +160,38 @@ func (c DatafileProjectConfig) GetGroupByID(groupID string) (entities.Group, err
 		return group, nil
 	}
 
-	errMessage := fmt.Sprintf(`Group with ID "%s" not found`, groupID)
-	return entities.Group{}, errors.New(errMessage)
+	return entities.Group{}, fmt.Errorf(`group with ID "%s" not found`, groupID)
+}
+
+// NewDatafileProjectConfig initializes a new datafile from a json byte array using the default JSON datafile parser
+func NewDatafileProjectConfig(jsonDatafile []byte) (*DatafileProjectConfig, error) {
+	datafile, err := Parse(jsonDatafile)
+	if err != nil {
+		logger.Error("Error parsing datafile.", err)
+		return nil, err
+	}
+
+	attributeMap, attributeKeyToIDMap := mappers.MapAttributes(datafile.Attributes)
+	experimentMap, experimentKeyMap := mappers.MapExperiments(datafile.Experiments)
+	rolloutMap := mappers.MapRollouts(datafile.Rollouts)
+	eventMap := mappers.MapEvents(datafile.Events)
+	mergedAudiences := append(datafile.TypedAudiences, datafile.Audiences...)
+	config := &DatafileProjectConfig{
+		accountID:            datafile.AccountID,
+		anonymizeIP:          datafile.AnonymizeIP,
+		attributeKeyToIDMap:  attributeKeyToIDMap,
+		audienceMap:          mappers.MapAudiences(mergedAudiences),
+		attributeMap:         attributeMap,
+		botFiltering:         datafile.BotFiltering,
+		experimentKeyToIDMap: experimentKeyMap,
+		experimentMap:        experimentMap,
+		eventMap:             eventMap,
+		featureMap:           mappers.MapFeatures(datafile.FeatureFlags, rolloutMap, experimentMap),
+		projectID:            datafile.ProjectID,
+		revision:             datafile.Revision,
+		rolloutMap:           rolloutMap,
+	}
+
+	logger.Info("Datafile is valid.")
+	return config, nil
 }