From 0d33628af7fd70bf8527c9d771c1f7a77cb51c8d Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 5 Oct 2025 20:34:53 -0700 Subject: [PATCH 1/3] Fix inputing review comment will remove reviwer --- models/issues/review_list.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/issues/review_list.go b/models/issues/review_list.go index bbb8c489fa133..86b1a2e76e65b 100644 --- a/models/issues/review_list.go +++ b/models/issues/review_list.go @@ -173,7 +173,7 @@ func GetReviewsByIssueID(ctx context.Context, issueID int64) (latestReviews, mig reviewersMap := make(map[int64][]*Review) // key is reviewer id originalReviewersMap := make(map[int64][]*Review) // key is original author id reviewTeamsMap := make(map[int64][]*Review) // key is reviewer team id - countedReivewTypes := []ReviewType{ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest} + countedReivewTypes := []ReviewType{ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest, ReviewTypeComment} for _, review := range reviews { if review.ReviewerTeamID == 0 && slices.Contains(countedReivewTypes, review.Type) && !review.Dismissed { if review.OriginalAuthorID != 0 { From 68844ff3b541aadeebcf319403ce56695c3c9114 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 6 Oct 2025 11:40:47 -0700 Subject: [PATCH 2/3] Fix test --- models/issues/review_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/issues/review_test.go b/models/issues/review_test.go index 7b8537cc7dfad..41fa90b3de00d 100644 --- a/models/issues/review_test.go +++ b/models/issues/review_test.go @@ -167,7 +167,7 @@ func TestGetReviewersByIssueID(t *testing.T) { for _, review := range allReviews { assert.NoError(t, review.LoadReviewer(t.Context())) } - if assert.Len(t, allReviews, 5) { + if assert.Len(t, allReviews, 6) { for i, review := range allReviews { assert.Equal(t, expectedReviews[i].Reviewer, review.Reviewer) assert.Equal(t, expectedReviews[i].Type, review.Type) From 94fff1febcbff832482bd2d4e1d1eb7b971b83e9 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 6 Oct 2025 12:11:52 -0700 Subject: [PATCH 3/3] Fix test --- models/issues/review_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/models/issues/review_test.go b/models/issues/review_test.go index 41fa90b3de00d..6795ea8e661ce 100644 --- a/models/issues/review_test.go +++ b/models/issues/review_test.go @@ -122,6 +122,7 @@ func TestGetReviewersByIssueID(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 3}) + user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3}) user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) @@ -129,6 +130,12 @@ func TestGetReviewersByIssueID(t *testing.T) { expectedReviews := []*issues_model.Review{} expectedReviews = append(expectedReviews, + &issues_model.Review{ + ID: 5, + Reviewer: user1, + Type: issues_model.ReviewTypeComment, + UpdatedUnix: 946684810, + }, &issues_model.Review{ ID: 7, Reviewer: org3, @@ -169,6 +176,7 @@ func TestGetReviewersByIssueID(t *testing.T) { } if assert.Len(t, allReviews, 6) { for i, review := range allReviews { + assert.Equal(t, expectedReviews[i].ID, review.ID) assert.Equal(t, expectedReviews[i].Reviewer, review.Reviewer) assert.Equal(t, expectedReviews[i].Type, review.Type) assert.Equal(t, expectedReviews[i].UpdatedUnix, review.UpdatedUnix)