mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 11:28:24 +00:00 
			
		
		
		
	Fix review request number and add more tests (#27104)
fix #27019 ## testfixture yml 1. add issue20(a pr issue) in repo 23, org 17 2. add user15 to team 9 3. add four reviews about issue20 ## test case add two tests that are described with code comments the code before pr #26784 failed the first test <img width="479" alt="image" src="https://github.com/go-gitea/gitea/assets/70063547/1d9b5787-11b4-4c4d-931f-6a9869547f35"> current code failed the second test(as mentioned in #27019) <img width="484" alt="image" src="https://github.com/go-gitea/gitea/assets/70063547/05608055-7587-43d1-bae1-92c688270819"> Any advice is appreciated. --------- Co-authored-by: CaiCandong <50507092+CaiCandong@users.noreply.github.com> Co-authored-by: Giteabot <teabot@gitea.io>
This commit is contained in:
		| @@ -362,14 +362,21 @@ func applyReviewRequestedCondition(sess *xorm.Session, reviewRequestedID int64) | ||||
| 		From("team_user"). | ||||
| 		Where(builder.Eq{"team_user.uid": reviewRequestedID}) | ||||
|  | ||||
| 	// if the review is approved or rejected, it should not be shown in the review requested list | ||||
| 	maxReview := builder.Select("MAX(r.id)"). | ||||
| 		From("review as r"). | ||||
| 		Where(builder.In("r.type", []ReviewType{ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest})). | ||||
| 		GroupBy("r.issue_id, r.reviewer_id, r.reviewer_team_id") | ||||
|  | ||||
| 	subQuery := builder.Select("review.issue_id"). | ||||
| 		From("review"). | ||||
| 		Where(builder.And( | ||||
| 			builder.In("review.type", []ReviewType{ReviewTypeRequest, ReviewTypeReject, ReviewTypeApprove}), | ||||
| 			builder.Eq{"review.type": ReviewTypeRequest}, | ||||
| 			builder.Or( | ||||
| 				builder.Eq{"review.reviewer_id": reviewRequestedID}, | ||||
| 				builder.In("review.reviewer_team_id", existInTeamQuery), | ||||
| 			), | ||||
| 			builder.In("review.id", maxReview), | ||||
| 		)) | ||||
| 	return sess.Where("issue.poster_id <> ?", reviewRequestedID). | ||||
| 		And(builder.In("issue.id", subQuery)) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user