[MM-12476] Consistent paging arguments limit/offset vs page/perPage for plugin API (#9838)
* Change GetTeamMembers() and GetPublicChannelsForTeam() arguments to page, perPage for plugin API * Add test for GetPublicChannelsForTeam() * Add test for GetTeamMembers() * Changes as requested * Change return from GetPublicChannelsForTeam() to []*model.Channel
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
bffac3f09f
Коммит
2104c6878c
@@ -1456,8 +1456,8 @@ type Z_GetTeamMembersReturns struct {
|
||||
B *model.AppError
|
||||
}
|
||||
|
||||
func (g *apiRPCClient) GetTeamMembers(teamId string, offset, limit int) ([]*model.TeamMember, *model.AppError) {
|
||||
_args := &Z_GetTeamMembersArgs{teamId, offset, limit}
|
||||
func (g *apiRPCClient) GetTeamMembers(teamId string, page, perPage int) ([]*model.TeamMember, *model.AppError) {
|
||||
_args := &Z_GetTeamMembersArgs{teamId, page, perPage}
|
||||
_returns := &Z_GetTeamMembersReturns{}
|
||||
if err := g.client.Call("Plugin.GetTeamMembers", _args, _returns); err != nil {
|
||||
log.Printf("RPC call to GetTeamMembers API failed: %s", err.Error())
|
||||
@@ -1467,7 +1467,7 @@ func (g *apiRPCClient) GetTeamMembers(teamId string, offset, limit int) ([]*mode
|
||||
|
||||
func (s *apiRPCServer) GetTeamMembers(args *Z_GetTeamMembersArgs, returns *Z_GetTeamMembersReturns) error {
|
||||
if hook, ok := s.impl.(interface {
|
||||
GetTeamMembers(teamId string, offset, limit int) ([]*model.TeamMember, *model.AppError)
|
||||
GetTeamMembers(teamId string, page, perPage int) ([]*model.TeamMember, *model.AppError)
|
||||
}); ok {
|
||||
returns.A, returns.B = hook.GetTeamMembers(args.A, args.B, args.C)
|
||||
} else {
|
||||
@@ -1601,12 +1601,12 @@ type Z_GetPublicChannelsForTeamArgs struct {
|
||||
}
|
||||
|
||||
type Z_GetPublicChannelsForTeamReturns struct {
|
||||
A *model.ChannelList
|
||||
A []*model.Channel
|
||||
B *model.AppError
|
||||
}
|
||||
|
||||
func (g *apiRPCClient) GetPublicChannelsForTeam(teamId string, offset, limit int) (*model.ChannelList, *model.AppError) {
|
||||
_args := &Z_GetPublicChannelsForTeamArgs{teamId, offset, limit}
|
||||
func (g *apiRPCClient) GetPublicChannelsForTeam(teamId string, page, perPage int) ([]*model.Channel, *model.AppError) {
|
||||
_args := &Z_GetPublicChannelsForTeamArgs{teamId, page, perPage}
|
||||
_returns := &Z_GetPublicChannelsForTeamReturns{}
|
||||
if err := g.client.Call("Plugin.GetPublicChannelsForTeam", _args, _returns); err != nil {
|
||||
log.Printf("RPC call to GetPublicChannelsForTeam API failed: %s", err.Error())
|
||||
@@ -1616,7 +1616,7 @@ func (g *apiRPCClient) GetPublicChannelsForTeam(teamId string, offset, limit int
|
||||
|
||||
func (s *apiRPCServer) GetPublicChannelsForTeam(args *Z_GetPublicChannelsForTeamArgs, returns *Z_GetPublicChannelsForTeamReturns) error {
|
||||
if hook, ok := s.impl.(interface {
|
||||
GetPublicChannelsForTeam(teamId string, offset, limit int) (*model.ChannelList, *model.AppError)
|
||||
GetPublicChannelsForTeam(teamId string, page, perPage int) ([]*model.Channel, *model.AppError)
|
||||
}); ok {
|
||||
returns.A, returns.B = hook.GetPublicChannelsForTeam(args.A, args.B, args.C)
|
||||
} else {
|
||||
|
||||
Ссылка в новой задаче
Block a user