IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Migrate 'Channel.GetMembersByIds' to Sync by default (#11287)

Browse Source
This commit is contained in:
Shota Gvinepadze
2019-06-19 20:20:19 +04:00
committed by Jesús Espino
parent a39ceadd58
commit aad50f7b2c
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/channel.go
View File

@@ -1299,11 +1299,7 @@ func (a *App) GetChannelMembersTimezones(channelId string) ([]string, *model.App
}
func (a *App) GetChannelMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, *model.AppError) {
result := <-a.Srv.Store.Channel().GetMembersByIds(channelId, userIds)
if result.Err != nil {
return nil, result.Err
}
return result.Data.(*model.ChannelMembers), nil
return a.Srv.Store.Channel().GetMembersByIds(channelId, userIds)
}
func (a *App) GetChannelMembersForUser(teamId string, userId string) (*model.ChannelMembers, *model.AppError) {

35
store/sqlstore/channel_store.go
View File

@@ -2265,30 +2265,27 @@ func (s SqlChannelStore) performSearch(searchQuery string, term string, paramete
return &channels, nil
}
func (s SqlChannelStore) GetMembersByIds(channelId string, userIds []string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
var dbMembers channelMemberWithSchemeRolesList
props := make(map[string]interface{})
idQuery := ""
func (s SqlChannelStore) GetMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, *model.AppError) {
var dbMembers channelMemberWithSchemeRolesList
props := make(map[string]interface{})
idQuery := ""
for index, userId := range userIds {
if len(idQuery) > 0 {
idQuery += ", "
}
props["userId"+strconv.Itoa(index)] = userId
idQuery += ":userId" + strconv.Itoa(index)
for index, userId := range userIds {
if len(idQuery) > 0 {
idQuery += ", "
}
props["ChannelId"] = channelId
props["userId"+strconv.Itoa(index)] = userId
idQuery += ":userId" + strconv.Itoa(index)
}
if _, err := s.GetReplica().Select(&dbMembers, CHANNEL_MEMBERS_WITH_SCHEME_SELECT_QUERY+"WHERE ChannelMembers.ChannelId = :ChannelId AND ChannelMembers.UserId IN ("+idQuery+")", props); err != nil {
result.Err = model.NewAppError("SqlChannelStore.GetMembersByIds", "store.sql_channel.get_members_by_ids.app_error", nil, "channelId="+channelId+" "+err.Error(), http.StatusInternalServerError)
return
}
props["ChannelId"] = channelId
result.Data = dbMembers.ToModel()
})
if _, err := s.GetReplica().Select(&dbMembers, CHANNEL_MEMBERS_WITH_SCHEME_SELECT_QUERY+"WHERE ChannelMembers.ChannelId = :ChannelId AND ChannelMembers.UserId IN ("+idQuery+")", props); err != nil {
return nil, model.NewAppError("SqlChannelStore.GetMembersByIds", "store.sql_channel.get_members_by_ids.app_error", nil, "channelId="+channelId+" "+err.Error(), http.StatusInternalServerError)
}
return dbMembers.ToModel(), nil
}
func (s SqlChannelStore) GetChannelsByScheme(schemeId string, offset int, limit int) store.StoreChannel {

2
store/store.go
View File

@@ -185,7 +185,7 @@ type ChannelStore interface {
SearchAllChannels(term string, opts ChannelSearchOpts) StoreChannel
SearchInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, *model.AppError)
SearchMore(userId string, teamId string, term string) (*model.ChannelList, *model.AppError)
GetMembersByIds(channelId string, userIds []string) StoreChannel
GetMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, *model.AppError)
AnalyticsDeletedTypeCount(teamId string, channelType string) (int64, *model.AppError)
GetChannelUnread(channelId, userId string) (*model.ChannelUnread, *model.AppError)
ClearCaches()

16
store/storetest/channel_store.go
View File

@@ -2678,10 +2678,10 @@ func testChannelStoreGetMembersByIds(t *testing.T, ss store.Store) {
m1 := &model.ChannelMember{ChannelId: o1.Id, UserId: model.NewId(), NotifyProps: model.GetDefaultChannelNotifyProps()}
store.Must(ss.Channel().SaveMember(m1))
if r := <-ss.Channel().GetMembersByIds(m1.ChannelId, []string{m1.UserId}); r.Err != nil {
t.Fatal(r.Err)
if members, err := ss.Channel().GetMembersByIds(m1.ChannelId, []string{m1.UserId}); err != nil {
t.Fatal(err)
} else {
rm1 := (*r.Data.(*model.ChannelMembers))[0]
rm1 := (*members)[0]
if rm1.ChannelId != m1.ChannelId {
t.Fatal("bad team id")
@@ -2695,17 +2695,15 @@ func testChannelStoreGetMembersByIds(t *testing.T, ss store.Store) {
m2 := &model.ChannelMember{ChannelId: o1.Id, UserId: model.NewId(), NotifyProps: model.GetDefaultChannelNotifyProps()}
store.Must(ss.Channel().SaveMember(m2))
if r := <-ss.Channel().GetMembersByIds(m1.ChannelId, []string{m1.UserId, m2.UserId, model.NewId()}); r.Err != nil {
t.Fatal(r.Err)
if members, err := ss.Channel().GetMembersByIds(m1.ChannelId, []string{m1.UserId, m2.UserId, model.NewId()}); err != nil {
t.Fatal(err)
} else {
rm := (*r.Data.(*model.ChannelMembers))
if len(rm) != 2 {
if len(*members) != 2 {
t.Fatal("return wrong number of results")
}
}
if r := <-ss.Channel().GetMembersByIds(m1.ChannelId, []string{}); r.Err == nil {
if _, err := ss.Channel().GetMembersByIds(m1.ChannelId, []string{}); err == nil {
t.Fatal("empty user ids - should have failed")
}
}

19
store/storetest/mocks/ChannelStore.go
View File

@@ -728,19 +728,28 @@ func (_m *ChannelStore) GetMembers(channelId string, offset int, limit int) stor
}
// GetMembersByIds provides a mock function with given fields: channelId, userIds
func (_m *ChannelStore) GetMembersByIds(channelId string, userIds []string) store.StoreChannel {
func (_m *ChannelStore) GetMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, *model.AppError) {
ret := _m.Called(channelId, userIds)
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func(string, []string) store.StoreChannel); ok {
var r0 *model.ChannelMembers
if rf, ok := ret.Get(0).(func(string, []string) *model.ChannelMembers); ok {
r0 = rf(channelId, userIds)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
r0 = ret.Get(0).(*model.ChannelMembers)
}
}
return r0
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, []string) *model.AppError); ok {
r1 = rf(channelId, userIds)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
}
return r0, r1
}
// GetMembersForUser provides a mock function with given fields: teamId, userId