diff --git a/internal/forgejo/repo.go b/internal/forgejo/repo.go index 840b4f0..a90eb48 100644 --- a/internal/forgejo/repo.go +++ b/internal/forgejo/repo.go @@ -42,7 +42,7 @@ type pullRequestRequest struct { } type pullRequest struct { - Index int `json:"index"` + Number int `json:"number"` } type mergePullRequestRequest struct { @@ -216,7 +216,7 @@ func (rm *RepoManager) MergePullRequest(repo, head string) error { if err != nil { return err } - status, err = rm.apiRequest(http.MethodPost, fmt.Sprintf("%s/api/v1/repos/%s/%s/pulls/%d/merge", rm.BaseURL, rm.Owner, repo, pullRequests[0].Index), body) + status, err = rm.apiRequest(http.MethodPost, fmt.Sprintf("%s/api/v1/repos/%s/%s/pulls/%d/merge", rm.BaseURL, rm.Owner, repo, pullRequests[0].Number), body) if err != nil { return err } diff --git a/internal/forgejo/repo_test.go b/internal/forgejo/repo_test.go index 8dd8512..24626af 100644 --- a/internal/forgejo/repo_test.go +++ b/internal/forgejo/repo_test.go @@ -132,7 +132,7 @@ func TestMergePullRequest(t *testing.T) { server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) { switch request.Method { case http.MethodGet: - _ = json.NewEncoder(writer).Encode([]pullRequest{{Index: 4}}) + _ = json.NewEncoder(writer).Encode([]pullRequest{{Number: 4}}) case http.MethodPost: var body mergePullRequestRequest if err := json.NewDecoder(request.Body).Decode(&body); err != nil {