From 784a34318feb79e244da6a018e06a1cacfc94d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Villablanca=20V=C3=A1squez?= Date: Thu, 13 Jun 2019 01:02:20 -0400 Subject: [PATCH] Migrate Team.GetMembersByIds to Sync by default (#11145) * Migrate Team.GetMembersByIds to Sync by default * Requested change --- app/team.go | 6 +---- store/sqlstore/team_store.go | 40 ++++++++++++++---------------- store/store.go | 2 +- store/storetest/mocks/TeamStore.go | 19 ++++++++++---- store/storetest/team_store.go | 13 +++++----- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/app/team.go b/app/team.go index 964a93502a..1f93c57ab5 100644 --- a/app/team.go +++ b/app/team.go @@ -713,11 +713,7 @@ func (a *App) GetTeamMembers(teamId string, offset int, limit int, restrictions } func (a *App) GetTeamMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) { - result := <-a.Srv.Store.Team().GetMembersByIds(teamId, userIds, restrictions) - if result.Err != nil { - return nil, result.Err - } - return result.Data.([]*model.TeamMember), nil + return a.Srv.Store.Team().GetMembersByIds(teamId, userIds, restrictions) } func (a *App) AddTeamMember(teamId, userId string) (*model.TeamMember, *model.AppError) { diff --git a/store/sqlstore/team_store.go b/store/sqlstore/team_store.go index 5ea43ebb05..0527c87c98 100644 --- a/store/sqlstore/team_store.go +++ b/store/sqlstore/team_store.go @@ -687,32 +687,28 @@ func (s SqlTeamStore) GetActiveMemberCount(teamId string) store.StoreChannel { }) } -func (s SqlTeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) store.StoreChannel { - return store.Do(func(result *store.StoreResult) { - if len(userIds) == 0 { - result.Err = model.NewAppError("SqlTeamStore.GetMembersByIds", "store.sql_team.get_members_by_ids.app_error", nil, "Invalid list of user ids", http.StatusInternalServerError) - } +func (s SqlTeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) { + if len(userIds) == 0 { + return nil, model.NewAppError("SqlTeamStore.GetMembersByIds", "store.sql_team.get_members_by_ids.app_error", nil, "Invalid list of user ids", http.StatusInternalServerError) + } - query := s.getTeamMembersWithSchemeSelectQuery(). - Where(sq.Eq{"TeamMembers.TeamId": teamId}). - Where(sq.Eq{"TeamMembers.UserId": userIds}). - Where(sq.Eq{"TeamMembers.DeleteAt": 0}) + query := s.getTeamMembersWithSchemeSelectQuery(). + Where(sq.Eq{"TeamMembers.TeamId": teamId}). + Where(sq.Eq{"TeamMembers.UserId": userIds}). + Where(sq.Eq{"TeamMembers.DeleteAt": 0}) - query = applyTeamMemberViewRestrictionsFilter(query, teamId, restrictions) + query = applyTeamMemberViewRestrictionsFilter(query, teamId, restrictions) - queryString, args, err := query.ToSql() - if err != nil { - result.Err = model.NewAppError("SqlTeamStore.GetMembersByIds", "store.sql_team.get_members_by_ids.app_error", nil, err.Error(), http.StatusInternalServerError) - return - } + queryString, args, err := query.ToSql() + if err != nil { + return nil, model.NewAppError("SqlTeamStore.GetMembersByIds", "store.sql_team.get_members_by_ids.app_error", nil, err.Error(), http.StatusInternalServerError) + } - var dbMembers teamMemberWithSchemeRolesList - if _, err := s.GetReplica().Select(&dbMembers, queryString, args...); err != nil { - result.Err = model.NewAppError("SqlTeamStore.GetMembersByIds", "store.sql_team.get_members_by_ids.app_error", nil, "teamId="+teamId+" "+err.Error(), http.StatusInternalServerError) - return - } - result.Data = dbMembers.ToModel() - }) + var dbMembers teamMemberWithSchemeRolesList + if _, err := s.GetReplica().Select(&dbMembers, queryString, args...); err != nil { + return nil, model.NewAppError("SqlTeamStore.GetMembersByIds", "store.sql_team.get_members_by_ids.app_error", nil, "teamId="+teamId+" "+err.Error(), http.StatusInternalServerError) + } + return dbMembers.ToModel(), nil } func (s SqlTeamStore) GetTeamsForUser(userId string) store.StoreChannel { diff --git a/store/store.go b/store/store.go index 63461d92b8..26d3ac8528 100644 --- a/store/store.go +++ b/store/store.go @@ -104,7 +104,7 @@ type TeamStore interface { UpdateMember(member *model.TeamMember) StoreChannel GetMember(teamId string, userId string) StoreChannel GetMembers(teamId string, offset int, limit int, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) - GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) StoreChannel + GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) GetTotalMemberCount(teamId string) StoreChannel GetActiveMemberCount(teamId string) StoreChannel GetTeamsForUser(userId string) StoreChannel diff --git a/store/storetest/mocks/TeamStore.go b/store/storetest/mocks/TeamStore.go index a196f1ad28..d85f4eaa1c 100644 --- a/store/storetest/mocks/TeamStore.go +++ b/store/storetest/mocks/TeamStore.go @@ -352,19 +352,28 @@ func (_m *TeamStore) GetMembers(teamId string, offset int, limit int, restrictio } // GetMembersByIds provides a mock function with given fields: teamId, userIds, restrictions -func (_m *TeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) store.StoreChannel { +func (_m *TeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) { ret := _m.Called(teamId, userIds, restrictions) - var r0 store.StoreChannel - if rf, ok := ret.Get(0).(func(string, []string, *model.ViewUsersRestrictions) store.StoreChannel); ok { + var r0 []*model.TeamMember + if rf, ok := ret.Get(0).(func(string, []string, *model.ViewUsersRestrictions) []*model.TeamMember); ok { r0 = rf(teamId, userIds, restrictions) } 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, []string, *model.ViewUsersRestrictions) *model.AppError); ok { + r1 = rf(teamId, userIds, restrictions) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(*model.AppError) + } + } + + return r0, r1 } // GetTeamMembersForExport provides a mock function with given fields: userId diff --git a/store/storetest/team_store.go b/store/storetest/team_store.go index 77d9706abd..22c237dccc 100644 --- a/store/storetest/team_store.go +++ b/store/storetest/team_store.go @@ -1113,10 +1113,10 @@ func testGetTeamMembersByIds(t *testing.T, ss store.Store) { m1 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} store.Must(ss.Team().SaveMember(m1, -1)) - if r := <-ss.Team().GetMembersByIds(m1.TeamId, []string{m1.UserId}, nil); r.Err != nil { - t.Fatal(r.Err) + if r, err := ss.Team().GetMembersByIds(m1.TeamId, []string{m1.UserId}, nil); err != nil { + t.Fatal(err) } else { - rm1 := r.Data.([]*model.TeamMember)[0] + rm1 := r[0] if rm1.TeamId != m1.TeamId { t.Fatal("bad team id") @@ -1130,17 +1130,16 @@ func testGetTeamMembersByIds(t *testing.T, ss store.Store) { m2 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} store.Must(ss.Team().SaveMember(m2, -1)) - if r := <-ss.Team().GetMembersByIds(m1.TeamId, []string{m1.UserId, m2.UserId, model.NewId()}, nil); r.Err != nil { - t.Fatal(r.Err) + if rm, err := ss.Team().GetMembersByIds(m1.TeamId, []string{m1.UserId, m2.UserId, model.NewId()}, nil); err != nil { + t.Fatal(err) } else { - rm := r.Data.([]*model.TeamMember) if len(rm) != 2 { t.Fatal("return wrong number of results") } } - if r := <-ss.Team().GetMembersByIds(m1.TeamId, []string{}, nil); r.Err == nil { + if _, err := ss.Team().GetMembersByIds(m1.TeamId, []string{}, nil); err == nil { t.Fatal("empty user ids - should have failed") } }