[MM-16162] migrate Team.SearchOpen to Sync by default (#11398)
* [MM-16162] migrate Team.SearchOpen to Sync by default * [MM-16162] fix error * [MM-16162] update the mocked stores, fix slight error
Этот коммит содержится в:
коммит произвёл
George Goldberg
родитель
eea898c6e0
Коммит
2327ab8854
@@ -319,17 +319,14 @@ func (s SqlTeamStore) SearchAll(term string) ([]*model.Team, *model.AppError) {
|
||||
return teams, nil
|
||||
}
|
||||
|
||||
func (s SqlTeamStore) SearchOpen(term string) store.StoreChannel {
|
||||
return store.Do(func(result *store.StoreResult) {
|
||||
var teams []*model.Team
|
||||
func (s SqlTeamStore) SearchOpen(term string) ([]*model.Team, *model.AppError) {
|
||||
var teams []*model.Team
|
||||
|
||||
if _, err := s.GetReplica().Select(&teams, "SELECT * FROM Teams WHERE Type = 'O' AND AllowOpenInvite = true AND (Name LIKE :Term OR DisplayName LIKE :Term)", map[string]interface{}{"Term": term + "%"}); err != nil {
|
||||
result.Err = model.NewAppError("SqlTeamStore.SearchOpen", "store.sql_team.search_open_team.app_error", nil, "term="+term+", "+err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
if _, err := s.GetReplica().Select(&teams, "SELECT * FROM Teams WHERE Type = 'O' AND AllowOpenInvite = true AND (Name LIKE :Term OR DisplayName LIKE :Term)", map[string]interface{}{"Term": term + "%"}); err != nil {
|
||||
return nil, model.NewAppError("SqlTeamStore.SearchOpen", "store.sql_team.search_open_team.app_error", nil, "term="+term+", "+err.Error(), http.StatusInternalServerError)
|
||||
}
|
||||
|
||||
result.Data = teams
|
||||
})
|
||||
return teams, nil
|
||||
}
|
||||
|
||||
func (s SqlTeamStore) SearchPrivate(term string) ([]*model.Team, *model.AppError) {
|
||||
|
||||
Ссылка в новой задаче
Block a user