[MM-16165] Migrate Team.GetAllPage to Sync by default (#11201)
* [MM-16165] Migrate Team.GetAllPage to Sync by default * [MM-16165] Pull Request suggested changes: remove else
Этот коммит содержится в:
коммит произвёл
Christopher Poile
родитель
e15a75a2ec
Коммит
6bb147c380
@@ -611,11 +611,7 @@ func (a *App) GetAllTeams() ([]*model.Team, *model.AppError) {
|
||||
}
|
||||
|
||||
func (a *App) GetAllTeamsPage(offset int, limit int) ([]*model.Team, *model.AppError) {
|
||||
result := <-a.Srv.Store.Team().GetAllPage(offset, limit)
|
||||
if result.Err != nil {
|
||||
return nil, result.Err
|
||||
}
|
||||
return result.Data.([]*model.Team), nil
|
||||
return a.Srv.Store.Team().GetAllPage(offset, limit)
|
||||
}
|
||||
|
||||
func (a *App) GetAllPrivateTeams() ([]*model.Team, *model.AppError) {
|
||||
|
||||
@@ -339,11 +339,11 @@ func (s SqlTeamStore) SearchPrivate(term string) ([]*model.Team, *model.AppError
|
||||
var teams []*model.Team
|
||||
|
||||
query :=
|
||||
`SELECT *
|
||||
FROM
|
||||
Teams
|
||||
WHERE
|
||||
(Type != 'O' OR AllowOpenInvite = false) AND
|
||||
`SELECT *
|
||||
FROM
|
||||
Teams
|
||||
WHERE
|
||||
(Type != 'O' OR AllowOpenInvite = false) AND
|
||||
(Name LIKE :Term OR DisplayName LIKE :Term)`
|
||||
if _, err := s.GetReplica().Select(&teams, query, map[string]interface{}{"Term": term + "%"}); err != nil {
|
||||
return nil, model.NewAppError("SqlTeamStore.SearchPrivate", "store.sql_team.search_private_team.app_error", nil, "term="+term+", "+err.Error(), http.StatusInternalServerError)
|
||||
@@ -361,16 +361,25 @@ func (s SqlTeamStore) GetAll() ([]*model.Team, *model.AppError) {
|
||||
return teams, nil
|
||||
}
|
||||
|
||||
func (s SqlTeamStore) GetAllPage(offset int, limit int) store.StoreChannel {
|
||||
return store.Do(func(result *store.StoreResult) {
|
||||
var data []*model.Team
|
||||
if _, err := s.GetReplica().Select(&data, "SELECT * FROM Teams ORDER BY DisplayName LIMIT :Limit OFFSET :Offset", map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil {
|
||||
result.Err = model.NewAppError("SqlTeamStore.GetAllTeams", "store.sql_team.get_all.app_error", nil, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
func (s SqlTeamStore) GetAllPage(offset int, limit int) ([]*model.Team, *model.AppError) {
|
||||
var teams []*model.Team
|
||||
|
||||
result.Data = data
|
||||
})
|
||||
if _, err := s.GetReplica().Select(&teams,
|
||||
`SELECT
|
||||
*
|
||||
FROM
|
||||
Teams
|
||||
ORDER BY
|
||||
DisplayName
|
||||
LIMIT
|
||||
:Limit
|
||||
OFFSET
|
||||
:Offset`, map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil {
|
||||
return nil, model.NewAppError("SqlTeamStore.GetAllTeams",
|
||||
"store.sql_team.get_all.app_error", nil, err.Error(), http.StatusInternalServerError)
|
||||
}
|
||||
|
||||
return teams, nil
|
||||
}
|
||||
|
||||
func (s SqlTeamStore) GetTeamsByUserId(userId string) store.StoreChannel {
|
||||
|
||||
@@ -91,7 +91,7 @@ type TeamStore interface {
|
||||
SearchOpen(term string) StoreChannel
|
||||
SearchPrivate(term string) ([]*model.Team, *model.AppError)
|
||||
GetAll() ([]*model.Team, *model.AppError)
|
||||
GetAllPage(offset int, limit int) StoreChannel
|
||||
GetAllPage(offset int, limit int) ([]*model.Team, *model.AppError)
|
||||
GetAllPrivateTeamListing() StoreChannel
|
||||
GetAllPrivateTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError)
|
||||
GetAllTeamListing() StoreChannel
|
||||
|
||||
@@ -163,19 +163,28 @@ func (_m *TeamStore) GetAllForExportAfter(limit int, afterId string) store.Store
|
||||
}
|
||||
|
||||
// GetAllPage provides a mock function with given fields: offset, limit
|
||||
func (_m *TeamStore) GetAllPage(offset int, limit int) store.StoreChannel {
|
||||
func (_m *TeamStore) GetAllPage(offset int, limit int) ([]*model.Team, *model.AppError) {
|
||||
ret := _m.Called(offset, limit)
|
||||
|
||||
var r0 store.StoreChannel
|
||||
if rf, ok := ret.Get(0).(func(int, int) store.StoreChannel); ok {
|
||||
var r0 []*model.Team
|
||||
if rf, ok := ret.Get(0).(func(int, int) []*model.Team); ok {
|
||||
r0 = rf(offset, limit)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(store.StoreChannel)
|
||||
r0 = ret.Get(0).([]*model.Team)
|
||||
}
|
||||
}
|
||||
|
||||
return r0
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func(int, int) *model.AppError); ok {
|
||||
r1 = rf(offset, limit)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// GetAllPrivateTeamListing provides a mock function with given fields:
|
||||
|
||||
Ссылка в новой задаче
Block a user