Skip to content

Commit

Permalink
Fix potential assignee query for repo (#18994)
Browse files Browse the repository at this point in the history
* Fix potential assignee query for repo

* Add tests for `GetRepoAssignees`

- As per #18994 (comment)

Co-authored-by: 6543 <[email protected]>
Co-authored-by: Gusted <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
  • Loading branch information
4 people authored Mar 4, 2022
1 parent 5184c83 commit e46a8c9
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion models/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func getRepoAssignees(ctx context.Context, repo *repo_model.Repository) (_ []*us
userIDs := make([]int64, 0, 10)
if err = e.Table("access").
Where("repo_id = ? AND mode >= ?", repo.ID, perm.AccessModeWrite).
Select("id").
Select("user_id").
Find(&userIDs); err != nil {
return nil, err
}
Expand Down
18 changes: 18 additions & 0 deletions models/repo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,21 @@ func TestLinkedRepository(t *testing.T) {
})
}
}

func TestRepoAssignees(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase())

repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}).(*repo_model.Repository)
users, err := GetRepoAssignees(repo2)
assert.NoError(t, err)
assert.Len(t, users, 1)
assert.Equal(t, users[0].ID, int64(2))

repo21 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 21}).(*repo_model.Repository)
users, err = GetRepoAssignees(repo21)
assert.NoError(t, err)
assert.Len(t, users, 3)
assert.Equal(t, users[0].ID, int64(15))
assert.Equal(t, users[1].ID, int64(18))
assert.Equal(t, users[2].ID, int64(16))
}

0 comments on commit e46a8c9

Please sign in to comment.