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

make user.Get all return []*model.User and *model.AppError (#11516)

Browse Source 
run mock generate
This commit is contained in:
Adzim Zul Fahmi
2019-07-05 20:39:15 +07:00
committed by Christopher Poile
parent d844c52f06
commit 8dfd3bab20
5 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/user.go
View File

@@ -1519,11 +1519,10 @@ func (a *App) PermanentDeleteUser(user *model.User) *model.AppError {
}
func (a *App) PermanentDeleteAllUsers() *model.AppError {
result := <-a.Srv.Store.User().GetAll()
if result.Err != nil {
return result.Err
users, err := a.Srv.Store.User().GetAll()
if err != nil {
return err
}
users := result.Data.([]*model.User)
for _, user := range users {
a.PermanentDeleteUser(user)
}

27
store/sqlstore/user_store.go
View File

@@ -340,24 +340,19 @@ func (us SqlUserStore) Get(id string) (*model.User, *model.AppError) {
return user, nil
}
func (us SqlUserStore) GetAll() store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
query := us.usersQuery.OrderBy("Username ASC")
func (us SqlUserStore) GetAll() ([]*model.User, *model.AppError) {
query := us.usersQuery.OrderBy("Username ASC")
queryString, args, err := query.ToSql()
if err != nil {
result.Err = model.NewAppError("SqlUserStore.GetAll", "store.sql_user.app_error", nil, err.Error(), http.StatusInternalServerError)
return
}
queryString, args, err := query.ToSql()
if err != nil {
return nil, model.NewAppError("SqlUserStore.GetAll", "store.sql_user.app_error", nil, err.Error(), http.StatusInternalServerError)
}
var data []*model.User
if _, err := us.GetReplica().Select(&data, queryString, args...); err != nil {
result.Err = model.NewAppError("SqlUserStore.GetAll", "store.sql_user.get.app_error", nil, err.Error(), http.StatusInternalServerError)
return
}
result.Data = data
})
var data []*model.User
if _, err := us.GetReplica().Select(&data, queryString, args...); err != nil {
return nil, model.NewAppError("SqlUserStore.GetAll", "store.sql_user.get.app_error", nil, err.Error(), http.StatusInternalServerError)
}
return data, nil
}
func (us SqlUserStore) GetAllAfter(limit int, afterId string) ([]*model.User, *model.AppError) {

2
store/store.go
View File

@@ -259,7 +259,7 @@ type UserStore interface {
UpdateMfaSecret(userId, secret string) *model.AppError
UpdateMfaActive(userId string, active bool) StoreChannel
Get(id string) (*model.User, *model.AppError)
GetAll() StoreChannel
GetAll() ([]*model.User, *model.AppError)
ClearCaches()
InvalidateProfilesInChannelCacheByUser(userId string)
InvalidateProfilesInChannelCache(channelId string)

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

@@ -152,19 +152,28 @@ func (_m *UserStore) Get(id string) (*model.User, *model.AppError) {
}
// GetAll provides a mock function with given fields:
func (_m *UserStore) GetAll() store.StoreChannel {
func (_m *UserStore) GetAll() ([]*model.User, *model.AppError) {
ret := _m.Called()
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func() store.StoreChannel); ok {
var r0 []*model.User
if rf, ok := ret.Get(0).(func() []*model.User); ok {
r0 = rf()
} 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() *model.AppError); ok {
r1 = rf()
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
}
return r0, r1
}
// GetAllAfter provides a mock function with given fields: limit, afterId

10
store/storetest/user_store.go
View File

@@ -16,9 +16,8 @@ import (
)
func TestUserStore(t *testing.T, ss store.Store) {
result := <-ss.User().GetAll()
require.Nil(t, result.Err, "failed cleaning up test users")
users := result.Data.([]*model.User)
users, err := ss.User().GetAll()
require.Nil(t, err, "failed cleaning up test users")
for _, u := range users {
err := ss.User().PermanentDelete(u.Id)
@@ -441,10 +440,9 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) {
})
t.Run("get all", func(t *testing.T) {
result := <-ss.User().GetAll()
require.Nil(t, result.Err)
actual, err := ss.User().GetAll()
require.Nil(t, err)
actual := result.Data.([]*model.User)
require.Equal(t, []*model.User{
u1,
u2,