Add ability to merge by email or user id

Author: gugahoi

cmd/users/merge.go

@@ -9,26 +9,43 @@ import (
 
 // MergeCmd represents the merge command for users
 var MergeCmd = &cobra.Command{
-	Use:     "merge",
-	Short:   "Merge two users",
-	Args:    cobra.ExactArgs(2),
-	Example: "iterablectl users merge <source_email> <destination_email>",
+	Use:   "merge",
+	Short: "Merge two users",
+	Example: `iterablectl users merge --from-email <source email> --to-email <destination email>
+iterablectl users merge --from-user-id <source user id> --to-email <destination email>
+iterablectl users merge --from-user-id <source user id> --to-user-id <destination user id>
+iterablectl users merge --from-email <source > --to-user-id <destination user id>
+	`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		apiKey, _ := cmd.Flags().GetString("api-key")
 		client := iterable.NewClient(apiKey)
 
-		sourceEmail := args[0]
-		if sourceEmail == "" {
-			return fmt.Errorf("source email is required")
+		// Get flag values
+		fromEmail, _ := cmd.Flags().GetString("from-email")
+		fromUserID, _ := cmd.Flags().GetString("from-user-id")
+		toEmail, _ := cmd.Flags().GetString("to-email")
+		toUserID, _ := cmd.Flags().GetString("to-user-id")
+
+		// Validate that exactly one source identifier is provided
+		if (fromEmail == "" && fromUserID == "") || (fromEmail != "" && fromUserID != "") {
+			return fmt.Errorf("exactly one of --source-email or --source-user-id must be specified")
 		}
-		destinationEmail := args[1]
-		if destinationEmail == "" {
-			return fmt.Errorf("destination email is required")
+		if (toEmail == "" && toUserID == "") || (toEmail != "" && toUserID != "") {
+			return fmt.Errorf("exactly one of --to-email or --to-user-id must be specified")
 		}
 
-		response, err := client.MergeUsers(sourceEmail, destinationEmail)
+		var response *iterable.APIError
+		var err error
+
+		response, err = client.MergeUsers(iterable.MergeUsersOpts{
+			SrcEmail: fromEmail,
+			DstEmail: toEmail,
+
+			SrcID: fromUserID,
+			DstID: toUserID,
+		})
 		if err != nil {
-			return fmt.Errorf("error merging users: %v", err)
+			return fmt.Errorf("error merging users: %w", err)
 		}
 
 		if response.Code != "Success" {
@@ -38,3 +55,10 @@ var MergeCmd = &cobra.Command{
 		return nil
 	},
 }
+
+func init() {
+	MergeCmd.Flags().String("from-email", "", "Email address of the source user to merge")
+	MergeCmd.Flags().String("from-user-id", "", "User ID of the source user to merge")
+	MergeCmd.Flags().String("to-email", "", "Email address of the destination profile to merge into")
+	MergeCmd.Flags().String("to-user-id", "", "User ID of the destination profile to merge into")
+}

pkg/iterable/client.go

@@ -114,7 +114,7 @@ func (c *Client) do(req *http.Request, v any) error {
 	if resp.StatusCode < http.StatusOK || resp.StatusCode >= http.StatusBadRequest {
 		var apiErr APIError
 		if err = json.NewDecoder(resp.Body).Decode(&apiErr); err != nil {
-			return fmt.Errorf("API request failed with status %d: %v", resp.StatusCode, err)
+			return fmt.Errorf("API request failed with status %d: %w", resp.StatusCode, err)
 		}
 		return &apiErr
 	}
@@ -128,12 +128,29 @@ func (c *Client) do(req *http.Request, v any) error {
 	return nil
 }
 
-// MergeUsers merges two Iterable users
-func (c *Client) MergeUsers(src, dst string) (*APIError, error) {
+type MergeUsersOpts struct {
+	SrcEmail string
+	DstEmail string
+	SrcID    string
+	DstID    string
+}
+
+// MergeUsers merges two Iterable users by their email addresses
+func (c *Client) MergeUsers(opts MergeUsersOpts) (*APIError, error) {
 	path := "users/merge"
-	body := map[string]string{
-		"destinationEmail": dst,
-		"sourceEmail":      src,
+	body := map[string]string{}
+
+	if opts.DstEmail != "" {
+		body["destinationEmail"] = opts.DstEmail
+	}
+	if opts.SrcEmail != "" {
+		body["sourceEmail"] = opts.SrcEmail
+	}
+	if opts.SrcID != "" {
+		body["sourceUserId"] = opts.SrcID
+	}
+	if opts.DstID != "" {
+		body["destinationUserId"] = opts.DstID
 	}
 	req, err := c.newRequest("POST", path, body)
 	if err != nil {
@@ -145,6 +162,9 @@ func (c *Client) MergeUsers(src, dst string) (*APIError, error) {
 	if err != nil {
 		return nil, err
 	}
+	if response.Code != "Success" {
+		return nil, fmt.Errorf("failed to update user: %v", response)
+	}
 
 	return &response, nil
 }