Skip to content

Commit 9f664ab

Browse files
authored
Fix inputing review comment will remove reviewer (#35591)
Fix #34617
1 parent 94d99c9 commit 9f664ab

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

models/issues/review_list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ func GetReviewsByIssueID(ctx context.Context, issueID int64) (latestReviews, mig
173173
reviewersMap := make(map[int64][]*Review) // key is reviewer id
174174
originalReviewersMap := make(map[int64][]*Review) // key is original author id
175175
reviewTeamsMap := make(map[int64][]*Review) // key is reviewer team id
176-
countedReivewTypes := []ReviewType{ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest}
176+
countedReivewTypes := []ReviewType{ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest, ReviewTypeComment}
177177
for _, review := range reviews {
178178
if review.ReviewerTeamID == 0 && slices.Contains(countedReivewTypes, review.Type) && !review.Dismissed {
179179
if review.OriginalAuthorID != 0 {

models/issues/review_test.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,20 @@ func TestGetReviewersByIssueID(t *testing.T) {
122122
assert.NoError(t, unittest.PrepareTestDatabase())
123123

124124
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 3})
125+
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
125126
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
126127
org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
127128
user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
128129
user5 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
129130

130131
expectedReviews := []*issues_model.Review{}
131132
expectedReviews = append(expectedReviews,
133+
&issues_model.Review{
134+
ID: 5,
135+
Reviewer: user1,
136+
Type: issues_model.ReviewTypeComment,
137+
UpdatedUnix: 946684810,
138+
},
132139
&issues_model.Review{
133140
ID: 7,
134141
Reviewer: org3,
@@ -167,8 +174,9 @@ func TestGetReviewersByIssueID(t *testing.T) {
167174
for _, review := range allReviews {
168175
assert.NoError(t, review.LoadReviewer(t.Context()))
169176
}
170-
if assert.Len(t, allReviews, 5) {
177+
if assert.Len(t, allReviews, 6) {
171178
for i, review := range allReviews {
179+
assert.Equal(t, expectedReviews[i].ID, review.ID)
172180
assert.Equal(t, expectedReviews[i].Reviewer, review.Reviewer)
173181
assert.Equal(t, expectedReviews[i].Type, review.Type)
174182
assert.Equal(t, expectedReviews[i].UpdatedUnix, review.UpdatedUnix)

0 commit comments

Comments
 (0)