[MM-28210] sqlstore/user_store: filter deleted users for GetProfilesInChannel (#15390)
* sqlstore/user_store: filter deleted users for GetProfilesInChannel * allow GetProfilesInChannel use userGetOptions * sqlstore/user_store: add more test cases * store/user_store: refine filter
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
9c272f0b20
Коммит
e69a2a41ca
@@ -528,7 +528,11 @@ func TestGetUsersByStatus(t *testing.T) {
|
||||
onlineUser2 := createUserWithStatus("online2", model.STATUS_ONLINE)
|
||||
|
||||
t.Run("sorting by status then alphabetical", func(t *testing.T) {
|
||||
usersByStatus, err := th.App.GetUsersInChannelPageByStatus(channel.Id, 0, 8, true)
|
||||
usersByStatus, err := th.App.GetUsersInChannelPageByStatus(&model.UserGetOptions{
|
||||
InChannelId: channel.Id,
|
||||
Page: 0,
|
||||
PerPage: 8,
|
||||
}, true)
|
||||
require.Nil(t, err)
|
||||
|
||||
expectedUsersByStatus := []*model.User{
|
||||
@@ -550,7 +554,11 @@ func TestGetUsersByStatus(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("paging", func(t *testing.T) {
|
||||
usersByStatus, err := th.App.GetUsersInChannelPageByStatus(channel.Id, 0, 3, true)
|
||||
usersByStatus, err := th.App.GetUsersInChannelPageByStatus(&model.UserGetOptions{
|
||||
InChannelId: channel.Id,
|
||||
Page: 0,
|
||||
PerPage: 3,
|
||||
}, true)
|
||||
require.Nil(t, err)
|
||||
|
||||
require.Equal(t, 3, len(usersByStatus), "received too many users")
|
||||
@@ -563,9 +571,14 @@ func TestGetUsersByStatus(t *testing.T) {
|
||||
|
||||
require.Equal(t, awayUser1.Id, usersByStatus[2].Id, "expected to receive away users second")
|
||||
|
||||
usersByStatus, err = th.App.GetUsersInChannelPageByStatus(channel.Id, 1, 3, true)
|
||||
usersByStatus, err = th.App.GetUsersInChannelPageByStatus(&model.UserGetOptions{
|
||||
InChannelId: channel.Id,
|
||||
Page: 1,
|
||||
PerPage: 3,
|
||||
}, true)
|
||||
require.Nil(t, err)
|
||||
|
||||
require.NotEmpty(t, usersByStatus, "at least some users are expected")
|
||||
require.Equal(t, awayUser2.Id, usersByStatus[0].Id, "expected to receive away users second")
|
||||
|
||||
require.False(
|
||||
@@ -574,7 +587,11 @@ func TestGetUsersByStatus(t *testing.T) {
|
||||
"expected to receive dnd users third",
|
||||
)
|
||||
|
||||
usersByStatus, err = th.App.GetUsersInChannelPageByStatus(channel.Id, 1, 4, true)
|
||||
usersByStatus, err = th.App.GetUsersInChannelPageByStatus(&model.UserGetOptions{
|
||||
InChannelId: channel.Id,
|
||||
Page: 1,
|
||||
PerPage: 4,
|
||||
}, true)
|
||||
require.Nil(t, err)
|
||||
|
||||
require.Equal(t, 4, len(usersByStatus), "received too many users")
|
||||
|
||||
Ссылка в новой задаче
Block a user