From 7e092886dc4d0bfb799e5d748d5dfb279de0fd8d Mon Sep 17 00:00:00 2001 From: Taufiq Rahman Date: Fri, 26 Jul 2019 17:11:13 +0600 Subject: [PATCH] [MM-16658] Migrate User.GetProfilesInChannel to Sync by default #11462 (#11685) * Migrate User.GetProfilesInChannel to Sync by default #11462 * Refactor variable names #11462 --- app/user.go | 6 +---- store/sqlstore/user_store.go | 40 ++++++++++++++---------------- store/store.go | 2 +- store/storetest/mocks/UserStore.go | 19 ++++++++++---- store/storetest/user_store.go | 18 +++++++------- 5 files changed, 43 insertions(+), 42 deletions(-) diff --git a/app/user.go b/app/user.go index b353b12b3f..3d2b06abe0 100644 --- a/app/user.go +++ b/app/user.go @@ -516,11 +516,7 @@ func (a *App) GetUsersNotInTeamEtag(teamId string, restrictionsHash string) stri } func (a *App) GetUsersInChannel(channelId string, offset int, limit int) ([]*model.User, *model.AppError) { - result := <-a.Srv.Store.User().GetProfilesInChannel(channelId, offset, limit) - if result.Err != nil { - return nil, result.Err - } - return result.Data.([]*model.User), nil + return a.Srv.Store.User().GetProfilesInChannel(channelId, offset, limit) } func (a *App) GetUsersInChannelByStatus(channelId string, offset int, limit int) ([]*model.User, *model.AppError) { diff --git a/store/sqlstore/user_store.go b/store/sqlstore/user_store.go index 981277ad9e..6f7d8e63ef 100644 --- a/store/sqlstore/user_store.go +++ b/store/sqlstore/user_store.go @@ -529,32 +529,28 @@ func (us SqlUserStore) InvalidateProfilesInChannelCache(channelId string) { } } -func (us SqlUserStore) GetProfilesInChannel(channelId string, offset int, limit int) store.StoreChannel { - return store.Do(func(result *store.StoreResult) { - query := us.usersQuery. - Join("ChannelMembers cm ON ( cm.UserId = u.Id )"). - Where("cm.ChannelId = ?", channelId). - OrderBy("u.Username ASC"). - Offset(uint64(offset)).Limit(uint64(limit)) +func (us SqlUserStore) GetProfilesInChannel(channelId string, offset int, limit int) ([]*model.User, *model.AppError) { + query := us.usersQuery. + Join("ChannelMembers cm ON ( cm.UserId = u.Id )"). + Where("cm.ChannelId = ?", channelId). + OrderBy("u.Username ASC"). + Offset(uint64(offset)).Limit(uint64(limit)) - queryString, args, err := query.ToSql() - if err != nil { - result.Err = model.NewAppError("SqlUserStore.GetProfilesInChannel", "store.sql_user.app_error", nil, err.Error(), http.StatusInternalServerError) - return - } + queryString, args, err := query.ToSql() + if err != nil { + return nil, model.NewAppError("SqlUserStore.GetProfilesInChannel", "store.sql_user.app_error", nil, err.Error(), http.StatusInternalServerError) + } - var users []*model.User - if _, err := us.GetReplica().Select(&users, queryString, args...); err != nil { - result.Err = model.NewAppError("SqlUserStore.GetProfilesInChannel", "store.sql_user.get_profiles.app_error", nil, err.Error(), http.StatusInternalServerError) - return - } + var users []*model.User + if _, err := us.GetReplica().Select(&users, queryString, args...); err != nil { + return nil, model.NewAppError("SqlUserStore.GetProfilesInChannel", "store.sql_user.get_profiles.app_error", nil, err.Error(), http.StatusInternalServerError) + } - for _, u := range users { - u.Sanitize(map[string]bool{}) - } + for _, u := range users { + u.Sanitize(map[string]bool{}) + } - result.Data = users - }) + return users, nil } func (us SqlUserStore) GetProfilesInChannelByStatus(channelId string, offset int, limit int) ([]*model.User, *model.AppError) { diff --git a/store/store.go b/store/store.go index 3061102b0f..b78c3d1b6c 100644 --- a/store/store.go +++ b/store/store.go @@ -266,7 +266,7 @@ type UserStore interface { ClearCaches() InvalidateProfilesInChannelCacheByUser(userId string) InvalidateProfilesInChannelCache(channelId string) - GetProfilesInChannel(channelId string, offset int, limit int) StoreChannel + GetProfilesInChannel(channelId string, offset int, limit int) ([]*model.User, *model.AppError) GetProfilesInChannelByStatus(channelId string, offset int, limit int) ([]*model.User, *model.AppError) GetAllProfilesInChannel(channelId string, allowFromCache bool) (map[string]*model.User, *model.AppError) GetProfilesNotInChannel(teamId string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) diff --git a/store/storetest/mocks/UserStore.go b/store/storetest/mocks/UserStore.go index e308e86241..017b36cb2c 100644 --- a/store/storetest/mocks/UserStore.go +++ b/store/storetest/mocks/UserStore.go @@ -608,19 +608,28 @@ func (_m *UserStore) GetProfilesByUsernames(usernames []string, viewRestrictions } // GetProfilesInChannel provides a mock function with given fields: channelId, offset, limit -func (_m *UserStore) GetProfilesInChannel(channelId string, offset int, limit int) store.StoreChannel { +func (_m *UserStore) GetProfilesInChannel(channelId string, offset int, limit int) ([]*model.User, *model.AppError) { ret := _m.Called(channelId, offset, limit) - var r0 store.StoreChannel - if rf, ok := ret.Get(0).(func(string, int, int) store.StoreChannel); ok { + var r0 []*model.User + if rf, ok := ret.Get(0).(func(string, int, int) []*model.User); ok { r0 = rf(channelId, offset, limit) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(store.StoreChannel) + r0 = ret.Get(0).([]*model.User) } } - return r0 + var r1 *model.AppError + if rf, ok := ret.Get(1).(func(string, int, int) *model.AppError); ok { + r1 = rf(channelId, offset, limit) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(*model.AppError) + } + } + + return r0, r1 } // GetProfilesInChannelByStatus provides a mock function with given fields: channelId, offset, limit diff --git a/store/storetest/user_store.go b/store/storetest/user_store.go index 094be9d7fb..20f75bc70e 100644 --- a/store/storetest/user_store.go +++ b/store/storetest/user_store.go @@ -747,21 +747,21 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) { }) require.Nil(t, err) t.Run("get in channel 1, offset 0, limit 100", func(t *testing.T) { - result := <-ss.User().GetProfilesInChannel(c1.Id, 0, 100) - require.Nil(t, result.Err) - assert.Equal(t, []*model.User{sanitized(u1), sanitized(u2), sanitized(u3)}, result.Data.([]*model.User)) + users, err := ss.User().GetProfilesInChannel(c1.Id, 0, 100) + require.Nil(t, err) + assert.Equal(t, []*model.User{sanitized(u1), sanitized(u2), sanitized(u3)}, users) }) t.Run("get in channel 1, offset 1, limit 2", func(t *testing.T) { - result := <-ss.User().GetProfilesInChannel(c1.Id, 1, 2) - require.Nil(t, result.Err) - assert.Equal(t, []*model.User{sanitized(u2), sanitized(u3)}, result.Data.([]*model.User)) + users, err := ss.User().GetProfilesInChannel(c1.Id, 1, 2) + require.Nil(t, err) + assert.Equal(t, []*model.User{sanitized(u2), sanitized(u3)}, users) }) t.Run("get in channel 2, offset 0, limit 1", func(t *testing.T) { - result := <-ss.User().GetProfilesInChannel(c2.Id, 0, 1) - require.Nil(t, result.Err) - assert.Equal(t, []*model.User{sanitized(u1)}, result.Data.([]*model.User)) + users, err := ss.User().GetProfilesInChannel(c2.Id, 0, 1) + require.Nil(t, err) + assert.Equal(t, []*model.User{sanitized(u1)}, users) }) }