Team/Channel members bulk save/update/delete (#14053)
* Members Save Multiple * Multiple Channel Members implemented * Working version with member multi save and multi update * Adding tests to the save multiple team members store methods * Tests passing for SaveMember * Adding remove members tests * Working on channel store tests * More work on testing properly SaveMember and SaveMultipleMembers on channels * More work on testing properly SaveMember and SaveMultipleMembers on teams * Adding tests for update multiple members for team * Adding tests for update multiple members for channel * Fixing some tets * Fixing tests * Fixing tests * Fixing i18n * Addressing govet problems * Addressing govet problems * Addressing govet problems * Addressing govet problems * Addressing PR comments (and removing TODO) * Addressing PR comments * Fixed broken test * Removing unnecesary i18n translation string
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
d2848cc167
Коммит
cfe65a33a5
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
@@ -1350,6 +1350,22 @@ func (_m *ChannelStore) RemoveMember(channelId string, userId string) *model.App
|
||||
return r0
|
||||
}
|
||||
|
||||
// RemoveMembers provides a mock function with given fields: channelId, userIds
|
||||
func (_m *ChannelStore) RemoveMembers(channelId string, userIds []string) *model.AppError {
|
||||
ret := _m.Called(channelId, userIds)
|
||||
|
||||
var r0 *model.AppError
|
||||
if rf, ok := ret.Get(0).(func(string, []string) *model.AppError); ok {
|
||||
r0 = rf(channelId, userIds)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.AppError)
|
||||
}
|
||||
}
|
||||
|
||||
return r0
|
||||
}
|
||||
|
||||
// ResetAllChannelSchemes provides a mock function with given fields:
|
||||
func (_m *ChannelStore) ResetAllChannelSchemes() *model.AppError {
|
||||
ret := _m.Called()
|
||||
@@ -1457,6 +1473,31 @@ func (_m *ChannelStore) SaveMember(member *model.ChannelMember) (*model.ChannelM
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// SaveMultipleMembers provides a mock function with given fields: members
|
||||
func (_m *ChannelStore) SaveMultipleMembers(members []*model.ChannelMember) ([]*model.ChannelMember, *model.AppError) {
|
||||
ret := _m.Called(members)
|
||||
|
||||
var r0 []*model.ChannelMember
|
||||
if rf, ok := ret.Get(0).(func([]*model.ChannelMember) []*model.ChannelMember); ok {
|
||||
r0 = rf(members)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]*model.ChannelMember)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func([]*model.ChannelMember) *model.AppError); ok {
|
||||
r1 = rf(members)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// SearchAllChannels provides a mock function with given fields: term, opts
|
||||
func (_m *ChannelStore) SearchAllChannels(term string, opts store.ChannelSearchOpts) (*model.ChannelListWithTeamData, int64, *model.AppError) {
|
||||
ret := _m.Called(term, opts)
|
||||
@@ -1746,6 +1787,31 @@ func (_m *ChannelStore) UpdateMembersRole(channelID string, userIDs []string) *m
|
||||
return r0
|
||||
}
|
||||
|
||||
// UpdateMultipleMembers provides a mock function with given fields: members
|
||||
func (_m *ChannelStore) UpdateMultipleMembers(members []*model.ChannelMember) ([]*model.ChannelMember, *model.AppError) {
|
||||
ret := _m.Called(members)
|
||||
|
||||
var r0 []*model.ChannelMember
|
||||
if rf, ok := ret.Get(0).(func([]*model.ChannelMember) []*model.ChannelMember); ok {
|
||||
r0 = rf(members)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]*model.ChannelMember)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func([]*model.ChannelMember) *model.AppError); ok {
|
||||
r1 = rf(members)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// UserBelongsToChannels provides a mock function with given fields: userId, channelIds
|
||||
func (_m *ChannelStore) UserBelongsToChannels(userId string, channelIds []string) (bool, *model.AppError) {
|
||||
ret := _m.Called(userId, channelIds)
|
||||
|
||||
@@ -865,6 +865,22 @@ func (_m *TeamStore) RemoveMember(teamId string, userId string) *model.AppError
|
||||
return r0
|
||||
}
|
||||
|
||||
// RemoveMembers provides a mock function with given fields: teamId, userIds
|
||||
func (_m *TeamStore) RemoveMembers(teamId string, userIds []string) *model.AppError {
|
||||
ret := _m.Called(teamId, userIds)
|
||||
|
||||
var r0 *model.AppError
|
||||
if rf, ok := ret.Get(0).(func(string, []string) *model.AppError); ok {
|
||||
r0 = rf(teamId, userIds)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.AppError)
|
||||
}
|
||||
}
|
||||
|
||||
return r0
|
||||
}
|
||||
|
||||
// ResetAllTeamSchemes provides a mock function with given fields:
|
||||
func (_m *TeamStore) ResetAllTeamSchemes() *model.AppError {
|
||||
ret := _m.Called()
|
||||
@@ -931,6 +947,31 @@ func (_m *TeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// SaveMultipleMembers provides a mock function with given fields: members, maxUsersPerTeam
|
||||
func (_m *TeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, *model.AppError) {
|
||||
ret := _m.Called(members, maxUsersPerTeam)
|
||||
|
||||
var r0 []*model.TeamMember
|
||||
if rf, ok := ret.Get(0).(func([]*model.TeamMember, int) []*model.TeamMember); ok {
|
||||
r0 = rf(members, maxUsersPerTeam)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]*model.TeamMember)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func([]*model.TeamMember, int) *model.AppError); ok {
|
||||
r1 = rf(members, maxUsersPerTeam)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// SearchAll provides a mock function with given fields: term
|
||||
func (_m *TeamStore) SearchAll(term string) ([]*model.Team, *model.AppError) {
|
||||
ret := _m.Called(term)
|
||||
@@ -1120,6 +1161,31 @@ func (_m *TeamStore) UpdateMembersRole(teamID string, userIDs []string) *model.A
|
||||
return r0
|
||||
}
|
||||
|
||||
// UpdateMultipleMembers provides a mock function with given fields: members
|
||||
func (_m *TeamStore) UpdateMultipleMembers(members []*model.TeamMember) ([]*model.TeamMember, *model.AppError) {
|
||||
ret := _m.Called(members)
|
||||
|
||||
var r0 []*model.TeamMember
|
||||
if rf, ok := ret.Get(0).(func([]*model.TeamMember) []*model.TeamMember); ok {
|
||||
r0 = rf(members)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]*model.TeamMember)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func([]*model.TeamMember) *model.AppError); ok {
|
||||
r1 = rf(members)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// UserBelongsToTeams provides a mock function with given fields: userId, teamIds
|
||||
func (_m *TeamStore) UserBelongsToTeams(userId string, teamIds []string) (bool, *model.AppError) {
|
||||
ret := _m.Called(userId, teamIds)
|
||||
|
||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Ссылка в новой задаче
Block a user