diff options
| author | Jason Simmons <1382389+jasimmons@users.noreply.github.com> | 2018-10-22 08:49:50 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2018-10-22 08:49:50 -0400 |
| commit | 1ee872578c734956acc7f5e4168638de244c3ce2 (patch) | |
| tree | f0cf22a79c7b1b903ce5093479ee2cda509e7805 /plugin/plugintest | |
| parent | 6c6638f05e99f1463ff33983540aedb35271dbfc (diff) | |
| download | chat-1ee872578c734956acc7f5e4168638de244c3ce2.tar.gz chat-1ee872578c734956acc7f5e4168638de244c3ce2.tar.bz2 chat-1ee872578c734956acc7f5e4168638de244c3ce2.zip | |
GH-9636 plugins api GetUsersInChannelByStatus (#9645)
* adds GetUsersInChannelByStatus to plugin api with generated rpc code.
* fixed typo in comment with actual func name
* replaced Response model with AppError in output of GetUsersInChannelByStatus
* removed etag param from GetUsersInChannelByStatus since it is not used
* plugin api for GetUsersInChannelByStatus updated to take the limit, conforming to the app api.
* fixed an issue in my own logic on app/plugin integration.
* adds GetUsersInChannelByStatus to plugin api with generated rpc code.
* fixed typo in comment with actual func name
* replaced Response model with AppError in output of GetUsersInChannelByStatus
* removed etag param from GetUsersInChannelByStatus since it is not used
* plugin api for GetUsersInChannelByStatus updated to take the limit, conforming to the app api.
* fixed an issue in my own logic on app/plugin integration.
* GetUsersInChannelByStatus changed to more generic GetUsersInChannel which takes a sortBy parameter, allowing for more granular/extensible sorting functionality in the future
* GetUsersInChannel accepts sort parameter of 'username' and 'status'. Both values are consts in model pkg.
* Documents minimum server version for GetUsersInChannel.
* adds GetUsersInChannelByStatus to plugin api with generated rpc code.
* fixed typo in comment with actual func name
* replaced Response model with AppError in output of GetUsersInChannelByStatus
* removed etag param from GetUsersInChannelByStatus since it is not used
* plugin api for GetUsersInChannelByStatus updated to take the limit, conforming to the app api.
* fixed an issue in my own logic on app/plugin integration.
* adds GetUsersInChannelByStatus to plugin api with generated rpc code.
* Resolved conflict on rebase
* replaced Response model with AppError in output of GetUsersInChannelByStatus
* removed etag param from GetUsersInChannelByStatus since it is not used
* plugin api for GetUsersInChannelByStatus updated to take the limit, conforming to the app api.
* fixed an issue in my own logic on app/plugin integration.
* GetUsersInChannelByStatus changed to more generic GetUsersInChannel which takes a sortBy parameter, allowing for more granular/extensible sorting functionality in the future
* GetUsersInChannel accepts sort parameter of 'username' and 'status'. Both values are consts in model pkg.
* Documents minimum server version for GetUsersInChannel.
* replaces GetUsersInChannel from #9608 / #9643 with sortBy functionality
Diffstat (limited to 'plugin/plugintest')
| -rw-r--r-- | plugin/plugintest/api.go | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/plugin/plugintest/api.go b/plugin/plugintest/api.go index b3df3616f..4e94e17af 100644 --- a/plugin/plugintest/api.go +++ b/plugin/plugintest/api.go @@ -1243,13 +1243,13 @@ func (_m *API) GetUsersByUsernames(usernames []string) ([]*model.User, *model.Ap return r0, r1 } -// GetUsersInTeam provides a mock function with given fields: teamId, page, perPage -func (_m *API) GetUsersInTeam(teamId string, page int, perPage int) ([]*model.User, *model.AppError) { - ret := _m.Called(teamId, page, perPage) +// GetUsersInChannel provides a mock function with given fields: channelId, sortBy, page, perPage +func (_m *API) GetUsersInChannel(channelId string, sortBy string, page int, perPage int) ([]*model.User, *model.AppError) { + ret := _m.Called(channelId, sortBy, page, perPage) var r0 []*model.User - if rf, ok := ret.Get(0).(func(string, int, int) []*model.User); ok { - r0 = rf(teamId, page, perPage) + if rf, ok := ret.Get(0).(func(string, string, int, int) []*model.User); ok { + r0 = rf(channelId, sortBy, page, perPage) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.User) @@ -1257,8 +1257,9 @@ func (_m *API) GetUsersInTeam(teamId string, page int, perPage int) ([]*model.Us } var r1 *model.AppError - if rf, ok := ret.Get(1).(func(string, int, int) *model.AppError); ok { - r1 = rf(teamId, page, perPage) + + if rf, ok := ret.Get(1).(func(string, string, int, int) *model.AppError); ok { + r1 = rf(channelId, sortBy, page, perPage) } else { if ret.Get(1) != nil { r1 = ret.Get(1).(*model.AppError) @@ -1268,13 +1269,13 @@ func (_m *API) GetUsersInTeam(teamId string, page int, perPage int) ([]*model.Us return r0, r1 } -// GetUsersInChannel provides a mock function with given fields: channelId, page, perPage -func (_m *API) GetUsersInChannel(channelId string, page int, perPage int) ([]*model.User, *model.AppError) { - ret := _m.Called(channelId, page, perPage) +// GetUsersInTeam provides a mock function with given fields: teamId, page, perPage +func (_m *API) GetUsersInTeam(teamId string, page int, perPage int) ([]*model.User, *model.AppError) { + ret := _m.Called(teamId, page, perPage) var r0 []*model.User if rf, ok := ret.Get(0).(func(string, int, int) []*model.User); ok { - r0 = rf(channelId, page, perPage) + r0 = rf(teamId, page, perPage) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.User) @@ -1283,7 +1284,7 @@ func (_m *API) GetUsersInChannel(channelId string, page int, perPage int) ([]*mo var r1 *model.AppError if rf, ok := ret.Get(1).(func(string, int, int) *model.AppError); ok { - r1 = rf(channelId, page, perPage) + r1 = rf(teamId, page, perPage) } else { if ret.Get(1) != nil { r1 = ret.Get(1).(*model.AppError) |