(fix): Fixed GetDecision for CompositeFeatureService and key for VisitorAttribute. (#149)

Author: yasirfolio3

pkg/decision/composite_feature_service.go

@@ -18,7 +18,6 @@
 package decision
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/optimizely/go-sdk/pkg/entities"
@@ -44,15 +43,16 @@ func NewCompositeFeatureService(compositeExperimentService ExperimentService) *C
 
 // GetDecision returns a decision for the given feature and user context
 func (f CompositeFeatureService) GetDecision(decisionContext FeatureDecisionContext, userContext entities.UserContext) (FeatureDecision, error) {
+	var featureDecision = FeatureDecision{}
+	var err error
 	for _, featureDecisionService := range f.featureServices {
-		featureDecision, err := featureDecisionService.GetDecision(decisionContext, userContext)
+		featureDecision, err = featureDecisionService.GetDecision(decisionContext, userContext)
 		if err != nil {
 			cfLogger.Debug(fmt.Sprintf("%v", err))
 		}
 		if featureDecision.Variation != nil && err == nil {
 			return featureDecision, err
 		}
 	}
-
-	return FeatureDecision{}, errors.New("no decision was made")
+	return featureDecision, err
 }

pkg/decision/composite_feature_service_test.go

@@ -128,6 +128,33 @@ func (s *CompositeFeatureServiceTestSuite) TestGetDecisionReturnsError() {
 	s.mockFeatureService2.AssertExpectations(s.T())
 }
 
+func (s *CompositeFeatureServiceTestSuite) TestGetDecisionReturnsLastDecisionWithError() {
+	// test that GetDecision returns the last decision with error if all decision services return error
+	testUserContext := entities.UserContext{
+		ID: "test_user_1",
+	}
+
+	expectedDecision := FeatureDecision{
+		Variation: &testExp1113Var2223,
+	}
+	s.mockFeatureService.On("GetDecision", s.testFeatureDecisionContext, testUserContext).Return(expectedDecision, errors.New("Error making decision"))
+
+	s.mockFeatureService2.On("GetDecision", s.testFeatureDecisionContext, testUserContext).Return(expectedDecision, errors.New("test error"))
+
+	compositeFeatureService := &CompositeFeatureService{
+		featureServices: []FeatureService{
+			s.mockFeatureService,
+			s.mockFeatureService2,
+		},
+	}
+	decision, err := compositeFeatureService.GetDecision(s.testFeatureDecisionContext, testUserContext)
+	s.Equal(expectedDecision, decision)
+	s.Error(err)
+	s.Equal(err.Error(), "test error")
+	s.mockFeatureService.AssertExpectations(s.T())
+	s.mockFeatureService2.AssertExpectations(s.T())
+}
+
 func (s *CompositeFeatureServiceTestSuite) TestNewCompositeFeatureService() {
 	// Assert that the service is instantiated with the correct child services in the right order
 	compositeExperimentService := NewCompositeExperimentService()

pkg/event/factory.go

@@ -240,7 +240,7 @@ func getEventAttributes(projectConfig pkg.ProjectConfig, attributes map[string]i
 			efLogger.Debug(fmt.Sprintf("Unrecognized attribute %s provided. Pruning before sending event to Optimizely.", key))
 			continue
 		}
-		visitorAttribute.Key = attribute.Key
+		visitorAttribute.Key = key
 		visitorAttribute.Value = value
 		visitorAttribute.AttributeType = attributeType