refact: Changes needed for agent (#305)

Author: pawels-optimizely

pkg/client/client.go

@@ -167,7 +167,7 @@ func (o *OptimizelyClient) decideForKeys(userContext OptimizelyUserContext, keys
 	enabledFlagsOnly := o.getAllOptions(options).EnabledFlagsOnly
 	for _, key := range keys {
 		optimizelyDecision := o.decide(userContext, key, options)
-		if !enabledFlagsOnly || optimizelyDecision.GetEnabled() {
+		if !enabledFlagsOnly || optimizelyDecision.Enabled {
 			decisionMap[key] = optimizelyDecision
 		}
 	}

pkg/client/optimizely_decision.go

@@ -23,69 +23,34 @@ import (
 
 // OptimizelyDecision defines the decision returned by decide api.
 type OptimizelyDecision struct {
-	variationKey string
-	enabled      bool
-	variables    *optimizelyjson.OptimizelyJSON
-	ruleKey      string
-	flagKey      string
-	userContext  OptimizelyUserContext
-	reasons      []string
+	VariationKey string                         `json:"variationKey"`
+	Enabled      bool                           `json:"enabled"`
+	Variables    *optimizelyjson.OptimizelyJSON `json:"-"`
+	RuleKey      string                         `json:"ruleKey"`
+	FlagKey      string                         `json:"flagKey"`
+	UserContext  OptimizelyUserContext          `json:"userContext"`
+	Reasons      []string                       `json:"reasons"`
 }
 
 // NewOptimizelyDecision creates and returns a new instance of OptimizelyDecision
 func NewOptimizelyDecision(variationKey, ruleKey, flagKey string, enabled bool, variables *optimizelyjson.OptimizelyJSON, userContext OptimizelyUserContext, reasons []string) OptimizelyDecision {
 	return OptimizelyDecision{
-		variationKey: variationKey,
-		enabled:      enabled,
-		variables:    variables,
-		ruleKey:      ruleKey,
-		flagKey:      flagKey,
-		userContext:  userContext,
-		reasons:      reasons,
+		VariationKey: variationKey,
+		Enabled:      enabled,
+		Variables:    variables,
+		RuleKey:      ruleKey,
+		FlagKey:      flagKey,
+		UserContext:  userContext,
+		Reasons:      reasons,
 	}
 }
 
 // NewErrorDecision returns a decision with error
 func NewErrorDecision(key string, user OptimizelyUserContext, err error) OptimizelyDecision {
 	return OptimizelyDecision{
-		flagKey:     key,
-		userContext: user,
-		variables:   &optimizelyjson.OptimizelyJSON{},
-		reasons:     []string{err.Error()},
+		FlagKey:     key,
+		UserContext: user,
+		Variables:   &optimizelyjson.OptimizelyJSON{},
+		Reasons:     []string{err.Error()},
 	}
 }
-
-// GetVariationKey returns variation key for optimizely decision.
-func (o OptimizelyDecision) GetVariationKey() string {
-	return o.variationKey
-}
-
-// GetEnabled returns the boolean value indicating if the flag is enabled or not.
-func (o OptimizelyDecision) GetEnabled() bool {
-	return o.enabled
-}
-
-// GetVariables returns the collection of variables associated with the decision.
-func (o OptimizelyDecision) GetVariables() *optimizelyjson.OptimizelyJSON {
-	return o.variables
-}
-
-// GetRuleKey returns the rule key of the decision.
-func (o OptimizelyDecision) GetRuleKey() string {
-	return o.ruleKey
-}
-
-// GetFlagKey returns the flag key for which the decision was made.
-func (o OptimizelyDecision) GetFlagKey() string {
-	return o.flagKey
-}
-
-// GetUserContext returns the user context for which the  decision was made.
-func (o OptimizelyDecision) GetUserContext() OptimizelyUserContext {
-	return o.userContext
-}
-
-// GetReasons returns an array of error/info/debug messages describing why the decision has been made.
-func (o OptimizelyDecision) GetReasons() []string {
-	return o.reasons
-}

pkg/client/optimizely_decision_test.go

@@ -48,13 +48,13 @@ func (s *OptimizelyDecisionTestSuite) TestOptimizelyDecision() {
 	optimizelyUserContext := s.OptimizelyClient.CreateUserContext(userID, attributes)
 	decision := NewOptimizelyDecision(variationKey, ruleKey, flagKey, enabled, variables, optimizelyUserContext, reasons)
 
-	s.Equal(variationKey, decision.GetVariationKey())
-	s.Equal(enabled, decision.GetEnabled())
-	s.Equal(variables, decision.GetVariables())
-	s.Equal(ruleKey, decision.GetRuleKey())
-	s.Equal(flagKey, decision.GetFlagKey())
-	s.Equal(reasons, decision.GetReasons())
-	s.Equal(optimizelyUserContext, decision.GetUserContext())
+	s.Equal(variationKey, decision.VariationKey)
+	s.Equal(enabled, decision.Enabled)
+	s.Equal(variables, decision.Variables)
+	s.Equal(ruleKey, decision.RuleKey)
+	s.Equal(flagKey, decision.FlagKey)
+	s.Equal(reasons, decision.Reasons)
+	s.Equal(optimizelyUserContext, decision.UserContext)
 }
 
 func (s *OptimizelyDecisionTestSuite) TestNewErrorDecision() {
@@ -65,14 +65,14 @@ func (s *OptimizelyDecisionTestSuite) TestNewErrorDecision() {
 	optimizelyUserContext := s.OptimizelyClient.CreateUserContext(userID, attributes)
 	decision := NewErrorDecision(flagKey, optimizelyUserContext, errors.New(errorString))
 
-	s.Equal("", decision.GetVariationKey())
-	s.Equal(false, decision.GetEnabled())
-	s.Equal(&optimizelyjson.OptimizelyJSON{}, decision.GetVariables())
-	s.Equal("", decision.GetRuleKey())
-	s.Equal(flagKey, decision.GetFlagKey())
-	s.Equal(1, len(decision.GetReasons()))
-	s.Equal(optimizelyUserContext, decision.GetUserContext())
-	s.Equal(errorString, decision.GetReasons()[0])
+	s.Equal("", decision.VariationKey)
+	s.Equal(false, decision.Enabled)
+	s.Equal(&optimizelyjson.OptimizelyJSON{}, decision.Variables)
+	s.Equal("", decision.RuleKey)
+	s.Equal(flagKey, decision.FlagKey)
+	s.Equal(1, len(decision.Reasons))
+	s.Equal(optimizelyUserContext, decision.UserContext)
+	s.Equal(errorString, decision.Reasons[0])
 }
 
 func TestOptimizelyDecisionTestSuite(t *testing.T) {

pkg/client/optimizely_user_context.go

@@ -26,8 +26,9 @@ import (
 
 // OptimizelyUserContext defines user contexts that the SDK will use to make decisions for.
 type OptimizelyUserContext struct {
-	userID     string
-	attributes map[string]interface{}
+	UserID     string
+	Attributes map[string]interface{}
+
 	optimizely *OptimizelyClient
 	mutex      *sync.RWMutex
 }
@@ -41,8 +42,8 @@ func newOptimizelyUserContext(optimizely *OptimizelyClient, userID string, attri
 	attributesCopy := copyUserAttributes(attributes)
 
 	return OptimizelyUserContext{
-		userID:     userID,
-		attributes: attributesCopy,
+		UserID:     userID,
+		Attributes: attributesCopy,
 		optimizely: optimizely,
 		mutex:      new(sync.RWMutex),
 	}
@@ -55,24 +56,24 @@ func (o OptimizelyUserContext) GetOptimizely() *OptimizelyClient {
 
 // GetUserID returns userID for Optimizely user context
 func (o OptimizelyUserContext) GetUserID() string {
-	return o.userID
+	return o.UserID
 }
 
 // GetUserAttributes returns user attributes for Optimizely user context
 func (o OptimizelyUserContext) GetUserAttributes() map[string]interface{} {
 	o.mutex.RLock()
 	defer o.mutex.RUnlock()
-	return copyUserAttributes(o.attributes)
+	return copyUserAttributes(o.Attributes)
 }
 
 // SetAttribute sets an attribute for a given key.
 func (o *OptimizelyUserContext) SetAttribute(key string, value interface{}) {
 	o.mutex.Lock()
 	defer o.mutex.Unlock()
-	if o.attributes == nil {
-		o.attributes = make(map[string]interface{})
+	if o.Attributes == nil {
+		o.Attributes = make(map[string]interface{})
 	}
-	o.attributes[key] = value
+	o.Attributes[key] = value
 }
 
 // Decide returns a decision result for a given flag key and a user context, which contains