Merge pull request #2 from optimizely/make_library_more_awesome

Consolidates two functions to get data from Optimizely, changes funct…

Author: tjj5036

examples/main.go

@@ -1,11 +1,14 @@
 package main
 
 import (
+	"fmt"
 	"github.com/optimizely/go-sdk/optimizely"
 )
 
 func main() {
-	OPTIMIZELY_ACCOUNT_ID := 12345
-	buffer := optimizely.FetchProjectConfig(OPTIMIZELY_ACCOUNT_ID)
-	optimizely.DeserializeConfigBuffer(buffer)
+	OPTIMIZELY_ACCOUNT_ID := "12345"
+	_, err := optimizely.GetOptimizelyClient(OPTIMIZELY_ACCOUNT_ID)
+	if err != nil {
+		fmt.Print(err)
+	}
 }

optimizely/optimizely.go

@@ -5,13 +5,34 @@ import (
 	"net/url"
 )
 
+// OptimizelyClient is the client to interface with the Optimizely server
+// side APIs.
+type OptimizelyClient struct {
+	account_id     string
+	project_config ProjectConfig
+}
+
+// GetOptimizelyClient returns a client that can be used to interface
+// with Optimizely
+func GetOptimizelyClient(account_id string) (*OptimizelyClient, error) {
+	client := OptimizelyClient{}
+	project_config, err := FetchProjectConfig(account_id)
+	if err != nil {
+		return &client, err
+	}
+	client.account_id = account_id
+	client.project_config = project_config
+	return &client, nil
+
+}
+
 // Track tracks a conversion event for a user_id
 // Logs the conversion
 // event_key: goal key representing the event which needs to be recorded
 // user_id: ID for user.
 // attributes: Dict representing visitor attributes and values which need to be recorded.
 // event_value: Value associated with the event. Can be used to represent revenue in cents.
-func Track(
+func (client *OptimizelyClient) Track(
 	event_key string,
 	user_id string,
 	attributes []AttributeEntity,
@@ -62,13 +83,13 @@ func Track(
 // experiment_key: experiment which needs to be activated
 // user_id: ID for user
 // attributes: optional list representing visitor attributes and values
-func Activate(experiment_key string, user_id string, attributes []AttributeEntity) {
+func (client *OptimizelyClient) Activate(experiment_key string, user_id string, attributes []AttributeEntity) {
 
 }
 
 // GetVariation gets the variation where the visitor will be bucketed
 // Experiment_key: experiment which needs to be activated
 // User_id: ID for user
-func GetVariation(experient_key string, user_id string) {
+func (client *OptimizelyClient) GetVariation(experient_key string, user_id string) {
 
 }

optimizely/project_config.go

@@ -1,8 +1,8 @@
 package optimizely
 
 import (
-	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"log"
 	"net/http"
@@ -12,38 +12,25 @@ var PROJECT_CONFIG_LINK_TEMPLATE = "https://cdn.optimizely.com/json/%v.json"
 
 // FetchConfig retrieves a JSON file from the Optimizely CDN
 // and returns it accordingly
-func FetchProjectConfig(project_id int) bytes.Buffer {
-	var b bytes.Buffer
-
+func FetchProjectConfig(project_id string) (ProjectConfig, error) {
+	var project_config = ProjectConfig{}
 	var project_config_url = fmt.Sprintf(PROJECT_CONFIG_LINK_TEMPLATE, project_id)
 	resp, err := http.Get(project_config_url)
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		log.Printf("Status code of %v when fetching project config", resp.StatusCode)
+		return project_config, errors.New(fmt.Sprintf("Error fetching config, Optimizely returned %v", resp.StatusCode))
 	}
 	if err != nil {
 		log.Printf("Error fetching project config: %v", err)
-		return b
+		return project_config, errors.New("Error fetching config")
 	}
 
-	_, err = b.ReadFrom(resp.Body)
+	err = json.NewDecoder(resp.Body).Decode(&project_config)
 	if err != nil {
 		log.Printf("Error reading JSON response into a buffer")
+		return project_config, errors.New("Cannot parse JSON file")
 	}
-	return b
-}
-
-// DeserializeConfigBuffer takes a buffer containing a JSON response
-// from the Optimizely CDN and converts it to a ProjectConfig entity
-// which gets returned
-func DeserializeConfigBuffer(b bytes.Buffer) ProjectConfig {
-	var project_config = ProjectConfig{}
-	r := bytes.NewReader(b.Bytes())
-	err := json.NewDecoder(r).Decode(&project_config)
-	if err != nil {
-		log.Print(err)
-		return project_config
-	}
-	return project_config
+	return project_config, nil
 }