[MM-16163] Migrate "Team.SearchPrivate" to Sync by default (#11109)

app/team.go

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

store/sqlstore/team_store.go

@@ -335,17 +335,20 @@ func (s SqlTeamStore) SearchOpen(term string) store.StoreChannel {
 	})
 }
 
-func (s SqlTeamStore) SearchPrivate(term string) store.StoreChannel {
+func (s SqlTeamStore) SearchPrivate(term string) ([]*model.Team, *model.AppError) {
-	return store.Do(func(result *store.StoreResult) {
+	var teams []*model.Team
-		var teams []*model.Team
 
-		if _, err := s.GetReplica().Select(&teams, "SELECT * FROM Teams WHERE (Type != 'O' OR AllowOpenInvite = false) AND (Name LIKE :Term OR DisplayName LIKE :Term)", map[string]interface{}{"Term": term + "%"}); err != nil {
+	query :=
-			result.Err = model.NewAppError("SqlTeamStore.SearchPrivate", "store.sql_team.search_private_team.app_error", nil, "term="+term+", "+err.Error(), http.StatusInternalServerError)
+		`SELECT * 
-			return
+		FROM 
-		}
+			Teams 
-
+		WHERE 
-		result.Data = teams
+			(Type != 'O' OR AllowOpenInvite = false) AND 
-	})
+			(Name LIKE :Term OR DisplayName LIKE :Term)`
+	if _, err := s.GetReplica().Select(&teams, query, map[string]interface{}{"Term": term + "%"}); err != nil {
+		return nil, model.NewAppError("SqlTeamStore.SearchPrivate", "store.sql_team.search_private_team.app_error", nil, "term="+term+", "+err.Error(), http.StatusInternalServerError)
+	}
+	return teams, nil
 }
 
 func (s SqlTeamStore) GetAll() ([]*model.Team, *model.AppError) {

store/store.go

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

store/storetest/mocks/TeamStore.go

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

store/storetest/team_store.go

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