MM-55736 Add Request Context to TeamStore.SaveMember (#26061)

Co-authored-by: compiledsound <>
Этот коммит содержится в:
compiledsound
2024-02-07 03:00:13 -05:00
коммит произвёл GitHub
родитель 8c045b729e
Коммит 1dcd251418
22 изменённых файлов: 272 добавлений и 275 удалений

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

@@ -342,11 +342,11 @@ func createTeam(ss store.Store) *model.Team {
return t
}
func createTeamMember(ss store.Store, teamId, userId string) *model.TeamMember {
func createTeamMember(rctx request.CTX, ss store.Store, teamId, userId string) *model.TeamMember {
m := model.TeamMember{}
m.TeamId = teamId
m.UserId = userId
tm, _ := ss.Team().SaveMember(&m, -1)
tm, _ := ss.Team().SaveMember(rctx, &m, -1)
return tm
}
@@ -966,7 +966,7 @@ func TestCheckTeamsTeamMembersIntegrity(t *testing.T) {
t.Run("should generate a report with one record", func(t *testing.T) {
team := createTeam(ss)
member := createTeamMember(ss, team.Id, model.NewId())
member := createTeamMember(rctx, ss, team.Id, model.NewId())
dbmap.Exec(`DELETE FROM Teams WHERE Id=?`, team.Id)
result := checkTeamsTeamMembersIntegrity(store)
require.NoError(t, result.Err)
@@ -1563,7 +1563,7 @@ func TestCheckUsersTeamMembersIntegrity(t *testing.T) {
t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss)
team := createTeam(ss)
member := createTeamMember(ss, team.Id, user.Id)
member := createTeamMember(rctx, ss, team.Id, user.Id)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
result := checkUsersTeamMembersIntegrity(store)
require.NoError(t, result.Err)

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

@@ -853,7 +853,7 @@ func (s SqlTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersP
return newMembers, nil
}
func (s SqlTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) {
func (s SqlTeamStore) SaveMember(rctx request.CTX, member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) {
members, err := s.SaveMultipleMembers([]*model.TeamMember{member}, maxUsersPerTeam)
if err != nil {
return nil, err