IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-16162] migrate Team.SearchOpen to Sync by default (#11398)

Browse Source 
* [MM-16162] migrate Team.SearchOpen to Sync by default

* [MM-16162] fix error

* [MM-16162] update the mocked stores, fix slight error
This commit is contained in:
KimSeungHyeon
2019-06-26 03:27:42 -07:00
committed by George Goldberg
parent eea898c6e0
commit 2327ab8854
5 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/team.go
View File

@@ -654,11 +654,7 @@ func (a *App) SearchAllTeams(term string) ([]*model.Team, *model.AppError) {
}
func (a *App) SearchPublicTeams(term string) ([]*model.Team, *model.AppError) {
result := <-a.Srv.Store.Team().SearchOpen(term)
if result.Err != nil {
return nil, result.Err
}
return result.Data.([]*model.Team), nil
return a.Srv.Store.Team().SearchOpen(term)
}
func (a *App) SearchPrivateTeams(term string) ([]*model.Team, *model.AppError) {

15
store/sqlstore/team_store.go
View File

@@ -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) {

2
store/store.go
View File

@@ -88,7 +88,7 @@ type TeamStore interface {
GetByName(name string) (*model.Team, *model.AppError)
SearchByName(name string) ([]*model.Team, *model.AppError)
SearchAll(term string) ([]*model.Team, *model.AppError)
SearchOpen(term string) StoreChannel
SearchOpen(term string) ([]*model.Team, *model.AppError)
SearchPrivate(term string) ([]*model.Team, *model.AppError)
GetAll() ([]*model.Team, *model.AppError)
GetAllPage(offset int, limit int) ([]*model.Team, *model.AppError)

19
store/storetest/mocks/TeamStore.go
View File

@@ -765,19 +765,28 @@ func (_m *TeamStore) SearchByName(name string) ([]*model.Team, *model.AppError)
}
// SearchOpen provides a mock function with given fields: term
func (_m *TeamStore) SearchOpen(term string) store.StoreChannel {
func (_m *TeamStore) SearchOpen(term string) ([]*model.Team, *model.AppError) {
ret := _m.Called(term)
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func(string) store.StoreChannel); ok {
var r0 []*model.Team
if rf, ok := ret.Get(0).(func(string) []*model.Team); ok {
r0 = rf(term)
} 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(string) *model.AppError); ok {
r1 = rf(term)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
}
return r0, r1
}
// SearchPrivate provides a mock function with given fields: term

6
store/storetest/team_store.go
View File

@@ -309,9 +309,9 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) {
for _, tc := range testCases {
t.Run(tc.Name, func(t *testing.T) {
r1 := <-ss.Team().SearchOpen(tc.Term)
require.Nil(t, r1.Err)
results := r1.Data.([]*model.Team)
r1, err := ss.Team().SearchOpen(tc.Term)
require.Nil(t, err)
results := r1
require.Equal(t, tc.ExpectedLenth, len(results))
if tc.ExpectedFirstId != "" {
assert.Equal(t, tc.ExpectedFirstId, results[0].Id)