Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expose resolver via API #15167

Merged
merged 3 commits into from
Mar 27, 2021
Merged

Expose resolver via API #15167

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5583c03
Expose resolver via API
sotho Mar 25, 2021
708d7c7
Merge branch 'master' into expose-resolver
zeripath Mar 27, 2021
7c4c982
placate lint
zeripath Mar 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integrations/api_pull_review_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func TestAPIPullReview(t *testing.T) {
var reviewComments []*api.PullReviewComment
DecodeJSON(t, resp, &reviewComments)
assert.Len(t, reviewComments, 1)
assert.EqualValues(t, "Ghost", reviewComments[0].Reviewer.UserName)
assert.EqualValues(t, "Ghost", reviewComments[0].Poster.UserName)
assert.EqualValues(t, "a review from a deleted user", reviewComments[0].Body)
assert.EqualValues(t, comment.ID, reviewComments[0].ID)
assert.EqualValues(t, comment.UpdatedUnix, reviewComments[0].Updated.Unix())
Expand Down
11 changes: 8 additions & 3 deletions modules/convert/pull_review.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,19 @@ func ToPullReviewCommentList(review *models.Review, doer *models.User) ([]*api.P
for _, lines := range review.CodeComments {
for _, comments := range lines {
for _, comment := range comments {
auth := false
authPoster := false
if doer != nil {
auth = doer.IsAdmin || doer.ID == comment.Poster.ID
authPoster = doer.IsAdmin || doer.ID == comment.Poster.ID
}
authResolver := false
if doer != nil {
authResolver = doer.IsAdmin || (comment.ResolveDoer != nil && doer.ID == comment.ResolveDoer.ID)
}
apiComment := &api.PullReviewComment{
ID: comment.ID,
Body: comment.Content,
Reviewer: ToUser(comment.Poster, doer != nil, auth),
Poster: ToUser(comment.Poster, doer != nil, authPoster),
zeripath marked this conversation as resolved.
Show resolved Hide resolved
Resolver: ToUser(comment.ResolveDoer, doer != nil, authResolver),
ReviewID: review.ID,
Created: comment.CreatedUnix.AsTime(),
Updated: comment.UpdatedUnix.AsTime(),
Expand Down
3 changes: 2 additions & 1 deletion modules/structs/pull_review.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ type PullReview struct {
type PullReviewComment struct {
ID int64 `json:"id"`
Body string `json:"body"`
Reviewer *User `json:"user"`
Poster *User `json:"user"`
Resolver *User `json:"resolver"`
ReviewID int64 `json:"pull_request_review_id"`

// swagger:strfmt date-time
Expand Down
3 changes: 3 additions & 0 deletions templates/swagger/v1_json.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15455,6 +15455,9 @@
"type": "string",
"x-go-name": "HTMLPullURL"
},
"resolver": {
"$ref": "#/definitions/User"
},
"updated_at": {
"type": "string",
"format": "date-time",
Expand Down