mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Migrate Team.GetTeamsForUser to Sync by default (#11148)

Просмотр исходного кода 
* Migrate Team.GetTeamsForUser to Sync by default

* Improvements

* Requested change

* Requested changes
Этот коммит содержится в:
Rodrigo Villablanca Vásquez
2019-06-17 04:49:19 -04:00
коммит произвёл Jesús Espino
родитель 9ffdb794b1
Коммит 6535010366
6 изменённых файлов: 50 добавлений и 43 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

21
store/sqlstore/session_store.go
Просмотреть файл

@@ -52,7 +52,12 @@ func (me SqlSessionStore) Save(session *model.Session) (*model.Session, *model.A
session.PreSave()
tcs := me.Team().GetTeamsForUser(session.UserId)
tcs := make(chan store.StoreResult, 1)
go func() {
teams, err := me.Team().GetTeamsForUser(session.UserId)
tcs <- store.StoreResult{Data: teams, Err: err}
close(tcs)
}()
if err := me.GetMaster().Insert(session); err != nil {
return nil, model.NewAppError("SqlSessionStore.Save", "store.sql_session.save.app_error", nil, "id="+session.Id+", "+err.Error(), http.StatusInternalServerError)
@@ -85,11 +90,10 @@ func (me SqlSessionStore) Get(sessionIdOrToken string) (*model.Session, *model.A
}
session := sessions[0]
rtcs := <-me.Team().GetTeamsForUser(sessions[0].UserId)
if rtcs.Err != nil {
return nil, model.NewAppError("SqlSessionStore.Get", "store.sql_session.get.app_error", nil, "sessionIdOrToken="+sessionIdOrToken+", "+rtcs.Err.Error(), http.StatusInternalServerError)
tempMembers, err := me.Team().GetTeamsForUser(sessions[0].UserId)
if err != nil {
return nil, model.NewAppError("SqlSessionStore.Get", "store.sql_session.get.app_error", nil, "sessionIdOrToken="+sessionIdOrToken+", "+err.Error(), http.StatusInternalServerError)
}
tempMembers := rtcs.Data.([]*model.TeamMember)
sessions[0].TeamMembers = make([]*model.TeamMember, 0, len(tempMembers))
for _, tm := range tempMembers {
if tm.DeleteAt == 0 {
@@ -102,7 +106,12 @@ func (me SqlSessionStore) Get(sessionIdOrToken string) (*model.Session, *model.A
func (me SqlSessionStore) GetSessions(userId string) ([]*model.Session, *model.AppError) {
var sessions []*model.Session
tcs := me.Team().GetTeamsForUser(userId)
tcs := make(chan store.StoreResult, 1)
go func() {
teams, err := me.Team().GetTeamsForUser(userId)
tcs <- store.StoreResult{Data: teams, Err: err}
close(tcs)
}()
if _, err := me.GetReplica().Select(&sessions, "SELECT * FROM Sessions WHERE UserId = :UserId ORDER BY LastActivityAt DESC", map[string]interface{}{"UserId": userId}); err != nil {
return nil, model.NewAppError("SqlSessionStore.GetSessions", "store.sql_session.get_sessions.app_error", nil, err.Error(), http.StatusInternalServerError)
}

30
store/sqlstore/team_store.go
Просмотреть файл

@@ -684,26 +684,22 @@ func (s SqlTeamStore) GetMembersByIds(teamId string, userIds []string, restricti
return dbMembers.ToModel(), nil
}
func (s SqlTeamStore) GetTeamsForUser(userId string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
query := s.getTeamMembersWithSchemeSelectQuery().
Where(sq.Eq{"TeamMembers.UserId": userId})
func (s SqlTeamStore) GetTeamsForUser(userId string) ([]*model.TeamMember, *model.AppError) {
query := s.getTeamMembersWithSchemeSelectQuery().
Where(sq.Eq{"TeamMembers.UserId": userId})
queryString, args, err := query.ToSql()
if err != nil {
result.Err = model.NewAppError("SqlTeamStore.GetMembers", "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.GetMembers", "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.GetMembers", "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.GetMembers", "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) GetTeamsForUserWithPagination(userId string, page, perPage int) store.StoreChannel {