Skip to content

Commit

Permalink
Dont load Review if Comment is CommentTypeReviewRequest (go-gitea#28551)
Browse files Browse the repository at this point in the history
RequestReview get deleted on review.
So we don't have to try to load them on comments.

broken out go-gitea#28544
  • Loading branch information
6543 authored and silverwind committed Feb 15, 2024
1 parent de2add3 commit 70ecb18
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
7 changes: 7 additions & 0 deletions models/issues/comment.go
Original file line number Diff line number Diff line change
Expand Up @@ -695,8 +695,15 @@ func (c *Comment) LoadReactions(ctx context.Context, repo *repo_model.Repository
}

func (c *Comment) loadReview(ctx context.Context) (err error) {
if c.ReviewID == 0 {
return nil
}
if c.Review == nil {
if c.Review, err = GetReviewByID(ctx, c.ReviewID); err != nil {
// review request which has been replaced by actual reviews doesn't exist in database anymore, so ignorem them.
if c.Type == CommentTypeReviewRequest {
return nil
}
return err
}
}
Expand Down
3 changes: 2 additions & 1 deletion models/issues/comment_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,8 @@ func (comments CommentList) loadReviews(ctx context.Context) error {
for _, comment := range comments {
comment.Review = reviews[comment.ReviewID]
if comment.Review == nil {
if comment.ReviewID > 0 {
// review request which has been replaced by actual reviews doesn't exist in database anymore, so don't log errors for them.
if comment.ReviewID > 0 && comment.Type != CommentTypeReviewRequest {
log.Error("comment with review id [%d] but has no review record", comment.ReviewID)
}
continue
Expand Down
3 changes: 3 additions & 0 deletions models/issues/review.go
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,9 @@ func AddReviewRequest(ctx context.Context, issue *Issue, reviewer, doer *user_mo
return nil, err
}

// func caller use the created comment to retrieve created review too.
comment.Review = review

return comment, committer.Commit()
}

Expand Down

0 comments on commit 70ecb18

Please sign in to comment.