Merge new Zendesk users into existing users

services/tickets/zendesk/client.go

@@ -316,13 +316,15 @@ type User struct {
 	Organization struct {
 		Name string `json:"name"`
 	} `json:"organization,omitempty"`
-	ExternalID string `json:"external_id,omitempty"`
-	Identities []struct {
-		Type  string `json:"type"`
-		Value string `json:"value"`
-	} `json:"identities,omitempty"`
-	Verified bool   `json:"verified,omitempty"`
-	Role     string `json:"role,omitempty"`
+	ExternalID string     `json:"external_id,omitempty"`
+	Identities []Identity `json:"identities,omitempty"`
+	Verified   bool       `json:"verified,omitempty"`
+	Role       string     `json:"role,omitempty"`
+}
+
+type Identity struct {
+	Type  string `json:"type"`
+	Value string `json:"value"`
 }
 
 // CreateUser creates a new user in zendesk
@@ -349,7 +351,7 @@ type SearchUserResponse struct {
 
 // SearchUser returns the user with the given external ID or nil if it doesn't exist
 func (c *RESTClient) SearchUser(externalID string) (*User, *httpx.Trace, error) {
-	endpoint := fmt.Sprintf("users/search.json?external_id=%s", externalID)
+	endpoint := fmt.Sprintf("users/search.json?query=%s", externalID)
 	var response SearchUserResponse
 	trace, err := c.get(endpoint, nil, &response)
 	if err != nil {
@@ -360,3 +362,22 @@ func (c *RESTClient) SearchUser(externalID string) (*User, *httpx.Trace, error)
 	}
 	return &response.Users[0], trace, nil
 }
+
+// MergeUser merge two users
+func (c *RESTClient) MergeUser(userID int64, unmergedUserID int64) (*User, *httpx.Trace, error) {
+	endpoint := fmt.Sprintf("users/%s/merge", unmergedUserID)
+
+	payload := struct {
+		User *User `json:"user"`
+	}{User: &User{ID: userID}}
+
+	response := &struct {
+		User *User `json:"user"`
+	}{}
+
+	trace, err := c.post(endpoint, payload, &response)
+	if err != nil {
+		return nil, trace, err
+	}
+	return response.User, trace, nil
+}

services/tickets/zendesk/service.go

@@ -91,13 +91,19 @@ func (s *service) Open(session flows.Session, topic *flows.Topic, body string, a
 		return nil, err
 	}
 	if trace.Response.StatusCode == http.StatusNotFound || user == nil {
-		user := &User{
+		newUser := &User{
 			Name:       contactDisplay,
 			ExternalID: contactUUID,
 			Verified:   true,
 			Role:       "end-user",
+			Identities: []Identity{
+				{
+					Type:  "phone_number",
+					Value: string(session.Contact().PreferredURN().URN().Path()),
+				},
+			},
 		}
-		_, trace, err = s.restClient.CreateUser(user)
+		user, trace, err = s.restClient.CreateUser(newUser)
 		if trace != nil {
 			logHTTP(flows.NewHTTPLog(trace, flows.HTTPStatusFromCode, s.redactor))
 		}
@@ -113,6 +119,12 @@ func (s *service) Open(session flows.Session, topic *flows.Topic, body string, a
 		Author: Author{
 			ExternalID: contactUUID,
 			Name:       contactDisplay,
+			Fields: []FieldValue{
+				{
+					ID:    "details",
+					Value: contactUUID,
+				},
+			},
 		},
 		AllowChannelback: true,
 	}
@@ -174,6 +186,23 @@ func (s *service) Open(session flows.Session, topic *flows.Topic, body string, a
 	if err := s.push(msg, logHTTP); err != nil {
 		return nil, err
 	}
+
+	unmergedUser, trace, err := s.restClient.SearchUser("type:user details:\"" + contactUUID + "\"")
+	if trace != nil {
+		logHTTP(flows.NewHTTPLog(trace, flows.HTTPStatusFromCode, s.redactor))
+	}
+	if err != nil && trace.Response.StatusCode != http.StatusNotFound {
+		return nil, err
+	}
+
+	_, trace, err = s.restClient.MergeUser(user.ID, unmergedUser.ID)
+	if trace != nil {
+		logHTTP(flows.NewHTTPLog(trace, flows.HTTPStatusFromCode, s.redactor))
+	}
+	if err != nil && trace.Response.StatusCode != http.StatusNotFound {
+		return nil, err
+	}
+
 	return ticket, nil
 }