[MM-16161] Migrate Team.SearchAll to Sync by default (#11188)

* Migrate Team.SearchAll to Sync by default

* SearchAllTeams: return result directly
Этот коммит содержится в:
Woolim Cho
2019-06-20 23:10:17 +09:00
коммит произвёл Dean Whillier
родитель 59e7bf1c23
Коммит 0975409f8e
5 изменённых файлов: 26 добавлений и 25 удалений

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

@@ -309,17 +309,14 @@ func (s SqlTeamStore) SearchByName(name string) ([]*model.Team, *model.AppError)
return teams, nil
}
func (s SqlTeamStore) SearchAll(term string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
var teams []*model.Team
func (s SqlTeamStore) SearchAll(term string) ([]*model.Team, *model.AppError) {
var teams []*model.Team
if _, err := s.GetReplica().Select(&teams, "SELECT * FROM Teams WHERE Name LIKE :Term OR DisplayName LIKE :Term", map[string]interface{}{"Term": term + "%"}); err != nil {
result.Err = model.NewAppError("SqlTeamStore.SearchAll", "store.sql_team.search_all_team.app_error", nil, "term="+term+", "+err.Error(), http.StatusInternalServerError)
return
}
if _, err := s.GetReplica().Select(&teams, "SELECT * FROM Teams WHERE Name LIKE :Term OR DisplayName LIKE :Term", map[string]interface{}{"Term": term + "%"}); err != nil {
return nil, model.NewAppError("SqlTeamStore.SearchAll", "store.sql_team.search_all_team.app_error", nil, "term="+term+", "+err.Error(), http.StatusInternalServerError)
}
result.Data = teams
})
return teams, nil
}
func (s SqlTeamStore) SearchOpen(term string) store.StoreChannel {