Fix real Intercom API compatibility failures

articles.go

@@ -329,11 +329,11 @@ func (s *ArticlesService) GetDraft(ctx context.Context, articleID string) (*Arti
 	if err != nil {
 		return nil, err
 	}
-	res, err := s.client.generated.RetrieveArticleDraftWithResponse(ctx, id, nil)
+	res, err := s.client.generated.RetrieveArticleDraft(ctx, id, nil)
 	if err != nil {
 		return nil, err
 	}
-	article, err := requireOK("get article draft", res.StatusCode(), res.Body, res.JSON200, responseHeaders(res.HTTPResponse))
+	article, err := requireHTTPJSON[gen.ArticleSchema]("get article draft", res)
 	return articleFromGenerated(article), err
 }
 

contacts.go

@@ -310,7 +310,28 @@ func (s *ContactsService) ListMergeHistory(ctx context.Context, contactID string
 	if err != nil {
 		return nil, err
 	}
-	return requireOK("list contact merge history", res.StatusCode(), res.Body, res.JSON200, responseHeaders(res.HTTPResponse))
+	history, err := requireOK("list contact merge history", res.StatusCode(), res.Body, res.JSON200, responseHeaders(res.HTTPResponse))
+	if err == nil || !IsNotFound(err) {
+		return history, err
+	}
+
+	includeMergeHistory := true
+	contactResponse, fallbackErr := s.client.generated.ShowContactWithResponse(ctx, contactID, &gen.ShowContactParams{IncludeMergeHistory: &includeMergeHistory})
+	if fallbackErr != nil {
+		return nil, fallbackErr
+	}
+	contact, fallbackErr := requireOK("get contact merge history", contactResponse.StatusCode(), contactResponse.Body, contactResponse.JSON200, responseHeaders(contactResponse.HTTPResponse))
+	if fallbackErr != nil {
+		return nil, fallbackErr
+	}
+
+	historyType := gen.MergeHistoryListType("list")
+	hasMore := false
+	return &ContactMergeHistory{
+		Data:    contact.MergeHistory,
+		HasMore: &hasMore,
+		Type:    &historyType,
+	}, nil
 }
 
 // ContactSearchOperator is an Intercom contact search operator.
@@ -521,17 +542,12 @@ func (s *ContactsService) CreateNote(ctx context.Context, contactID string, body
 		return nil, fmt.Errorf("intercom: note body is required")
 	}
 
-	id, err := contactIDToInt(contactID)
-	if err != nil {
-		return nil, err
-	}
-
 	req := gen.CreateNoteJSONRequestBody{Body: body}
 	if adminID != "" {
 		req.AdminId = &adminID
 	}
 
-	res, err := s.client.generated.CreateNoteWithResponse(ctx, id, nil, req)
+	res, err := s.client.generated.CreateNoteWithResponse(ctx, contactID, nil, req)
 	if err != nil {
 		return nil, err
 	}
@@ -733,12 +749,3 @@ func marshalBody(v any) (*bytes.Reader, error) {
 	}
 	return bytes.NewReader(b), nil
 }
-
-// contactIDToInt converts a string contact ID to int as required by some generated endpoints.
-func contactIDToInt(contactID string) (int, error) {
-	id, err := strconv.Atoi(contactID)
-	if err != nil {
-		return 0, fmt.Errorf("intercom: contact ID %q is not a valid integer: %w", contactID, err)
-	}
-	return id, nil
-}

contacts_test.go

@@ -880,20 +880,6 @@ func TestContactsValidation(t *testing.T) {
 				return err
 			},
 		},
-		{
-			name: "create note: non-numeric contact ID",
-			call: func(ctx context.Context, client *Client) error {
-				_, err := client.Contacts.CreateNote(ctx, "not-an-int", "body", "")
-				return err
-			},
-		},
-		{
-			name: "create note: partial-numeric contact ID",
-			call: func(ctx context.Context, client *Client) error {
-				_, err := client.Contacts.CreateNote(ctx, "123abc", "body", "")
-				return err
-			},
-		},
 		{
 			name: "list segments: empty contact ID",
 			call: func(ctx context.Context, client *Client) error {

conversations_test.go

@@ -7,8 +7,6 @@ import (
 	"net/http"
 	"testing"
 
-	openapi_types "github.com/oapi-codegen/runtime/types"
-
 	gen "github.com/uffejaeger/intercom-go/internal/generated/intercom"
 )
 
@@ -75,9 +73,9 @@ func TestConversationsServiceRequests(t *testing.T) {
 				msg, err := client.Conversations.Create(ctx, ConversationCreate{
 					Body: "hello",
 					From: struct {
-						Id   openapi_types.UUID                    `json:"id"`
+						Id   string                                `json:"id"`
 						Type gen.CreateConversationRequestFromType `json:"type"`
-					}{Type: "user"},
+					}{Id: "536e564f316c83104c000020", Type: "user"},
 				})
 				if err != nil {
 					return err

fuzz_test.go

@@ -30,7 +30,7 @@ func FuzzParseErrorResponse(f *testing.F) {
 	})
 }
 
-func FuzzIntegerIDConversionHelpers(f *testing.F) {
+func FuzzConversationIDConversion(f *testing.F) {
 	f.Add("1")
 	f.Add("0")
 	f.Add("-1")
@@ -41,9 +41,6 @@ func FuzzIntegerIDConversionHelpers(f *testing.F) {
 	f.Fuzz(func(t *testing.T, id string) {
 		want, wantErr := strconv.Atoi(id)
 
-		contactID, contactErr := contactIDToInt(id)
-		assertFuzzIDConversion(t, "contactIDToInt", contactID, contactErr, want, wantErr)
-
 		conversationID, conversationErr := conversationIDToInt(id)
 		assertFuzzIDConversion(t, "conversationIDToInt", conversationID, conversationErr, want, wantErr)
 	})