Merge pull request #5 from subiradhikari/FFM-518

Ffm 518

Author: hannah-tang

client/client_test.go

@@ -145,7 +145,7 @@ func target() *evaluation.Target {
 		Lastname("Doe").
 		Email("[email protected]").
 		Build()
-	return target
+	return &target
 }
 
 var ValidAuthResponse = func(req *http.Request) (*http.Response, error) {

client/config.go

@@ -4,6 +4,8 @@ import (
 	"log"
 	"net/http"
 
+	"github.com/drone/ff-golang-server-sdk/evaluation"
+
 	"github.com/drone/ff-golang-server-sdk/cache"
 	"github.com/drone/ff-golang-server-sdk/logger"
 	"github.com/drone/ff-golang-server-sdk/storage"
@@ -19,6 +21,7 @@ type config struct {
 	httpClient   *http.Client
 	enableStream bool
 	enableStore  bool
+	target       evaluation.Target
 }
 
 func newDefaultConfig() *config {

client/options.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/drone/ff-golang-server-sdk/cache"
+	"github.com/drone/ff-golang-server-sdk/evaluation"
 	"github.com/drone/ff-golang-server-sdk/logger"
 	"github.com/drone/ff-golang-server-sdk/storage"
 )
@@ -73,3 +74,10 @@ func WithHTTPClient(client *http.Client) ConfigOption {
 		config.httpClient = client
 	}
 }
+
+// WithTarget sets target
+func WithTarget(target evaluation.Target) ConfigOption {
+	return func(config *config) {
+		config.target = target
+	}
+}

dto/target_builder.go

@@ -14,7 +14,7 @@ type TargetBuilderInterface interface {
 	Name(string) TargetBuilderInterface
 	Anonymous(bool) TargetBuilderInterface
 	Custom(name string, value interface{}) TargetBuilderInterface
-	Build() *evaluation.Target
+	Build() evaluation.Target
 }
 
 // TargetBuilder structure for building targets
@@ -84,6 +84,6 @@ func (b *targetBuilder) Custom(key string, value interface{}) TargetBuilderInter
 }
 
 // Build returns target object
-func (b *targetBuilder) Build() *evaluation.Target {
-	return b.Target
+func (b *targetBuilder) Build() evaluation.Target {
+	return *b.Target
 }

rest/adapter.go

@@ -69,6 +69,23 @@ func (p Prerequisite) convert() *evaluation.Prerequisite {
 	}
 }
 
+//convert converts variation map to evaluation object
+func (v VariationMap) convert() *evaluation.VariationMap {
+	return &evaluation.VariationMap{
+		TargetSegments: *v.TargetSegments,
+		Targets:        convertTargetToIdentifier(*v.Targets),
+		Variation:      v.Variation,
+	}
+}
+
+func convertTargetToIdentifier(tm []TargetMap) []string {
+	result := make([]string, 0, len(tm))
+	for j := range tm {
+		result = append(result, *tm[j].Identifier)
+	}
+	return result
+}
+
 // Convert feature flag from ff server to evaluation object
 func (fc FeatureConfig) Convert() *evaluation.FeatureConfig {
 	vars := make(evaluation.Variations, len(fc.Variations))
@@ -98,6 +115,13 @@ func (fc FeatureConfig) Convert() *evaluation.FeatureConfig {
 	if fc.DefaultServe.Variation != nil {
 		defaultServe.Variation = fc.DefaultServe.Variation
 	}
+	var vtm []evaluation.VariationMap
+	if fc.VariationToTargetMap != nil {
+		vtm = make([]evaluation.VariationMap, len(*fc.VariationToTargetMap))
+		for i, val := range *fc.VariationToTargetMap {
+			vtm[i] = *val.convert()
+		}
+	}
 	return &evaluation.FeatureConfig{
 		DefaultServe:         defaultServe,
 		Environment:          fc.Environment,
@@ -108,7 +132,7 @@ func (fc FeatureConfig) Convert() *evaluation.FeatureConfig {
 		Project:              fc.Project,
 		Rules:                rules,
 		State:                evaluation.FeatureState(fc.State),
-		VariationToTargetMap: nil,
+		VariationToTargetMap: vtm,
 		Variations:           vars,
 	}
 }