[MM-16182] Migrate Team.GetTeamsForUserWithPagination to Sync by default #11117 (#11235)

* [MM-16182] Migrate Team.GetTeamsForUserWithPagination to Sync by default #11117
+ Team.GetTeamsForUserWithPagination returns ([]*model.TeamMember, *model.AppError) now instead of StoreChannel.
+ Updated mock.
+ Updated tests to use new explicit async.

* Fix Whitespace from go fmt

* Changed team_store.go to not use explicit async.

* Fixed up files from the review
+ Dont reassign var to ms.
+ Avoid nesting of the fetch calls.
+ Directly return fetch instead of nil, err and team, nil.

app/team.go

@@ -675,11 +675,7 @@ func (a *App) GetTeamMembersForUser(userId string) ([]*model.TeamMember, *model.
 }
 
 func (a *App) GetTeamMembersForUserWithPagination(userId string, page, perPage int) ([]*model.TeamMember, *model.AppError) {
-	result := <-a.Srv.Store.Team().GetTeamsForUserWithPagination(userId, page, perPage)
+	return a.Srv.Store.Team().GetTeamsForUserWithPagination(userId, page, perPage)
-	if result.Err != nil {
-		return nil, result.Err
-	}
-	return result.Data.([]*model.TeamMember), nil
 }
 
 func (a *App) GetTeamMembers(teamId string, offset int, limit int, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) {

store/sqlstore/team_store.go

@@ -711,28 +711,24 @@ func (s SqlTeamStore) GetTeamsForUser(userId string) ([]*model.TeamMember, *mode
 	return dbMembers.ToModel(), nil
 }
 
-func (s SqlTeamStore) GetTeamsForUserWithPagination(userId string, page, perPage int) store.StoreChannel {
+func (s SqlTeamStore) GetTeamsForUserWithPagination(userId string, page, perPage int) ([]*model.TeamMember, *model.AppError) {
-	return store.Do(func(result *store.StoreResult) {
+	query := s.getTeamMembersWithSchemeSelectQuery().
-		query := s.getTeamMembersWithSchemeSelectQuery().
+		Where(sq.Eq{"TeamMembers.UserId": userId}).
-			Where(sq.Eq{"TeamMembers.UserId": userId}).
+		Limit(uint64(perPage)).
-			Limit(uint64(perPage)).
+		Offset(uint64(page * perPage))
-			Offset(uint64(page * perPage))
 
-		queryString, args, err := query.ToSql()
+	queryString, args, err := query.ToSql()
-		if err != nil {
+	if err != nil {
-			result.Err = model.NewAppError("SqlTeamStore.GetTeamsForUserWithPagination", "store.sql_team.get_members.app_error", nil, err.Error(), http.StatusInternalServerError)
+		return nil, model.NewAppError("SqlTeamStore.GetTeamsForUserWithPagination", "store.sql_team.get_members.app_error", nil, err.Error(), http.StatusInternalServerError)
-			return
+	}
-		}
 
-		var dbMembers teamMemberWithSchemeRolesList
+	var dbMembers teamMemberWithSchemeRolesList
-		_, err = s.GetReplica().Select(&dbMembers, queryString, args...)
+	_, err = s.GetReplica().Select(&dbMembers, queryString, args...)
-		if err != nil {
+	if err != nil {
-			result.Err = model.NewAppError("SqlTeamStore.GetTeamsForUserWithPagination", "store.sql_team.get_members.app_error", nil, "userId="+userId+" "+err.Error(), http.StatusInternalServerError)
+		return nil, model.NewAppError("SqlTeamStore.GetTeamsForUserWithPagination", "store.sql_team.get_members.app_error", nil, "userId="+userId+" "+err.Error(), http.StatusInternalServerError)
-			return
+	}
-		}
 
-		result.Data = dbMembers.ToModel()
+	return dbMembers.ToModel(), nil
-	})
 }
 
 func (s SqlTeamStore) GetChannelUnreadsForAllTeams(excludeTeamId, userId string) store.StoreChannel {

store/store.go

@@ -108,7 +108,7 @@ type TeamStore interface {
 	GetTotalMemberCount(teamId string) (int64, *model.AppError)
 	GetActiveMemberCount(teamId string) (int64, *model.AppError)
 	GetTeamsForUser(userId string) ([]*model.TeamMember, *model.AppError)
-	GetTeamsForUserWithPagination(userId string, page, perPage int) StoreChannel
+	GetTeamsForUserWithPagination(userId string, page, perPage int) ([]*model.TeamMember, *model.AppError)
 	GetChannelUnreadsForAllTeams(excludeTeamId, userId string) StoreChannel
 	GetChannelUnreadsForTeam(teamId, userId string) ([]*model.ChannelUnread, *model.AppError)
 	RemoveMember(teamId string, userId string) StoreChannel

store/storetest/mocks/TeamStore.go

@@ -509,19 +509,28 @@ func (_m *TeamStore) GetTeamsForUser(userId string) ([]*model.TeamMember, *model
 }
 
 // GetTeamsForUserWithPagination provides a mock function with given fields: userId, page, perPage
-func (_m *TeamStore) GetTeamsForUserWithPagination(userId string, page int, perPage int) store.StoreChannel {
+func (_m *TeamStore) GetTeamsForUserWithPagination(userId string, page int, perPage int) ([]*model.TeamMember, *model.AppError) {
 	ret := _m.Called(userId, page, perPage)
 
-	var r0 store.StoreChannel
+	var r0 []*model.TeamMember
-	if rf, ok := ret.Get(0).(func(string, int, int) store.StoreChannel); ok {
+	if rf, ok := ret.Get(0).(func(string, int, int) []*model.TeamMember); ok {
 		r0 = rf(userId, page, perPage)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(store.StoreChannel)
+			r0 = ret.Get(0).([]*model.TeamMember)
 		}
 	}
 
-	return r0
+	var r1 *model.AppError
+	if rf, ok := ret.Get(1).(func(string, int, int) *model.AppError); ok {
+		r1 = rf(userId, page, perPage)
+	} else {
+		if ret.Get(1) != nil {
+			r1 = ret.Get(1).(*model.AppError)
+		}
+	}
+
+	return r0, r1
 }
 
 // GetTotalMemberCount provides a mock function with given fields: teamId

store/storetest/team_store.go

@@ -869,9 +869,8 @@ func testTeamMembersWithPagination(t *testing.T, ss store.Store) {
 	store.Must(ss.Team().SaveMember(m2, -1))
 	store.Must(ss.Team().SaveMember(m3, -1))
 
-	r1 = <-ss.Team().GetTeamsForUserWithPagination(m1.UserId, 0, 1)
+	ms, errTeam := ss.Team().GetTeamsForUserWithPagination(m1.UserId, 0, 1)
-	require.Nil(t, r1.Err)
+	require.Nil(t, errTeam)
-	ms := r1.Data.([]*model.TeamMember)
 
 	require.Len(t, ms, 1)
 	require.Equal(t, m1.TeamId, ms[0].TeamId)
@@ -896,18 +895,16 @@ func testTeamMembersWithPagination(t *testing.T, ss store.Store) {
 	store.Must(ss.Team().SaveMember(m4, -1))
 	store.Must(ss.Team().SaveMember(m5, -1))
 
-	r1 = <-ss.Team().GetTeamsForUserWithPagination(uid, 0, 1)
+	result, err := ss.Team().GetTeamsForUserWithPagination(uid, 0, 1)
-	require.Nil(t, r1.Err)
+	require.Nil(t, err)
-	ms = r1.Data.([]*model.TeamMember)
+	require.Len(t, result, 1)
-	require.Len(t, ms, 1)
 
 	r1 = <-ss.Team().RemoveAllMembersByUser(uid)
 	require.Nil(t, r1.Err)
 
-	r1 = <-ss.Team().GetTeamsForUserWithPagination(uid, 1, 1)
+	result, err = ss.Team().GetTeamsForUserWithPagination(uid, 1, 1)
-	require.Nil(t, r1.Err)
+	require.Nil(t, err)
-	ms = r1.Data.([]*model.TeamMember)
+	require.Len(t, result, 0)
-	require.Len(t, ms, 0)
 }
 
 func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) {