Skip to content

Commit 677c07d

Browse files
lunnyGiteaBot
authored andcommitted
Fix inputing review comment will remove reviewer (#35591)
Fix #34617
1 parent 08c6ea6 commit 677c07d

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
@@ -123,13 +123,20 @@ func TestGetReviewersByIssueID(t *testing.T) {
123123
assert.NoError(t, unittest.PrepareTestDatabase())
124124

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

131132
expectedReviews := []*issues_model.Review{}
132133
expectedReviews = append(expectedReviews,
134+
&issues_model.Review{
135+
ID: 5,
136+
Reviewer: user1,
137+
Type: issues_model.ReviewTypeComment,
138+
UpdatedUnix: 946684810,
139+
},
133140
&issues_model.Review{
134141
ID: 7,
135142
Reviewer: org3,
@@ -168,8 +175,9 @@ func TestGetReviewersByIssueID(t *testing.T) {
168175
for _, review := range allReviews {
169176
assert.NoError(t, review.LoadReviewer(db.DefaultContext))
170177
}
171-
if assert.Len(t, allReviews, 5) {
178+
if assert.Len(t, allReviews, 6) {
172179
for i, review := range allReviews {
180+
assert.Equal(t, expectedReviews[i].ID, review.ID)
173181
assert.Equal(t, expectedReviews[i].Reviewer, review.Reviewer)
174182
assert.Equal(t, expectedReviews[i].Type, review.Type)
175183
assert.Equal(t, expectedReviews[i].UpdatedUnix, review.UpdatedUnix)

0 commit comments

Comments
 (0)