label and assignee api call fixes

Author: GrantBirki

internal/cmd/combine_prs.go

@@ -225,21 +225,47 @@ func createPullRequest(ctx context.Context, client RESTClientInterface, repo git
 		"body":  body,
 	}
 
+	requestBody, err := encodePayload(payload)
+	if err != nil {
+		return fmt.Errorf("failed to encode payload: %w", err)
+	}
+
+	// Create the pull request
+	var prResponse struct {
+		Number int `json:"number"`
+	}
+	err = client.Post(endpoint, requestBody, &prResponse)
+	if err != nil {
+		return fmt.Errorf("failed to create pull request: %w", err)
+	}
+
 	// Add labels if provided
 	if len(labels) > 0 {
-		payload["labels"] = labels
+		labelsEndpoint := fmt.Sprintf("repos/%s/%s/issues/%d/labels", repo.Owner, repo.Repo, prResponse.Number)
+		labelsPayload, err := encodePayload(map[string][]string{"labels": labels})
+		if err != nil {
+			return fmt.Errorf("failed to encode labels payload: %w", err)
+		}
+		err = client.Post(labelsEndpoint, labelsPayload, nil)
+		if err != nil {
+			return fmt.Errorf("failed to add labels: %w", err)
+		}
 	}
 
 	// Add assignees if provided
 	if len(assignees) > 0 {
-		payload["assignees"] = assignees
+		assigneesEndpoint := fmt.Sprintf("repos/%s/%s/issues/%d/assignees", repo.Owner, repo.Repo, prResponse.Number)
+		assigneesPayload, err := encodePayload(map[string][]string{"assignees": assignees})
+		if err != nil {
+			return fmt.Errorf("failed to encode assignees payload: %w", err)
+		}
+		err = client.Post(assigneesEndpoint, assigneesPayload, nil)
+		if err != nil {
+			return fmt.Errorf("failed to add assignees: %w", err)
+		}
 	}
 
-	requestBody, err := encodePayload(payload)
-	if err != nil {
-		return fmt.Errorf("failed to encode payload: %w", err)
-	}
-	return client.Post(endpoint, requestBody, nil)
+	return nil
 }
 
 // encodePayload encodes a payload as JSON and returns an io.Reader

internal/cmd/combine_prs_test.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"context"
+	"strings"
 	"testing"
 
 	"github.com/github/gh-combine/internal/github"
@@ -11,6 +12,14 @@ import (
 func TestCreatePullRequest(t *testing.T) {
 	client := &MockRESTClient{
 		PostFunc: func(endpoint string, body interface{}, response interface{}) error {
+			if strings.Contains(endpoint, "/pulls") {
+				if prResponse, ok := response.(*struct{ Number int }); ok {
+					prResponse.Number = 123 // Mock PR number
+				}
+			} else if strings.Contains(endpoint, "/labels") || strings.Contains(endpoint, "/assignees") {
+				// Mock successful label/assignee addition
+				return nil
+			}
 			return nil
 		},
 	}