Skip to content

Commit

Permalink
Handle reviewers that has been deleted
Browse files Browse the repository at this point in the history
  • Loading branch information
davidsvantesson committed Nov 27, 2019
1 parent b1537d4 commit 8198531
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions models/review.go
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,8 @@ func SubmitReview(doer *User, issue *Issue, reviewType ReviewType, content strin

// GetReviewersByIssueID gets the latest review of each reviewer for a pull request
func GetReviewersByIssueID(issueID int64) (reviews []*Review, err error) {
reviewsUnfiltered := []*Review{}

sess := x.NewSession()
defer sess.Close()
if err := sess.Begin(); err != nil {
Expand All @@ -341,13 +343,18 @@ func GetReviewersByIssueID(issueID int64) (reviews []*Review, err error) {

if err := sess.SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND type in (?, ?) GROUP BY issue_id, reviewer_id) ORDER BY review.updated_unix ASC",
issueID, ReviewTypeApprove, ReviewTypeReject).
Find(&reviews); err != nil {
Find(&reviewsUnfiltered); err != nil {
return nil, err
}

for _, review := range reviews {
// Load reviewer and skip if user is deleted
for _, review := range reviewsUnfiltered {
if err := review.loadReviewer(sess); err != nil {
return nil, err
if !IsErrUserNotExist(err) {
return nil, err
}
} else {
reviews = append(reviews, review)
}
}

Expand Down

0 comments on commit 8198531

Please sign in to comment.