GH-11085 Migrate Team.GetAllTeamPageListing to Sync by default (#11106)

* GH-11085 Migrate Team.GetAllTeamPageListing to Sync by default

* GH-11085 review fixes

* GH-11085 rename data to teams

* GH-11085 revert i18n changes
Этот коммит содержится в:
Marc Argent
2019-06-16 17:11:24 +01:00
коммит произвёл Jesús Espino
родитель f934502a56
Коммит 1a57018adf
5 изменённых файлов: 51 добавлений и 58 удалений

Просмотреть файл

@@ -436,22 +436,19 @@ func (s SqlTeamStore) GetAllTeamListing() store.StoreChannel {
})
}
func (s SqlTeamStore) GetAllTeamPageListing(offset int, limit int) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
query := "SELECT * FROM Teams WHERE AllowOpenInvite = 1 ORDER BY DisplayName LIMIT :Limit OFFSET :Offset"
func (s SqlTeamStore) GetAllTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError) {
query := "SELECT * FROM Teams WHERE AllowOpenInvite = 1 ORDER BY DisplayName LIMIT :Limit OFFSET :Offset"
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
query = "SELECT * FROM Teams WHERE AllowOpenInvite = true ORDER BY DisplayName LIMIT :Limit OFFSET :Offset"
}
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
query = "SELECT * FROM Teams WHERE AllowOpenInvite = true ORDER BY DisplayName LIMIT :Limit OFFSET :Offset"
}
var data []*model.Team
if _, err := s.GetReplica().Select(&data, query, map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil {
result.Err = model.NewAppError("SqlTeamStore.GetAllTeamListing", "store.sql_team.get_all_team_listing.app_error", nil, err.Error(), http.StatusInternalServerError)
return
}
var teams []*model.Team
if _, err := s.GetReplica().Select(&teams, query, map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil {
return nil, model.NewAppError("SqlTeamStore.GetAllTeamListing", "store.sql_team.get_all_team_listing.app_error", nil, err.Error(), http.StatusInternalServerError)
}
result.Data = data
})
return teams, nil
}
func (s SqlTeamStore) PermanentDelete(teamId string) store.StoreChannel {