adding common patterns of parsing data to provile resource, updating tests

Author: Daniel1984

pkg/models/pulse/pulse.go

@@ -36,8 +36,8 @@ var pulseFields = map[string]int{
 	"PulseProfile": 18,
 }
 
-// NewSingleFromRaw returns pointer to Pulse message
-func NewSingleFromRaw(raw []interface{}) (*Pulse, error) {
+// FromRaw returns pointer to Pulse message
+func FromRaw(raw []interface{}) (*Pulse, error) {
 	if len(raw) < 19 {
 		return nil, fmt.Errorf("data slice too short for Pulse Message: %#v", raw)
 	}
@@ -83,8 +83,8 @@ func NewSingleFromRaw(raw []interface{}) (*Pulse, error) {
 	return p, nil
 }
 
-// NewFromRaw returns slice of Pulse message pointers
-func NewFromRaw(raws []interface{}) ([]*Pulse, error) {
+// SnapshotFromRaw returns slice of Pulse message pointers
+func SnapshotFromRaw(raws []interface{}) ([]*Pulse, error) {
 	if len(raws) < 1 {
 		return nil, fmt.Errorf("data slice is too short for Pulse History: %#v", raws)
 	}
@@ -93,7 +93,7 @@ func NewFromRaw(raws []interface{}) ([]*Pulse, error) {
 
 	for _, raw := range raws {
 		raw := raw.([]interface{})
-		p, err := NewSingleFromRaw(raw)
+		p, err := FromRaw(raw)
 		if err != nil {
 			return nil, err
 		}

pkg/models/pulse/pulse_test.go

@@ -15,7 +15,7 @@ func TestNewPulseFromRaw(t *testing.T) {
 			[]interface{}{"abc123"},
 		}
 
-		pm, err := pulse.NewFromRaw(payload)
+		pm, err := pulse.SnapshotFromRaw(payload)
 		require.NotNil(t, err)
 		require.Nil(t, pm)
 	})
@@ -45,7 +45,7 @@ func TestNewPulseFromRaw(t *testing.T) {
 			},
 		}
 
-		pm, err := pulse.NewFromRaw(payload)
+		pm, err := pulse.SnapshotFromRaw(payload)
 		require.Nil(t, err)
 
 		expected := &pulse.Pulse{
@@ -106,7 +106,7 @@ func TestNewPulseFromRaw(t *testing.T) {
 			},
 		}
 
-		pm, err := pulse.NewFromRaw(payload)
+		pm, err := pulse.SnapshotFromRaw(payload)
 		require.Nil(t, err)
 
 		expected := &pulse.Pulse{
@@ -127,6 +127,8 @@ func TestNewPulseFromRaw(t *testing.T) {
 				Picture:       "picture",
 				Text:          "text",
 				TwitterHandle: "twitter",
+				Followers:     30,
+				Following:     5,
 			},
 		}
 

pkg/models/pulseprofile/pulseprofile.go

@@ -14,6 +14,8 @@ type PulseProfile struct {
 	Picture       string
 	Text          string
 	TwitterHandle string
+	Followers     int64
+	Following     int64
 }
 
 var pulseProfileFields = map[string]int{
@@ -23,6 +25,8 @@ var pulseProfileFields = map[string]int{
 	"Picture":       5,
 	"Text":          6,
 	"TwitterHandle": 9,
+	"Followers":     11,
+	"Following":     12,
 }
 
 // NewFromRaw takes in slice of interfaces and converts them to
@@ -40,6 +44,8 @@ func NewFromRaw(raw []interface{}) (*PulseProfile, error) {
 	pp.Picture = convert.SValOrEmpty(raw[pulseProfileFields["Picture"]])
 	pp.Text = convert.SValOrEmpty(raw[pulseProfileFields["Text"]])
 	pp.TwitterHandle = convert.SValOrEmpty(raw[pulseProfileFields["TwitterHandle"]])
+	pp.Followers = convert.I64ValOrZero(raw[pulseProfileFields["Followers"]])
+	pp.Following = convert.I64ValOrZero(raw[pulseProfileFields["Following"]])
 
 	return pp, nil
 }

pkg/models/pulseprofile/pulseprofile_test.go

@@ -44,6 +44,8 @@ func TestNewProfileFromRaw(t *testing.T) {
 			Picture:       "picture",
 			Text:          "text",
 			TwitterHandle: "twitter",
+			Followers:     30,
+			Following:     5,
 		}
 		assert.Equal(t, expected, pp)
 	})

v2/rest/pulse.go

@@ -55,7 +55,7 @@ func (ps *PulseService) PublicPulseHistory(limit int, end common.Mts) ([]*pulse.
 		return nil, err
 	}
 
-	pph, err := pulse.NewFromRaw(raw)
+	pph, err := pulse.SnapshotFromRaw(raw)
 	if err != nil {
 		return nil, err
 	}
@@ -86,7 +86,7 @@ func (ps *PulseService) AddPulse(p *pulse.Pulse) (*pulse.Pulse, error) {
 		return nil, err
 	}
 
-	pm, err := pulse.NewSingleFromRaw(raw)
+	pm, err := pulse.FromRaw(raw)
 	if err != nil {
 		return nil, err
 	}
@@ -116,7 +116,7 @@ func (ps *PulseService) PulseHistory(isPublic bool) ([]*pulse.Pulse, error) {
 		return nil, err
 	}
 
-	pph, err := pulse.NewFromRaw(raw)
+	pph, err := pulse.SnapshotFromRaw(raw)
 	if err != nil {
 		return nil, err
 	}

v2/rest/pulse_test.go

@@ -77,6 +77,8 @@ func TestPublicPulseProfile(t *testing.T) {
 			Picture:       "picture",
 			Text:          "text",
 			TwitterHandle: "twitter",
+			Followers:     30,
+			Following:     5,
 		}
 		assert.Equal(t, expected, pp)
 	})
@@ -400,6 +402,8 @@ func TestPulseHistory(t *testing.T) {
 				Picture:       "picture",
 				Text:          "text",
 				TwitterHandle: "twitter",
+				Followers:     30,
+				Following:     5,
 			},
 		}