From 3b0e2c1c3fd1b20d5afc3344aefb8af1b1dcb5b4 Mon Sep 17 00:00:00 2001 From: Kurt Madel Date: Thu, 22 Dec 2016 01:01:15 -0500 Subject: [PATCH] PR Webhook - Add base/head info (#3547) * messing with getting local go-gogs-client * coding style fix * added comments for required fields --- models/pull.go | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/models/pull.go b/models/pull.go index fd3923ce6..4bfc8ddf4 100644 --- a/models/pull.go +++ b/models/pull.go @@ -113,22 +113,28 @@ func (pr *PullRequest) LoadIssue() (err error) { // This method assumes following fields have been assigned with valid values: // Required - Issue +// Required - HeadRepo +// Required - BaseRepo // Optional - Merger func (pr *PullRequest) APIFormat() *api.PullRequest { apiIssue := pr.Issue.APIFormat() apiPullRequest := &api.PullRequest{ - ID: pr.ID, - Index: pr.Index, - Poster: apiIssue.Poster, - Title: apiIssue.Title, - Body: apiIssue.Body, - Labels: apiIssue.Labels, - Milestone: apiIssue.Milestone, - Assignee: apiIssue.Assignee, - State: apiIssue.State, - Comments: apiIssue.Comments, - HTMLURL: pr.Issue.HTMLURL(), - HasMerged: pr.HasMerged, + ID: pr.ID, + Index: pr.Index, + Poster: apiIssue.Poster, + Title: apiIssue.Title, + Body: apiIssue.Body, + Labels: apiIssue.Labels, + Milestone: apiIssue.Milestone, + Assignee: apiIssue.Assignee, + State: apiIssue.State, + Comments: apiIssue.Comments, + HeadBranch: pr.HeadBranch, + HeadRepo: pr.HeadRepo.APIFormat(nil), + BaseBranch: pr.BaseBranch, + BaseRepo: pr.BaseRepo.APIFormat(nil), + HTMLURL: pr.Issue.HTMLURL(), + HasMerged: pr.HasMerged, } if pr.Status != PULL_REQUEST_STATUS_CHECKING {