From 2327ab885460d492ab0eac012e4ab2b9ea11b8a8 Mon Sep 17 00:00:00 2001
From: KimSeungHyeon <43230681+kim95175@users.noreply.github.com>
Date: Wed, 26 Jun 2019 03:27:42 -0700
Subject: [PATCH] [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
---
 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      |  6 +++---
 5 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/app/team.go b/app/team.go
index 1360552d8d..45afe94f3a 100644
--- a/app/team.go
+++ b/app/team.go
@@ -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) {
diff --git a/store/sqlstore/team_store.go b/store/sqlstore/team_store.go
index 9e94b43f03..c7717b51f5 100644
--- a/store/sqlstore/team_store.go
+++ b/store/sqlstore/team_store.go
@@ -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) {
diff --git a/store/store.go b/store/store.go
index c0cada8b98..a310065d9d 100644
--- a/store/store.go
+++ b/store/store.go
@@ -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)
diff --git a/store/storetest/mocks/TeamStore.go b/store/storetest/mocks/TeamStore.go
index 28be405250..b1ac27c701 100644
--- a/store/storetest/mocks/TeamStore.go
+++ b/store/storetest/mocks/TeamStore.go
@@ -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
diff --git a/store/storetest/team_store.go b/store/storetest/team_store.go
index 421b6fdc8e..d79439f23a 100644
--- a/store/storetest/team_store.go
+++ b/store/storetest/team_store.go
@@ -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)