[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.
Этот коммит содержится в:
Kyle Reczek
2019-06-20 00:42:09 -06:00
коммит произвёл Jesús Espino
родитель 33789a3523
Коммит 3c13b0e4e7
5 изменённых файлов: 39 добавлений и 41 удалений

Просмотреть файл

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