[MM-16171] Migrate "Team.GetByInviteId" to Sync by default (#11137)

Этот коммит содержится в:
Bolarinwa Balogun
2019-06-13 08:21:09 -04:00
коммит произвёл Jesús Espino
родитель c78b769c2e
Коммит 7d77420962
6 изменённых файлов: 44 добавлений и 38 удалений

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

@@ -459,7 +459,13 @@ func (a *App) AddUserToTeamByToken(userId string, tokenId string) (*model.Team,
}
func (a *App) AddUserToTeamByInviteId(inviteId string, userId string) (*model.Team, *model.AppError) {
tchan := a.Srv.Store.Team().GetByInviteId(inviteId)
tchan := make(chan store.StoreResult, 1)
go func() {
team, err := a.Srv.Store.Team().GetByInviteId(inviteId)
tchan <- store.StoreResult{Data: team, Err: err}
close(tchan)
}()
uchan := make(chan store.StoreResult, 1)
go func() {
user, err := a.Srv.Store.User().Get(userId)
@@ -601,11 +607,7 @@ func (a *App) GetTeamByName(name string) (*model.Team, *model.AppError) {
}
func (a *App) GetTeamByInviteId(inviteId string) (*model.Team, *model.AppError) {
result := <-a.Srv.Store.Team().GetByInviteId(inviteId)
if result.Err != nil {
return nil, result.Err
}
return result.Data.(*model.Team), nil
return a.Srv.Store.Team().GetByInviteId(inviteId)
}
func (a *App) GetAllTeams() ([]*model.Team, *model.AppError) {
@@ -1207,12 +1209,12 @@ func (a *App) GetTeamIdFromQuery(query url.Values) (string, *model.AppError) {
return tokenData["teamId"], nil
}
if len(inviteId) > 0 {
result := <-a.Srv.Store.Team().GetByInviteId(inviteId)
if result.Err == nil {
return result.Data.(*model.Team).Id, nil
team, err := a.Srv.Store.Team().GetByInviteId(inviteId)
if err == nil {
return team.Id, nil
}
// soft fail, so we still create user but don't auto-join team
mlog.Error(fmt.Sprintf("%v", result.Err))
mlog.Error(fmt.Sprintf("%v", err))
}
return "", nil

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

@@ -98,11 +98,10 @@ func (a *App) CreateUserWithInviteId(user *model.User, inviteId string) (*model.
return nil, err
}
result := <-a.Srv.Store.Team().GetByInviteId(inviteId)
if result.Err != nil {
return nil, result.Err
team, err := a.Srv.Store.Team().GetByInviteId(inviteId)
if err != nil {
return nil, err
}
team := result.Data.(*model.Team)
if team.IsGroupConstrained() {
return nil, model.NewAppError("CreateUserWithInviteId", "app.team.invite_id.group_constrained.error", nil, "", http.StatusForbidden)