Skip to content

Commit 5c96a2b

Browse files
authored
Fix bug of review request number (#27406)
Manually backport #27104 without tests because too many conflicted files to backport it completely.
1 parent acedf0f commit 5c96a2b

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

models/issues/issue_search.go

+8-1
Original file line numberDiff line numberDiff line change
@@ -349,14 +349,21 @@ func applyReviewRequestedCondition(sess *xorm.Session, reviewRequestedID int64)
349349
From("team_user").
350350
Where(builder.Eq{"team_user.uid": reviewRequestedID})
351351

352+
// if the review is approved or rejected, it should not be shown in the review requested list
353+
maxReview := builder.Select("MAX(r.id)").
354+
From("review as r").
355+
Where(builder.In("r.type", []ReviewType{ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest})).
356+
GroupBy("r.issue_id, r.reviewer_id, r.reviewer_team_id")
357+
352358
subQuery := builder.Select("review.issue_id").
353359
From("review").
354360
Where(builder.And(
355-
builder.In("review.type", []ReviewType{ReviewTypeRequest, ReviewTypeReject, ReviewTypeApprove}),
361+
builder.Eq{"review.type": ReviewTypeRequest},
356362
builder.Or(
357363
builder.Eq{"review.reviewer_id": reviewRequestedID},
358364
builder.In("review.reviewer_team_id", existInTeamQuery),
359365
),
366+
builder.In("review.id", maxReview),
360367
))
361368
return sess.Where("issue.poster_id <> ?", reviewRequestedID).
362369
And(builder.In("issue.id", subQuery))

0 commit comments

Comments
 (0)