Merge branch 'master' into missing-memberrequest-fields

hanzoai · Dec 7, 2019 · 21023ce · 21023ce
2 parents 4891b92 + 8a7a5fc
commit 21023ce
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/common_types.go b/common_types.go
@@ -139,7 +139,7 @@ type LineItem struct {
 
 // Contact defines a single contact
 type Contact struct {
-	Company     string `json:"customer"`
+	Company     string `json:"company"`
 	Address1    string `json:"address1"`
 	Address2    string `json:"address2"`
 	City        string `json:"city"`

diff --git a/lists.go b/lists.go
@@ -577,7 +577,7 @@ type MergeFieldOptions struct {
 	DefaultCountry int      `json:"default_Country"`
 	PhoneFormat    string   `json:"phone_format"`
 	DateFormat     string   `json:"date_format"`
-	Choices        []string `json:"choices"`
+	Choices        []string `json:"choices,omitempty"`
 	Size           int      `json:"size"`
 }
 

diff --git a/members.go b/members.go
@@ -25,6 +25,7 @@ type ListOfMembers struct {
 
 type MemberRequest struct {
 	EmailAddress    string                 `json:"email_address"`
+	EmailType       string                 `json:"email_type,omitempty"`
 	Status          string                 `json:"status"`
 	StatusIfNew     string                 `json:"status_if_new,omitempty"`
 	MergeFields     map[string]interface{} `json:"merge_fields,omitempty"`
@@ -34,6 +35,7 @@ type MemberRequest struct {
 	Location        *MemberLocation        `json:"location,omitempty"`
 	IPOpt           string                 `json:"ip_opt,omitempty"`
 	IPSignup        string                 `json:"ip_signup,omitempty"`
+  Tags            []string               `json:"tags,omitempty"`
 	TimestampSignup string                 `json:"timestamp_signup,omitempty"`
 	TimestampOpt    string                 `json:"timestamp_opt,omitempty"`
 }
@@ -87,6 +89,11 @@ type MemberNoteShort struct {
 	Note      string `json:"note"`
 }
 
+type MemberTag struct {
+	ID   int    `json:"id"`
+	Name string `json:"name"`
+}
+
 func (list ListResponse) GetMembers(params *InterestCategoriesQueryParams) (*ListOfMembers, error) {
 	if err := list.CanMakeRequest(); err != nil {
 		return nil, err

diff --git a/segments.go b/segments.go
@@ -23,7 +23,7 @@ type SegmentRequest struct {
 type Segment struct {
 	SegmentRequest
 
-	ID          int    `json:"id"`
+	ID          string    `json:"id"`
 	MemberCount int    `json:"member_count"`
 	Type        string `json:"type"`
 	CreatedAt   string `json:"created_at"`
@@ -70,9 +70,9 @@ type SegmentBatchError struct {
 
 // SegmentConditional represents parameters to filter by
 type SegmentConditional struct {
-	Field string  `json:"field"`
-	OP    string  `json:"op"`
-	Value float64 `json:"value"`
+	Field string      `json:"field"`
+	OP    string      `json:"op"`
+	Value interface{} `json:"value"`
 }
 
 type SegmentQueryParams struct {