From 0975409f8e31422f99b5b9a298fe9b1eebc655f1 Mon Sep 17 00:00:00 2001
From: Woolim Cho <2680v4@gmail.com>
Date: Thu, 20 Jun 2019 23:10:17 +0900
Subject: [PATCH] [MM-16161] Migrate Team.SearchAll to Sync by default (#11188)

* Migrate Team.SearchAll to Sync by default

* SearchAllTeams: return result directly
---
 app/team.go                        |  6 +-----
 store/sqlstore/team_store.go       | 15 ++++++---------
 store/store.go                     |  2 +-
 store/storetest/mocks/TeamStore.go | 19 ++++++++++++++-----
 store/storetest/team_store.go      |  9 ++++-----
 5 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/app/team.go b/app/team.go
index 9b9ddcaa69..b8297d319c 100644
--- a/app/team.go
+++ b/app/team.go
@@ -639,11 +639,7 @@ func (a *App) GetAllPublicTeamsPage(offset int, limit int) ([]*model.Team, *mode
 }
 
 func (a *App) SearchAllTeams(term string) ([]*model.Team, *model.AppError) {
-	result := <-a.Srv.Store.Team().SearchAll(term)
-	if result.Err != nil {
-		return nil, result.Err
-	}
-	return result.Data.([]*model.Team), nil
+	return a.Srv.Store.Team().SearchAll(term)
 }
 
 func (a *App) SearchPublicTeams(term string) ([]*model.Team, *model.AppError) {
diff --git a/store/sqlstore/team_store.go b/store/sqlstore/team_store.go
index faeb3e2950..9e94b43f03 100644
--- a/store/sqlstore/team_store.go
+++ b/store/sqlstore/team_store.go
@@ -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 {
diff --git a/store/store.go b/store/store.go
index 939ff078aa..6313c67f7a 100644
--- a/store/store.go
+++ b/store/store.go
@@ -87,7 +87,7 @@ type TeamStore interface {
 	Get(id string) (*model.Team, *model.AppError)
 	GetByName(name string) (*model.Team, *model.AppError)
 	SearchByName(name string) ([]*model.Team, *model.AppError)
-	SearchAll(term string) StoreChannel
+	SearchAll(term string) ([]*model.Team, *model.AppError)
 	SearchOpen(term string) StoreChannel
 	SearchPrivate(term string) ([]*model.Team, *model.AppError)
 	GetAll() ([]*model.Team, *model.AppError)
diff --git a/store/storetest/mocks/TeamStore.go b/store/storetest/mocks/TeamStore.go
index 6fb8bd1b92..28be405250 100644
--- a/store/storetest/mocks/TeamStore.go
+++ b/store/storetest/mocks/TeamStore.go
@@ -715,19 +715,28 @@ func (_m *TeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) s
 }
 
 // SearchAll provides a mock function with given fields: term
-func (_m *TeamStore) SearchAll(term string) store.StoreChannel {
+func (_m *TeamStore) SearchAll(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
 }
 
 // SearchByName provides a mock function with given fields: name
diff --git a/store/storetest/team_store.go b/store/storetest/team_store.go
index adf8cebb43..421b6fdc8e 100644
--- a/store/storetest/team_store.go
+++ b/store/storetest/team_store.go
@@ -244,12 +244,11 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) {
 
 	for _, tc := range testCases {
 		t.Run(tc.Name, func(t *testing.T) {
-			r1 := <-ss.Team().SearchAll(tc.Term)
-			require.Nil(t, r1.Err)
-			results := r1.Data.([]*model.Team)
-			require.Equal(t, tc.ExpectedLenth, len(results))
+			r1, err := ss.Team().SearchAll(tc.Term)
+			require.Nil(t, err)
+			require.Equal(t, tc.ExpectedLenth, len(r1))
 			if tc.ExpectedFirstId != "" {
-				assert.Equal(t, tc.ExpectedFirstId, results[0].Id)
+				assert.Equal(t, tc.ExpectedFirstId, r1[0].Id)
 			}
 		})
 	}