diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/convert/convert.go | 4 | ||||
| -rw-r--r-- | modules/convert/pull_review.go | 1 | ||||
| -rw-r--r-- | modules/structs/pull_review.go | 7 |
3 files changed, 12 insertions, 0 deletions
diff --git a/modules/convert/convert.go b/modules/convert/convert.go index e81df0c0c3..5d056c3795 100644 --- a/modules/convert/convert.go +++ b/modules/convert/convert.go @@ -284,6 +284,10 @@ func ToOrganization(org *models.User) *api.Organization { // ToTeam convert models.Team to api.Team func ToTeam(team *models.Team) *api.Team { + if team == nil { + return nil + } + return &api.Team{ ID: team.ID, Name: team.Name, diff --git a/modules/convert/pull_review.go b/modules/convert/pull_review.go index 032d3617fc..0ef1fec39c 100644 --- a/modules/convert/pull_review.go +++ b/modules/convert/pull_review.go @@ -28,6 +28,7 @@ func ToPullReview(r *models.Review, doer *models.User) (*api.PullReview, error) result := &api.PullReview{ ID: r.ID, Reviewer: ToUser(r.Reviewer, doer != nil, auth), + ReviewerTeam: ToTeam(r.ReviewerTeam), State: api.ReviewStateUnknown, Body: r.Content, CommitID: r.CommitID, diff --git a/modules/structs/pull_review.go b/modules/structs/pull_review.go index bf9eafc243..07fa968d28 100644 --- a/modules/structs/pull_review.go +++ b/modules/structs/pull_review.go @@ -30,6 +30,7 @@ const ( type PullReview struct { ID int64 `json:"id"` Reviewer *User `json:"user"` + ReviewerTeam *Team `json:"team"` State ReviewStateType `json:"state"` Body string `json:"body"` CommitID string `json:"commit_id"` @@ -90,3 +91,9 @@ type SubmitPullReviewOptions struct { Event ReviewStateType `json:"event"` Body string `json:"body"` } + +// PullReviewRequestOptions are options to add or remove pull review requests +type PullReviewRequestOptions struct { + Reviewers []string `json:"reviewers"` + TeamReviewers []string `json:"team_reviewers"` +} |