IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Migrate Team.GetTeamsForUser to Sync by default

* Improvements

* Requested change

* Requested changes
This commit is contained in:
Rodrigo Villablanca Vásquez
2019-06-17 04:49:19 -04:00
committed by Jesús Espino
parent 9ffdb794b1
commit 6535010366
6 changed files with 50 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/team.go
View File

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

21
store/sqlstore/session_store.go
View File

@@ -52,7 +52,12 @@ func (me SqlSessionStore) Save(session *model.Session) (*model.Session, *model.A
session.PreSave() 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 { 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) 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] session := sessions[0]
rtcs := <-me.Team().GetTeamsForUser(sessions[0].UserId) tempMembers, err := me.Team().GetTeamsForUser(sessions[0].UserId)
if rtcs.Err != nil { if err != nil {
return nil, model.NewAppError("SqlSessionStore.Get", "store.sql_session.get.app_error", nil, "sessionIdOrToken="+sessionIdOrToken+", "+rtcs.Err.Error(), http.StatusInternalServerError) 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)) sessions[0].TeamMembers = make([]*model.TeamMember, 0, len(tempMembers))
for _, tm := range tempMembers { for _, tm := range tempMembers {
if tm.DeleteAt == 0 { 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) { func (me SqlSessionStore) GetSessions(userId string) ([]*model.Session, *model.AppError) {
var sessions []*model.Session 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 { 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) return nil, model.NewAppError("SqlSessionStore.GetSessions", "store.sql_session.get_sessions.app_error", nil, err.Error(), http.StatusInternalServerError)
} }

30
store/sqlstore/team_store.go
View File

@@ -684,26 +684,22 @@ func (s SqlTeamStore) GetMembersByIds(teamId string, userIds []string, restricti
return dbMembers.ToModel(), nil return dbMembers.ToModel(), nil
} }
func (s SqlTeamStore) GetTeamsForUser(userId string) store.StoreChannel { func (s SqlTeamStore) GetTeamsForUser(userId string) ([]*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})
queryString, args, err := query.ToSql() queryString, args, err := query.ToSql()
if err != nil { if err != nil {
result.Err = model.NewAppError("SqlTeamStore.GetMembers", "store.sql_team.get_members.app_error", nil, err.Error(), http.StatusInternalServerError) return nil, model.NewAppError("SqlTeamStore.GetMembers", "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.GetMembers", "store.sql_team.get_members.app_error", nil, "userId="+userId+" "+err.Error(), http.StatusInternalServerError) return nil, model.NewAppError("SqlTeamStore.GetMembers", "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) GetTeamsForUserWithPagination(userId string, page, perPage int) store.StoreChannel { func (s SqlTeamStore) GetTeamsForUserWithPagination(userId string, page, perPage int) store.StoreChannel {

2
store/store.go
View File

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

19
store/storetest/mocks/TeamStore.go
View File

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

15
store/storetest/team_store.go
View File

@@ -797,10 +797,9 @@ func testTeamMembers(t *testing.T, ss store.Store) {
require.Equal(t, m3.UserId, ms[0].UserId) require.Equal(t, m3.UserId, ms[0].UserId)
} }
if r1 := <-ss.Team().GetTeamsForUser(m1.UserId); r1.Err != nil { if ms, err := ss.Team().GetTeamsForUser(m1.UserId); err != nil {
t.Fatal(r1.Err) t.Fatal(err)
} else { } else {
ms := r1.Data.([]*model.TeamMember)
require.Len(t, ms, 1) require.Len(t, ms, 1)
require.Equal(t, m1.TeamId, ms[0].TeamId) require.Equal(t, m1.TeamId, ms[0].TeamId)
@@ -837,10 +836,9 @@ func testTeamMembers(t *testing.T, ss store.Store) {
store.Must(ss.Team().SaveMember(m4, -1)) store.Must(ss.Team().SaveMember(m4, -1))
store.Must(ss.Team().SaveMember(m5, -1)) store.Must(ss.Team().SaveMember(m5, -1))
if r1 := <-ss.Team().GetTeamsForUser(uid); r1.Err != nil { if ms, err := ss.Team().GetTeamsForUser(uid); err != nil {
t.Fatal(r1.Err) t.Fatal(err)
} else { } else {
ms := r1.Data.([]*model.TeamMember)
require.Len(t, ms, 2) require.Len(t, ms, 2)
} }
@@ -849,10 +847,9 @@ func testTeamMembers(t *testing.T, ss store.Store) {
t.Fatal(r1.Err) t.Fatal(r1.Err)
} }
if r1 := <-ss.Team().GetTeamsForUser(m1.UserId); r1.Err != nil { if ms, err := ss.Team().GetTeamsForUser(m1.UserId); err != nil {
t.Fatal(r1.Err) t.Fatal(err)
} else { } else {
ms := r1.Data.([]*model.TeamMember)
require.Len(t, ms, 0) require.Len(t, ms, 0)
} }