[MM-26969] Add team filters to search teams (#15065)

* Add team filters to search teams

Remove unneeded logs

Add team filters to search teams

* Use bool pointers for filters

Re-add include group constrained

Fix lint

Return the union of filters
Этот коммит содержится в:
Farhan Munshi
2020-07-27 15:11:39 -04:00
коммит произвёл GitHub
родитель fbde669dda
Коммит c511042c0f
9 изменённых файлов: 216 добавлений и 84 удалений

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

@@ -6522,10 +6522,10 @@ func (s *TimerLayerTeamStore) SaveMultipleMembers(members []*model.TeamMember, m
return resultVar0, resultVar1
}
func (s *TimerLayerTeamStore) SearchAll(term string) ([]*model.Team, *model.AppError) {
func (s *TimerLayerTeamStore) SearchAll(term string, opts *model.TeamSearch) ([]*model.Team, *model.AppError) {
start := timemodule.Now()
resultVar0, resultVar1 := s.TeamStore.SearchAll(term)
resultVar0, resultVar1 := s.TeamStore.SearchAll(term, opts)
elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second)
if s.Root.Metrics != nil {
@@ -6538,10 +6538,10 @@ func (s *TimerLayerTeamStore) SearchAll(term string) ([]*model.Team, *model.AppE
return resultVar0, resultVar1
}
func (s *TimerLayerTeamStore) SearchAllPaged(term string, page int, perPage int) ([]*model.Team, int64, *model.AppError) {
func (s *TimerLayerTeamStore) SearchAllPaged(term string, opts *model.TeamSearch) ([]*model.Team, int64, *model.AppError) {
start := timemodule.Now()
resultVar0, resultVar1, resultVar2 := s.TeamStore.SearchAllPaged(term, page, perPage)
resultVar0, resultVar1, resultVar2 := s.TeamStore.SearchAllPaged(term, opts)
elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second)
if s.Root.Metrics != nil {