mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-10-31 22:38:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dont load Review if Comment is CommentTypeReviewRequest (#28551) (#29160)

Browse source 
Backport #28551

RequestReview get deleted on review.
So we don't have to try to load them on comments.

(cherry picked from commit 0ac3186267b717bce7076ef44f883df7720d7a2d)
This commit is contained in:
6543 2024-02-13 23:29:33 +01:00 committed by Earl Warren
parent 60a4c05d23
commit d3846df1f9
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
models/issues/comment.go
View file

@ -688,8 +688,15 @@ func (c *Comment) LoadReactions(ctx context.Context, repo *repo_model.Repository
} }
func (c *Comment) loadReview(ctx context.Context) (err error) { func (c *Comment) loadReview(ctx context.Context) (err error) {
if c.ReviewID == 0 {
return nil
}
if c.Review == nil { if c.Review == nil {
if c.Review, err = GetReviewByID(ctx, c.ReviewID); err != 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 return err
} }
} }

3
models/issues/comment_list.go
View file

@ -430,7 +430,8 @@ func (comments CommentList) loadReviews(ctx context.Context) error {
for _, comment := range comments { for _, comment := range comments {
comment.Review = reviews[comment.ReviewID] comment.Review = reviews[comment.ReviewID]
if comment.Review == nil { 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) log.Error("comment with review id [%d] but has no review record", comment.ReviewID)
} }
continue continue

3
models/issues/review.go
View file

@ -622,6 +622,9 @@ func AddReviewRequest(ctx context.Context, issue *Issue, reviewer, doer *user_mo
return nil, err return nil, err
} }
// func caller use the created comment to retrieve created review too.
comment.Review = review
return comment, committer.Commit() return comment, committer.Commit()
} }