Skip to content

Commit

Permalink
Fix show single review comments in the PR page (#9143)
Browse files Browse the repository at this point in the history
  • Loading branch information
guillep2k authored and techknowlogick committed Nov 24, 2019
1 parent 8ab35ee commit d779dee
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 3 deletions.
5 changes: 5 additions & 0 deletions models/review.go
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,11 @@ func getCurrentReview(e Engine, reviewer *User, issue *Issue) (*Review, error) {
return reviews[0], nil
}

// ReviewExists returns whether a review exists for a particular line of code in the PR
func ReviewExists(issue *Issue, treePath string, line int64) (bool, error) {
return x.Cols("id").Exist(&Comment{IssueID: issue.ID, TreePath: treePath, Line: line, Type: CommentTypeCode})
}

// GetCurrentReview returns the current pending review of reviewer for given issue
func GetCurrentReview(reviewer *User, issue *Issue) (*Review, error) {
return getCurrentReview(x, reviewer, issue)
Expand Down
32 changes: 29 additions & 3 deletions services/pull/review.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,28 @@ import (

// CreateCodeComment creates a comment on the code line
func CreateCodeComment(doer *models.User, issue *models.Issue, line int64, content string, treePath string, isReview bool, replyReviewID int64) (*models.Comment, error) {
// It's not a review, maybe a reply to a review comment or a single comment.

var (
existsReview bool
err error
)

// CreateCodeComment() is used for:
// - Single comments
// - Comments that are part of a review
// - Comments that reply to an existing review

if !isReview {
if err := issue.LoadRepo(); err != nil {
// It's not part of a review; maybe a reply to a review comment or a single comment.
// Check if there are reviews for that line already; if there are, this is a reply
if existsReview, err = models.ReviewExists(issue, treePath, line); err != nil {
return nil, err
}
}

// Comments that are replies don't require a review header to show up in the issue view
if !isReview && existsReview {
if err = issue.LoadRepo(); err != nil {
return nil, err
}

Expand Down Expand Up @@ -72,7 +91,14 @@ func CreateCodeComment(doer *models.User, issue *models.Issue, line int64, conte
return nil, err
}

// NOTICE: it's a pending review, so the notifications will not be fired until user submit review.
if !isReview && !existsReview {
// Submit the review we've just created so the comment shows up in the issue view
if _, _, err = SubmitReview(doer, issue, models.ReviewTypeComment, ""); err != nil {
return nil, err
}
}

// NOTICE: if it's a pending review the notifications will not be fired until user submit review.

return comment, nil
}
Expand Down

0 comments on commit d779dee

Please sign in to comment.