From dc8fc773dc79bc6aa4a40f71a58e028b9b7de3a6 Mon Sep 17 00:00:00 2001 From: Aswath S Date: Sat, 24 Feb 2024 17:38:51 +0530 Subject: [PATCH] MM-55733 add request context to Channelstore.Save method (#26141) --- server/channels/api4/scheme_test.go | 6 +- server/channels/app/channel.go | 4 +- server/channels/app/email/helper_test.go | 2 +- server/channels/app/platform/helper_test.go | 2 +- server/channels/app/team.go | 2 +- server/channels/app/teams/teams.go | 8 +- server/channels/app/teams/teams_test.go | 6 +- .../opentracinglayer/opentracinglayer.go | 4 +- .../channels/store/retrylayer/retrylayer.go | 4 +- .../store/searchlayer/channel_layer.go | 7 +- server/channels/store/searchtest/helper.go | 4 +- .../channels/store/sqlstore/channel_store.go | 2 +- .../channels/store/sqlstore/integrity_test.go | 40 +- server/channels/store/store.go | 2 +- .../storetest/channel_member_history_store.go | 14 +- .../channels/store/storetest/channel_store.go | 402 +++++++++--------- .../storetest/channel_store_categories.go | 56 +-- .../store/storetest/compliance_store.go | 18 +- .../store/storetest/file_info_store.go | 4 +- .../channels/store/storetest/group_store.go | 42 +- .../store/storetest/mocks/ChannelStore.go | 18 +- .../post_persistent_notification_store.go | 6 +- server/channels/store/storetest/post_store.go | 160 +++---- .../store/storetest/preference_store.go | 2 +- .../store/storetest/reaction_store.go | 2 +- .../store/storetest/retention_policy_store.go | 14 +- server/channels/store/storetest/role_store.go | 6 +- .../channels/store/storetest/scheme_store.go | 2 +- .../store/storetest/shared_channel_store.go | 2 +- server/channels/store/storetest/team_store.go | 8 +- .../channels/store/storetest/thread_store.go | 44 +- server/channels/store/storetest/user_store.go | 66 +-- .../channels/store/timerlayer/timerlayer.go | 4 +- .../services/slackimport/slackimport.go | 2 +- 34 files changed, 481 insertions(+), 484 deletions(-) diff --git a/server/channels/api4/scheme_test.go b/server/channels/api4/scheme_test.go index 98418f01386..13fc4ac7ef0 100644 --- a/server/channels/api4/scheme_test.go +++ b/server/channels/api4/scheme_test.go @@ -434,7 +434,7 @@ func TestGetChannelsForScheme(t *testing.T) { Type: model.ChannelTypeOpen, } - channel1, errCh := th.App.Srv().Store().Channel().Save(channel1, 1000000) + channel1, errCh := th.App.Srv().Store().Channel().Save(th.Context, channel1, 1000000) assert.NoError(t, errCh) l2, _, err := th.SystemAdminClient.GetChannelsForScheme(context.Background(), scheme1.Id, 0, 100) @@ -457,7 +457,7 @@ func TestGetChannelsForScheme(t *testing.T) { Type: model.ChannelTypeOpen, SchemeId: &scheme1.Id, } - channel2, err = th.App.Srv().Store().Channel().Save(channel2, 1000000) + channel2, err = th.App.Srv().Store().Channel().Save(th.Context, channel2, 1000000) assert.NoError(t, err) l4, _, err := th.SystemAdminClient.GetChannelsForScheme(context.Background(), scheme1.Id, 0, 100) @@ -742,7 +742,7 @@ func TestDeleteScheme(t *testing.T) { assert.Zero(t, role6.DeleteAt) // Make sure this scheme is in use by a team. - channel, err := th.App.Srv().Store().Channel().Save(&model.Channel{ + channel, err := th.App.Srv().Store().Channel().Save(th.Context, &model.Channel{ TeamId: model.NewId(), DisplayName: model.NewId(), Name: model.NewId(), diff --git a/server/channels/app/channel.go b/server/channels/app/channel.go index 0b187ef10bb..0f671dce4ed 100644 --- a/server/channels/app/channel.go +++ b/server/channels/app/channel.go @@ -220,7 +220,7 @@ func (a *App) RenameChannel(c request.CTX, channel *model.Channel, newChannelNam func (a *App) CreateChannel(c request.CTX, channel *model.Channel, addMember bool) (*model.Channel, *model.AppError) { channel.DisplayName = strings.TrimSpace(channel.DisplayName) - sc, nErr := a.Srv().Store().Channel().Save(channel, *a.Config().TeamSettings.MaxChannelsPerTeam) + sc, nErr := a.Srv().Store().Channel().Save(c, channel, *a.Config().TeamSettings.MaxChannelsPerTeam) if nErr != nil { var invErr *store.ErrInvalidInput var cErr *store.ErrConflict @@ -528,7 +528,7 @@ func (a *App) createGroupChannel(c request.CTX, userIDs []string) (*model.Channe Type: model.ChannelTypeGroup, } - channel, nErr := a.Srv().Store().Channel().Save(group, *a.Config().TeamSettings.MaxChannelsPerTeam) + channel, nErr := a.Srv().Store().Channel().Save(c, group, *a.Config().TeamSettings.MaxChannelsPerTeam) if nErr != nil { var invErr *store.ErrInvalidInput var cErr *store.ErrConflict diff --git a/server/channels/app/email/helper_test.go b/server/channels/app/email/helper_test.go index 801189c034a..4bec182013a 100644 --- a/server/channels/app/email/helper_test.go +++ b/server/channels/app/email/helper_test.go @@ -189,7 +189,7 @@ func (th *TestHelper) createChannel(team *model.Team, channelType string) *model } var err error - if channel, err = th.store.Channel().Save(channel, *th.configStore.Get().TeamSettings.MaxChannelsPerTeam); err != nil { + if channel, err = th.store.Channel().Save(th.Context, channel, *th.configStore.Get().TeamSettings.MaxChannelsPerTeam); err != nil { panic(err) } diff --git a/server/channels/app/platform/helper_test.go b/server/channels/app/platform/helper_test.go index 87d2d612abb..a9b0fbcf4f8 100644 --- a/server/channels/app/platform/helper_test.go +++ b/server/channels/app/platform/helper_test.go @@ -283,7 +283,7 @@ func (th *TestHelper) CreateChannel(team *model.Team, options ...ChannelOption) } var err error - channel, err = th.Service.Store.Channel().Save(channel, 999) + channel, err = th.Service.Store.Channel().Save(th.Context, channel, 999) if err != nil { panic(err) } diff --git a/server/channels/app/team.go b/server/channels/app/team.go index b726884314e..584a5bcbef9 100644 --- a/server/channels/app/team.go +++ b/server/channels/app/team.go @@ -104,7 +104,7 @@ func (a *App) AdjustTeamsFromProductLimits(teamLimits *model.TeamsLimits) *model } func (a *App) CreateTeam(c request.CTX, team *model.Team) (*model.Team, *model.AppError) { - rteam, err := a.ch.srv.teamService.CreateTeam(team) + rteam, err := a.ch.srv.teamService.CreateTeam(c, team) if err != nil { var invErr *store.ErrInvalidInput diff --git a/server/channels/app/teams/teams.go b/server/channels/app/teams/teams.go index ac612069445..3a38aecc989 100644 --- a/server/channels/app/teams/teams.go +++ b/server/channels/app/teams/teams.go @@ -9,14 +9,14 @@ import ( "github.com/mattermost/mattermost/server/public/shared/request" ) -func (ts *TeamService) CreateTeam(team *model.Team) (*model.Team, error) { +func (ts *TeamService) CreateTeam(rctx request.CTX, team *model.Team) (*model.Team, error) { team.InviteId = "" rteam, err := ts.store.Save(team) if err != nil { return nil, err } - if _, err := ts.createDefaultChannels(rteam.Id); err != nil { + if _, err := ts.createDefaultChannels(rctx, rteam.Id); err != nil { return nil, err } @@ -42,7 +42,7 @@ func (ts *TeamService) GetTeams(teamIDs []string) ([]*model.Team, error) { } // CreateDefaultChannels creates channels in the given team for each channel returned by (*App).DefaultChannelNames. -func (ts *TeamService) createDefaultChannels(teamID string) ([]*model.Channel, error) { +func (ts *TeamService) createDefaultChannels(rctx request.CTX, teamID string) ([]*model.Channel, error) { displayNames := map[string]string{ "town-square": i18n.T("api.channel.create_default_channels.town_square"), "off-topic": i18n.T("api.channel.create_default_channels.off_topic"), @@ -56,7 +56,7 @@ func (ts *TeamService) createDefaultChannels(teamID string) ([]*model.Channel, e // and let the subscribers do the job, in this case it would be the channels service. // Currently we are adding services to the server and because of that we are using // the channel store here. This should be replaced in the future. - if _, err := ts.channelStore.Save(channel, *ts.config().TeamSettings.MaxChannelsPerTeam); err != nil { + if _, err := ts.channelStore.Save(rctx, channel, *ts.config().TeamSettings.MaxChannelsPerTeam); err != nil { return nil, err } channels = append(channels, channel) diff --git a/server/channels/app/teams/teams_test.go b/server/channels/app/teams/teams_test.go index a4fee6673df..017b60e76f2 100644 --- a/server/channels/app/teams/teams_test.go +++ b/server/channels/app/teams/teams_test.go @@ -24,10 +24,10 @@ func TestCreateTeam(t *testing.T) { Type: model.TeamOpen, } - _, err := th.service.CreateTeam(team) + _, err := th.service.CreateTeam(th.Context, team) require.NoError(t, err, "Should create a new team") - _, err = th.service.CreateTeam(team) + _, err = th.service.CreateTeam(th.Context, team) require.Error(t, err, "Should not create a new team - team already exist") } @@ -43,7 +43,7 @@ func TestJoinUserToTeam(t *testing.T) { Type: model.TeamOpen, } - _, err := th.service.CreateTeam(team) + _, err := th.service.CreateTeam(th.Context, team) require.NoError(t, err, "Should create a new team") maxUsersPerTeam := th.service.config().TeamSettings.MaxUsersPerTeam diff --git a/server/channels/store/opentracinglayer/opentracinglayer.go b/server/channels/store/opentracinglayer/opentracinglayer.go index ab1bd8c58e3..d74de0a6aaf 100644 --- a/server/channels/store/opentracinglayer/opentracinglayer.go +++ b/server/channels/store/opentracinglayer/opentracinglayer.go @@ -2257,7 +2257,7 @@ func (s *OpenTracingLayerChannelStore) Restore(channelID string, timestamp int64 return err } -func (s *OpenTracingLayerChannelStore) Save(channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) { +func (s *OpenTracingLayerChannelStore) Save(rctx request.CTX, channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.Save") s.Root.Store.SetContext(newCtx) @@ -2266,7 +2266,7 @@ func (s *OpenTracingLayerChannelStore) Save(channel *model.Channel, maxChannelsP }() defer span.Finish() - result, err := s.ChannelStore.Save(channel, maxChannelsPerTeam) + result, err := s.ChannelStore.Save(rctx, channel, maxChannelsPerTeam) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) diff --git a/server/channels/store/retrylayer/retrylayer.go b/server/channels/store/retrylayer/retrylayer.go index 8b10f785ca9..ae03a6580b3 100644 --- a/server/channels/store/retrylayer/retrylayer.go +++ b/server/channels/store/retrylayer/retrylayer.go @@ -2483,11 +2483,11 @@ func (s *RetryLayerChannelStore) Restore(channelID string, timestamp int64) erro } -func (s *RetryLayerChannelStore) Save(channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) { +func (s *RetryLayerChannelStore) Save(rctx request.CTX, channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) { tries := 0 for { - result, err := s.ChannelStore.Save(channel, maxChannelsPerTeam) + result, err := s.ChannelStore.Save(rctx, channel, maxChannelsPerTeam) if err == nil { return result, nil } diff --git a/server/channels/store/searchlayer/channel_layer.go b/server/channels/store/searchlayer/channel_layer.go index 88b8c527886..71da71c1108 100644 --- a/server/channels/store/searchlayer/channel_layer.go +++ b/server/channels/store/searchlayer/channel_layer.go @@ -66,11 +66,8 @@ func (c *SearchChannelStore) indexChannel(rctx request.CTX, channel *model.Chann } } -func (c *SearchChannelStore) Save(channel *model.Channel, maxChannels int64) (*model.Channel, error) { - // TODO: Use the actuall request context from the App layer - // https://mattermost.atlassian.net/browse/MM-55733 - rctx := request.EmptyContext(c.rootStore.Logger()) - newChannel, err := c.ChannelStore.Save(channel, maxChannels) +func (c *SearchChannelStore) Save(rctx request.CTX, channel *model.Channel, maxChannels int64) (*model.Channel, error) { + newChannel, err := c.ChannelStore.Save(rctx, channel, maxChannels) if err == nil { c.indexChannel(rctx, newChannel) } diff --git a/server/channels/store/searchtest/helper.go b/server/channels/store/searchtest/helper.go index da789dc3d11..04adb69086f 100644 --- a/server/channels/store/searchtest/helper.go +++ b/server/channels/store/searchtest/helper.go @@ -249,7 +249,7 @@ func (th *SearchTestHelper) deleteBot(botID string) error { } func (th *SearchTestHelper) createChannel(teamID, name, displayName, purpose string, channelType model.ChannelType, user *model.User, deleted bool) (*model.Channel, error) { - channel, err := th.Store.Channel().Save(&model.Channel{ + channel, err := th.Store.Channel().Save(th.Context, &model.Channel{ TeamId: teamID, DisplayName: displayName, Name: name, @@ -315,7 +315,7 @@ func (th *SearchTestHelper) createGroupChannel(teamID, displayName string, users Type: model.ChannelTypeGroup, } - channel, err := th.Store.Channel().Save(group, 10000) + channel, err := th.Store.Channel().Save(th.Context, group, 10000) if err != nil { return nil, errors.New(err.Error()) } diff --git a/server/channels/store/sqlstore/channel_store.go b/server/channels/store/sqlstore/channel_store.go index 048c87e2920..d1efcd0ee20 100644 --- a/server/channels/store/sqlstore/channel_store.go +++ b/server/channels/store/sqlstore/channel_store.go @@ -579,7 +579,7 @@ func (s SqlChannelStore) upsertPublicChannelT(transaction *sqlxTxWrapper, channe } // Save writes the (non-direct) channel to the database. -func (s SqlChannelStore) Save(channel *model.Channel, maxChannelsPerTeam int64) (_ *model.Channel, err error) { +func (s SqlChannelStore) Save(rctx request.CTX, channel *model.Channel, maxChannelsPerTeam int64) (_ *model.Channel, err error) { if channel.DeleteAt != 0 { return nil, store.NewErrInvalidInput("Channel", "DeleteAt", channel.DeleteAt) } diff --git a/server/channels/store/sqlstore/integrity_test.go b/server/channels/store/sqlstore/integrity_test.go index 66268623255..993a5657806 100644 --- a/server/channels/store/sqlstore/integrity_test.go +++ b/server/channels/store/sqlstore/integrity_test.go @@ -24,18 +24,18 @@ func createAudit(ss store.Store, userId, sessionId string) *model.Audit { return &audit } -func createChannel(ss store.Store, teamId, creatorId string) *model.Channel { +func createChannel(rctx request.CTX, ss store.Store, teamId, creatorId string) *model.Channel { m := model.Channel{} m.TeamId = teamId m.CreatorId = creatorId m.DisplayName = "Name" m.Name = "zz" + model.NewId() + "b" m.Type = model.ChannelTypeOpen - c, _ := ss.Channel().Save(&m, -1) + c, _ := ss.Channel().Save(rctx, &m, -1) return c } -func createChannelWithSchemeId(ss store.Store, schemeId *string) *model.Channel { +func createChannelWithSchemeId(rctx request.CTX, ss store.Store, schemeId *string) *model.Channel { m := model.Channel{} m.SchemeId = schemeId m.TeamId = model.NewId() @@ -43,7 +43,7 @@ func createChannelWithSchemeId(ss store.Store, schemeId *string) *model.Channel m.DisplayName = "Name" m.Name = "zz" + model.NewId() + "b" m.Type = model.ChannelTypeOpen - c, _ := ss.Channel().Save(&m, -1) + c, _ := ss.Channel().Save(rctx, &m, -1) return c } @@ -75,12 +75,12 @@ func createChannelMemberHistory(ss store.Store, channelId, userId string) *model return &m } -func createChannelWithTeamId(ss store.Store, id string) *model.Channel { - return createChannel(ss, id, model.NewId()) +func createChannelWithTeamId(rctx request.CTX, ss store.Store, id string) *model.Channel { + return createChannel(rctx, ss, id, model.NewId()) } -func createChannelWithCreatorId(ss store.Store, id string) *model.Channel { - return createChannel(ss, model.NewId(), id) +func createChannelWithCreatorId(rctx request.CTX, ss store.Store, id string) *model.Channel { + return createChannel(rctx, ss, model.NewId(), id) } func createChannelMemberWithChannelId(rctx request.CTX, ss store.Store, id string) *model.ChannelMember { @@ -452,8 +452,8 @@ func TestCheckChannelsChannelMemberHistoryIntegrity(t *testing.T) { }) t.Run("should generate a report with one record", func(t *testing.T) { - channel := createChannel(ss, model.NewId(), model.NewId()) user := createUser(rctx, ss) + channel := createChannel(rctx, ss, model.NewId(), model.NewId()) cmh := createChannelMemberHistory(ss, channel.Id, user.Id) dbmap.Exec(`DELETE FROM Channels Where Id=?`, channel.Id) @@ -483,7 +483,7 @@ func TestCheckChannelsChannelMembersIntegrity(t *testing.T) { }) t.Run("should generate a report with one record", func(t *testing.T) { - channel := createChannel(ss, model.NewId(), model.NewId()) + channel := createChannel(rctx, ss, model.NewId(), model.NewId()) member := createChannelMemberWithChannelId(rctx, ss, channel.Id) dbmap.Exec(`DELETE FROM Channels Where Id=?`, channel.Id) result := checkChannelsChannelMembersIntegrity(store) @@ -539,7 +539,7 @@ func TestCheckChannelsOutgoingWebhooksIntegrity(t *testing.T) { }) t.Run("should generate a report with one record", func(t *testing.T) { - channel := createChannel(ss, model.NewId(), model.NewId()) + channel := createChannel(rctx, ss, model.NewId(), model.NewId()) channelId := channel.Id wh := createOutgoingWebhook(ss, model.NewId(), channelId, model.NewId()) dbmap.Exec(`DELETE FROM Channels Where Id=?`, channel.Id) @@ -652,7 +652,7 @@ func TestCheckPostsPostsRootIdIntegrity(t *testing.T) { }) t.Run("should generate a report with one record", func(t *testing.T) { - channel := createChannel(ss, model.NewId(), model.NewId()) + channel := createChannel(rctx, ss, model.NewId(), model.NewId()) root := createPost(rctx, ss, channel.Id, model.NewId(), "", "") rootId := root.Id post := createPost(rctx, ss, channel.Id, model.NewId(), root.Id, root.Id) @@ -715,7 +715,7 @@ func TestCheckSchemesChannelsIntegrity(t *testing.T) { createDefaultRoles(ss) scheme := createScheme(ss) schemeId := scheme.Id - channel := createChannelWithSchemeId(ss, &schemeId) + channel := createChannelWithSchemeId(rctx, ss, &schemeId) dbmap.Exec(`DELETE FROM Schemes WHERE Id=?`, scheme.Id) result := checkSchemesChannelsIntegrity(store) require.NoError(t, result.Err) @@ -805,7 +805,7 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) { }) t.Run("should generate a report with one record", func(t *testing.T) { - channel := createChannelWithTeamId(ss, model.NewId()) + channel := createChannelWithTeamId(rctx, ss, model.NewId()) result := checkTeamsChannelsIntegrity(store) require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) @@ -818,7 +818,7 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) { }) t.Run("should not include direct channel with empty teamid", func(t *testing.T) { - channel := createChannelWithTeamId(ss, model.NewId()) + channel := createChannelWithTeamId(rctx, ss, model.NewId()) userA := createUser(rctx, ss) userB := createUser(rctx, ss) direct, err := ss.Channel().CreateDirectChannel(rctx, userA, userB) @@ -839,7 +839,7 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) { }) t.Run("should include direct channel with non empty teamid", func(t *testing.T) { - channel := createChannelWithTeamId(ss, model.NewId()) + channel := createChannelWithTeamId(rctx, ss, model.NewId()) userA := createUser(rctx, ss) userB := createUser(rctx, ss) direct, err := ss.Channel().CreateDirectChannel(rctx, userA, userB) @@ -1051,7 +1051,7 @@ func TestCheckUsersChannelsIntegrity(t *testing.T) { }) t.Run("should generate a report with one record", func(t *testing.T) { - channel := createChannelWithCreatorId(ss, model.NewId()) + channel := createChannelWithCreatorId(rctx, ss, model.NewId()) result := checkUsersChannelsIntegrity(store) require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) @@ -1079,7 +1079,7 @@ func TestCheckUsersChannelMemberHistoryIntegrity(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) { user := createUser(rctx, ss) - channel := createChannel(ss, model.NewId(), model.NewId()) + channel := createChannel(rctx, ss, model.NewId(), model.NewId()) cmh := createChannelMemberHistory(ss, channel.Id, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) result := checkUsersChannelMemberHistoryIntegrity(store) @@ -1109,7 +1109,7 @@ func TestCheckUsersChannelMembersIntegrity(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) { user := createUser(rctx, ss) - channel := createChannelWithCreatorId(ss, user.Id) + channel := createChannelWithCreatorId(rctx, ss, user.Id) member := createChannelMember(rctx, ss, channel.Id, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) result := checkUsersChannelMembersIntegrity(store) @@ -1622,7 +1622,7 @@ func TestCheckThreadsTeamsIntegrity(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) { team := createTeam(ss) - channel := createChannel(ss, team.Id, model.NewId()) + channel := createChannel(rctx, ss, team.Id, model.NewId()) root := createPost(rctx, ss, channel.Id, model.NewId(), "", "") post := createPost(rctx, ss, channel.Id, model.NewId(), root.Id, root.Id) diff --git a/server/channels/store/store.go b/server/channels/store/store.go index 7e028a8f5de..8f80cbb92f8 100644 --- a/server/channels/store/store.go +++ b/server/channels/store/store.go @@ -181,7 +181,7 @@ type TeamStore interface { } type ChannelStore interface { - Save(channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) + Save(rctx request.CTX, channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) CreateDirectChannel(ctx request.CTX, userID *model.User, otherUserID *model.User, channelOptions ...model.ChannelOption) (*model.Channel, error) SaveDirectChannel(ctx request.CTX, channel *model.Channel, member1 *model.ChannelMember, member2 *model.ChannelMember) (*model.Channel, error) Update(ctx request.CTX, channel *model.Channel) (*model.Channel, error) diff --git a/server/channels/store/storetest/channel_member_history_store.go b/server/channels/store/storetest/channel_member_history_store.go index 2895148e018..bed2391eab9 100644 --- a/server/channels/store/storetest/channel_member_history_store.go +++ b/server/channels/store/storetest/channel_member_history_store.go @@ -34,7 +34,7 @@ func testLogJoinEvent(t *testing.T, rctx request.CTX, ss store.Store) { Name: NewTestId(), Type: model.ChannelTypeOpen, } - channel, err := ss.Channel().Save(&ch, -1) + channel, err := ss.Channel().Save(rctx, &ch, -1) require.NoError(t, err) // and a test user @@ -60,7 +60,7 @@ func testLogLeaveEvent(t *testing.T, rctx request.CTX, ss store.Store) { Name: NewTestId(), Type: model.ChannelTypeOpen, } - channel, err := ss.Channel().Save(&ch, -1) + channel, err := ss.Channel().Save(rctx, &ch, -1) require.NoError(t, err) // and a test user @@ -89,7 +89,7 @@ func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, rctx request.CTX, Name: NewTestId(), Type: model.ChannelTypeOpen, } - channel, err := ss.Channel().Save(ch, -1) + channel, err := ss.Channel().Save(rctx, ch, -1) require.NoError(t, err) // and a test user @@ -185,7 +185,7 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, rctx request.CTX, ss st Name: NewTestId(), Type: model.ChannelTypeOpen, } - channel, err := ss.Channel().Save(channel, -1) + channel, err := ss.Channel().Save(rctx, channel, -1) require.NoError(t, err) // and a test user @@ -297,7 +297,7 @@ func testPermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.Store) { Name: NewTestId(), Type: model.ChannelTypeOpen, } - channel, err := ss.Channel().Save(channel, -1) + channel, err := ss.Channel().Save(rctx, channel, -1) require.NoError(t, err) // and two test users @@ -358,7 +358,7 @@ func testPermanentDeleteBatchForRetentionPolicies(t *testing.T, rctx request.CTX Type: model.TeamOpen, }) require.NoError(t, err) - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team.Id, DisplayName: "DisplayName", Name: "channel" + model.NewId(), @@ -403,7 +403,7 @@ func testGetChannelsLeftSince(t *testing.T, rctx request.CTX, ss store.Store) { Type: model.TeamOpen, }) require.NoError(t, err) - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team.Id, DisplayName: "DisplayName", Name: "channel" + model.NewId(), diff --git a/server/channels/store/storetest/channel_store.go b/server/channels/store/storetest/channel_store.go index 9596c381b53..4bb0a75f60e 100644 --- a/server/channels/store/storetest/channel_store.go +++ b/server/channels/store/storetest/channel_store.go @@ -164,20 +164,20 @@ func testChannelStoreSave(t *testing.T, rctx request.CTX, ss store.Store) { o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr, "couldn't save item", nErr) - _, nErr = ss.Channel().Save(&o1, -1) + _, nErr = ss.Channel().Save(rctx, &o1, -1) require.Error(t, nErr, "shouldn't be able to update from save") o1.Id = "" - _, nErr = ss.Channel().Save(&o1, -1) + _, nErr = ss.Channel().Save(rctx, &o1, -1) require.Error(t, nErr, "should be unique name") o1.Id = "" o1.Name = model.GetDMNameFromIds(NewTestId(), NewTestId()) o1.Type = model.ChannelTypeDirect - _, nErr = ss.Channel().Save(&o1, -1) + _, nErr = ss.Channel().Save(rctx, &o1, -1) require.Error(t, nErr, "should not be able to save direct channel") o1 = model.Channel{} @@ -186,13 +186,13 @@ func testChannelStoreSave(t *testing.T, rctx request.CTX, ss store.Store) { o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o1, -1) + _, nErr = ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr, "should have saved channel") o2 := o1 o2.Id = "" - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.Error(t, nErr, "should have failed to save a duplicate channel") var cErr *store.ErrConflict require.True(t, errors.As(nErr, &cErr)) @@ -201,7 +201,7 @@ func testChannelStoreSave(t *testing.T, rctx request.CTX, ss store.Store) { require.NoError(t, err, "should have deleted channel") o2.Id = "" - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.Error(t, nErr, "should have failed to save a duplicate of an archived channel") require.True(t, errors.As(nErr, &cErr)) } @@ -332,7 +332,7 @@ func testChannelStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) { o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) o2 := model.Channel{} @@ -341,7 +341,7 @@ func testChannelStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) { o2.Name = NewTestId() o2.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) time.Sleep(100 * time.Millisecond) @@ -385,7 +385,7 @@ func testGetChannelUnread(t *testing.T, rctx request.CTX, ss store.Store) { // Setup Channel 1 c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Downtown", Type: model.ChannelTypeOpen, TotalMsgCount: 100, TotalMsgCountRoot: 99} - _, nErr = ss.Channel().Save(c1, -1) + _, nErr = ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) cm1 := &model.ChannelMember{ChannelId: c1.Id, UserId: m1.UserId, NotifyProps: notifyPropsModel, MsgCount: 90, MsgCountRoot: 80} @@ -394,7 +394,7 @@ func testGetChannelUnread(t *testing.T, rctx request.CTX, ss store.Store) { // Setup Channel 2 c2 := &model.Channel{TeamId: m2.TeamId, Name: model.NewId(), DisplayName: "Cultural", Type: model.ChannelTypeOpen, TotalMsgCount: 100, TotalMsgCountRoot: 100} - _, nErr = ss.Channel().Save(c2, -1) + _, nErr = ss.Channel().Save(rctx, c2, -1) require.NoError(t, nErr) cm2 := &model.ChannelMember{ChannelId: c2.Id, UserId: m2.UserId, NotifyProps: notifyPropsModel, MsgCount: 90, MsgCountRoot: 90, MentionCount: 5, MentionCountRoot: 1} @@ -428,7 +428,7 @@ func testChannelStoreGet(t *testing.T, rctx request.CTX, ss store.Store, s SqlSt o1.DisplayName = "Name" o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) c1, err := ss.Channel().Get(o1.Id, false) @@ -498,7 +498,7 @@ func testChannelStoreGet(t *testing.T, rctx request.CTX, ss store.Store, s SqlSt } func testChannelStoreGetMany(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore) { - o1, nErr := ss.Channel().Save(&model.Channel{ + o1, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: model.NewId(), DisplayName: "Name", Name: NewTestId(), @@ -506,7 +506,7 @@ func testChannelStoreGetMany(t *testing.T, rctx request.CTX, ss store.Store, s S }, -1) require.NoError(t, nErr) - o2, nErr := ss.Channel().Save(&model.Channel{ + o2, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: model.NewId(), DisplayName: "Name2", Name: NewTestId(), @@ -537,7 +537,7 @@ func testChannelStoreGetChannelsByIds(t *testing.T, rctx request.CTX, ss store.S o1.DisplayName = "Name" o1.Name = "aa" + model.NewId() o1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) u1 := &model.User{} @@ -567,7 +567,7 @@ func testChannelStoreGetChannelsByIds(t *testing.T, rctx request.CTX, ss store.S o3.DisplayName = "Deleted channel" o3.Name = "cc" + model.NewId() o3.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o3, -1) + _, nErr = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, nErr) nErr = ss.Channel().Delete(o3.Id, 123) require.NoError(t, nErr) @@ -626,7 +626,7 @@ func testGetChannelsWithTeamDataByIds(t *testing.T, rctx request.CTX, ss store.S c1.DisplayName = "Name" c1.Name = "aa" + model.NewId() c1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&c1, -1) + _, nErr := ss.Channel().Save(rctx, &c1, -1) require.NoError(t, nErr) u1 := &model.User{} @@ -656,7 +656,7 @@ func testGetChannelsWithTeamDataByIds(t *testing.T, rctx request.CTX, ss store.S c3.DisplayName = "Deleted channel" c3.Name = "cc" + model.NewId() c3.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&c3, -1) + _, nErr = ss.Channel().Save(rctx, &c3, -1) require.NoError(t, nErr) nErr = ss.Channel().Delete(c3.Id, 123) require.NoError(t, nErr) @@ -702,7 +702,7 @@ func testChannelStoreGetForPost(t *testing.T, rctx request.CTX, ss store.Store) Name: NewTestId(), Type: model.ChannelTypeOpen, } - o1, nErr := ss.Channel().Save(ch, -1) + o1, nErr := ss.Channel().Save(rctx, ch, -1) require.NoError(t, nErr) p1, err := ss.Post().Save(rctx, &model.Post{ @@ -723,7 +723,7 @@ func testChannelStoreRestore(t *testing.T, rctx request.CTX, ss store.Store) { o1.DisplayName = "Channel1" o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) err := ss.Channel().Delete(o1.Id, model.GetMillis()) @@ -745,7 +745,7 @@ func testChannelStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) { o1.DisplayName = "Channel1" o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) o2 := model.Channel{} @@ -753,7 +753,7 @@ func testChannelStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) { o2.DisplayName = "Channel2" o2.Name = NewTestId() o2.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) o3 := model.Channel{} @@ -761,7 +761,7 @@ func testChannelStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) { o3.DisplayName = "Channel3" o3.Name = NewTestId() o3.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o3, -1) + _, nErr = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, nErr) o4 := model.Channel{} @@ -769,7 +769,7 @@ func testChannelStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) { o4.DisplayName = "Channel4" o4.Name = NewTestId() o4.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o4, -1) + _, nErr = ss.Channel().Save(rctx, &o4, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} @@ -830,7 +830,7 @@ func testChannelStoreGetByName(t *testing.T, rctx request.CTX, ss store.Store) { o1.DisplayName = "Name" o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) result, err := ss.Channel().GetByName(o1.TeamId, o1.Name, true) @@ -863,7 +863,7 @@ func testChannelStoreGetByNames(t *testing.T, rctx request.CTX, ss store.Store) Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) o2 := model.Channel{ @@ -872,7 +872,7 @@ func testChannelStoreGetByNames(t *testing.T, rctx request.CTX, ss store.Store) Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) o3 := model.Channel{ @@ -881,7 +881,7 @@ func testChannelStoreGetByNames(t *testing.T, rctx request.CTX, ss store.Store) Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o3, -1) + _, nErr = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, nErr) nErr = ss.Channel().Delete(o3.Id, model.GetMillis()) require.NoError(t, nErr) @@ -929,7 +929,7 @@ func testChannelStoreGetByNamesIncludeDeleted(t *testing.T, rctx request.CTX, ss Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) o2 := model.Channel{ @@ -938,7 +938,7 @@ func testChannelStoreGetByNamesIncludeDeleted(t *testing.T, rctx request.CTX, ss Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) nErr = ss.Channel().Delete(o2.Id, model.GetMillis()) require.NoError(t, nErr, "channel should have been deleted") @@ -975,7 +975,7 @@ func testChannelStoreGetDeletedByName(t *testing.T, rctx request.CTX, ss store.S o1.DisplayName = "Name" o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(o1, -1) + _, nErr := ss.Channel().Save(rctx, o1, -1) require.NoError(t, nErr) now := model.GetMillis() @@ -1001,7 +1001,7 @@ func testChannelStoreGetDeleted(t *testing.T, rctx request.CTX, ss store.Store) userId := model.NewId() - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) err := ss.Channel().Delete(o1.Id, model.GetMillis()) @@ -1017,7 +1017,7 @@ func testChannelStoreGetDeleted(t *testing.T, rctx request.CTX, ss store.Store) o2.DisplayName = "Channel2" o2.Name = NewTestId() o2.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) list, nErr = ss.Channel().GetDeleted(o1.TeamId, 0, 100, userId) @@ -1030,7 +1030,7 @@ func testChannelStoreGetDeleted(t *testing.T, rctx request.CTX, ss store.Store) o3.Name = NewTestId() o3.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o3, -1) + _, nErr = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, nErr) err = ss.Channel().Delete(o3.Id, model.GetMillis()) @@ -1055,7 +1055,7 @@ func testChannelMemberStore(t *testing.T, rctx request.CTX, ss store.Store) { c1.DisplayName = "NameName" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - c1, nErr := ss.Channel().Save(c1, -1) + c1, nErr := ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) c1t1, _ := ss.Channel().Get(c1.Id, false) @@ -1188,7 +1188,7 @@ func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) { Type: model.ChannelTypeOpen, TeamId: team.Id, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }() @@ -1349,7 +1349,7 @@ func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) { Type: model.ChannelTypeOpen, TeamId: team.Id, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }() @@ -1503,7 +1503,7 @@ func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) { team, nErr = ss.Team().Save(team) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ DisplayName: "DisplayName", Name: "z-z-z" + model.NewId(), Type: model.ChannelTypeOpen, @@ -1696,7 +1696,7 @@ func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Sto Type: model.ChannelTypeOpen, TeamId: team.Id, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }() @@ -1871,7 +1871,7 @@ func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Sto Type: model.ChannelTypeOpen, TeamId: team.Id, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }() @@ -2039,7 +2039,7 @@ func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Sto team, nErr = ss.Team().Save(team) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ DisplayName: "DisplayName", Name: "z-z-z" + model.NewId(), Type: model.ChannelTypeOpen, @@ -2236,7 +2236,7 @@ func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) { Type: model.ChannelTypeOpen, TeamId: team.Id, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }() @@ -2399,7 +2399,7 @@ func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) { Type: model.ChannelTypeOpen, TeamId: team.Id, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }() @@ -2555,7 +2555,7 @@ func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) { team, nErr = ss.Team().Save(team) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ DisplayName: "DisplayName", Name: "z-z-z" + model.NewId(), Type: model.ChannelTypeOpen, @@ -2753,7 +2753,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.S Type: model.ChannelTypeOpen, TeamId: team.Id, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }() @@ -2923,7 +2923,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.S Type: model.ChannelTypeOpen, TeamId: team.Id, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }() @@ -3086,7 +3086,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.S team, nErr = ss.Team().Save(team) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ DisplayName: "DisplayName", Name: "z-z-z" + model.NewId(), Type: model.ChannelTypeOpen, @@ -3255,7 +3255,7 @@ func testChannelUpdateMemberNotifyProps(t *testing.T, rctx request.CTX, ss store Type: model.ChannelTypeOpen, TeamId: team.Id, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }() @@ -3291,12 +3291,12 @@ func testChannelUpdateMemberNotifyProps(t *testing.T, rctx request.CTX, ss store func testChannelPatchMultipleMembersNotifyProps(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("should save multiple channel members' notify props at once", func(t *testing.T) { - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ Name: model.NewId(), Type: model.ChannelTypeOpen, }, -1) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ Name: model.NewId(), Type: model.ChannelTypeOpen, }, -1) @@ -3384,7 +3384,7 @@ func testChannelPatchMultipleMembersNotifyProps(t *testing.T, rctx request.CTX, }) t.Run("should not allow saving invalid notify props", func(t *testing.T) { - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ Name: model.NewId(), Type: model.ChannelTypeOpen, }, -1) @@ -3524,7 +3524,7 @@ func testChannelDeleteMemberStore(t *testing.T, rctx request.CTX, ss store.Store c1.DisplayName = "NameName" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - c1, nErr := ss.Channel().Save(c1, -1) + c1, nErr := ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) c1t1, _ := ss.Channel().Get(c1.Id, false) @@ -3590,7 +3590,7 @@ func testChannelStoreGetChannels(t *testing.T, rctx request.CTX, ss store.Store) o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen var nErr error - o1, nErr = ss.Channel().Save(o1, -1) + o1, nErr = ss.Channel().Save(rctx, o1, -1) require.NoError(t, nErr) o2 := model.Channel{} @@ -3598,7 +3598,7 @@ func testChannelStoreGetChannels(t *testing.T, rctx request.CTX, ss store.Store) o2.DisplayName = "Channel2" o2.Name = NewTestId() o2.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) o3 := model.Channel{} @@ -3606,7 +3606,7 @@ func testChannelStoreGetChannels(t *testing.T, rctx request.CTX, ss store.Store) o3.DisplayName = "Channel3" o3.Name = NewTestId() o3.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o3, -1) + _, nErr = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} @@ -3748,7 +3748,7 @@ func testChannelStoreGetChannelsByUser(t *testing.T, rctx request.CTX, ss store. o1.DisplayName = "Channel1" o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) o2 := model.Channel{} @@ -3756,7 +3756,7 @@ func testChannelStoreGetChannelsByUser(t *testing.T, rctx request.CTX, ss store. o2.DisplayName = "Channel2" o2.Name = NewTestId() o2.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) o3 := model.Channel{} @@ -3764,7 +3764,7 @@ func testChannelStoreGetChannelsByUser(t *testing.T, rctx request.CTX, ss store. o3.DisplayName = "Channel3" o3.Name = NewTestId() o3.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o3, -1) + _, nErr = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} @@ -3855,7 +3855,7 @@ func testChannelStoreGetAllChannels(t *testing.T, rctx request.CTX, ss store.Sto c1.DisplayName = "Channel1" + model.NewId() c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&c1, -1) + _, nErr := ss.Channel().Save(rctx, &c1, -1) require.NoError(t, nErr) group := &model.Group{ @@ -3875,7 +3875,7 @@ func testChannelStoreGetAllChannels(t *testing.T, rctx request.CTX, ss store.Sto c2.DisplayName = "Channel2" + model.NewId() c2.Name = NewTestId() c2.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&c2, -1) + _, nErr = ss.Channel().Save(rctx, &c2, -1) require.NoError(t, nErr) c2.DeleteAt = model.GetMillis() c2.UpdateAt = c2.DeleteAt @@ -3887,7 +3887,7 @@ func testChannelStoreGetAllChannels(t *testing.T, rctx request.CTX, ss store.Sto c3.DisplayName = "Channel3" + model.NewId() c3.Name = NewTestId() c3.Type = model.ChannelTypePrivate - _, nErr = ss.Channel().Save(&c3, -1) + _, nErr = ss.Channel().Save(rctx, &c3, -1) require.NoError(t, nErr) u1 := model.User{Id: model.NewId()} @@ -3902,7 +3902,7 @@ func testChannelStoreGetAllChannels(t *testing.T, rctx request.CTX, ss store.Sto c5.DisplayName = "GroupChannel" + model.NewId() c5.Name = NewTestId() c5.Type = model.ChannelTypeGroup - _, nErr = ss.Channel().Save(&c5, -1) + _, nErr = ss.Channel().Save(rctx, &c5, -1) require.NoError(t, nErr) list, nErr := ss.Channel().GetAllChannels(0, 10, store.ChannelSearchOpts{}) @@ -3991,7 +3991,7 @@ func testChannelStoreGetMoreChannels(t *testing.T, rctx request.CTX, ss store.St Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) _, err := ss.Channel().SaveMember(rctx, &model.ChannelMember{ @@ -4015,7 +4015,7 @@ func testChannelStoreGetMoreChannels(t *testing.T, rctx request.CTX, ss store.St Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) _, err = ss.Channel().SaveMember(rctx, &model.ChannelMember{ @@ -4033,7 +4033,7 @@ func testChannelStoreGetMoreChannels(t *testing.T, rctx request.CTX, ss store.St Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o3, -1) + _, nErr = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, nErr) // o4 is a private channel on the team to which the user does not belong @@ -4043,7 +4043,7 @@ func testChannelStoreGetMoreChannels(t *testing.T, rctx request.CTX, ss store.St Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&o4, -1) + _, nErr = ss.Channel().Save(rctx, &o4, -1) require.NoError(t, nErr) // o5 is another private channel on the team to which the user does belong @@ -4053,7 +4053,7 @@ func testChannelStoreGetMoreChannels(t *testing.T, rctx request.CTX, ss store.St Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&o5, -1) + _, nErr = ss.Channel().Save(rctx, &o5, -1) require.NoError(t, nErr) _, err = ss.Channel().SaveMember(rctx, &model.ChannelMember{ @@ -4077,7 +4077,7 @@ func testChannelStoreGetMoreChannels(t *testing.T, rctx request.CTX, ss store.St Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o6, -1) + _, nErr = ss.Channel().Save(rctx, &o6, -1) require.NoError(t, nErr) // o7 is another channel on the team to which the user does not belong, but is deleted, @@ -4088,7 +4088,7 @@ func testChannelStoreGetMoreChannels(t *testing.T, rctx request.CTX, ss store.St Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o7, -1) + _, nErr = ss.Channel().Save(rctx, &o7, -1) require.NoError(t, nErr) nErr = ss.Channel().Delete(o7.Id, model.GetMillis()) @@ -4141,7 +4141,7 @@ func testChannelStoreGetPrivateChannelsForTeam(t *testing.T, rctx request.CTX, s Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, nErr := ss.Channel().Save(&p1, -1) + _, nErr := ss.Channel().Save(rctx, &p1, -1) require.NoError(t, nErr) // p2 is a private channel on another team @@ -4151,7 +4151,7 @@ func testChannelStoreGetPrivateChannelsForTeam(t *testing.T, rctx request.CTX, s Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&p2, -1) + _, nErr = ss.Channel().Save(rctx, &p2, -1) require.NoError(t, nErr) // o1 is a public channel on the team @@ -4161,7 +4161,7 @@ func testChannelStoreGetPrivateChannelsForTeam(t *testing.T, rctx request.CTX, s Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o1, -1) + _, nErr = ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) t.Run("only p1 initially listed in private channels", func(t *testing.T) { @@ -4177,7 +4177,7 @@ func testChannelStoreGetPrivateChannelsForTeam(t *testing.T, rctx request.CTX, s Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&p3, -1) + _, nErr = ss.Channel().Save(rctx, &p3, -1) require.NoError(t, nErr) // p4 is another private, but deleted channel on the team @@ -4187,7 +4187,7 @@ func testChannelStoreGetPrivateChannelsForTeam(t *testing.T, rctx request.CTX, s Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&p4, -1) + _, nErr = ss.Channel().Save(rctx, &p4, -1) require.NoError(t, nErr) err := ss.Channel().Delete(p4.Id, model.GetMillis()) require.NoError(t, err, "channel should have been deleted") @@ -4233,7 +4233,7 @@ func testChannelStoreGetPublicChannelsForTeam(t *testing.T, rctx request.CTX, ss Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) // o2 is a public channel on another team @@ -4243,7 +4243,7 @@ func testChannelStoreGetPublicChannelsForTeam(t *testing.T, rctx request.CTX, ss Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) // o3 is a private channel on the team @@ -4253,7 +4253,7 @@ func testChannelStoreGetPublicChannelsForTeam(t *testing.T, rctx request.CTX, ss Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&o3, -1) + _, nErr = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, nErr) t.Run("only o1 initially listed in public channels", func(t *testing.T) { @@ -4269,7 +4269,7 @@ func testChannelStoreGetPublicChannelsForTeam(t *testing.T, rctx request.CTX, ss Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o4, -1) + _, nErr = ss.Channel().Save(rctx, &o4, -1) require.NoError(t, nErr) // o5 is another public, but deleted channel on the team @@ -4279,7 +4279,7 @@ func testChannelStoreGetPublicChannelsForTeam(t *testing.T, rctx request.CTX, ss Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o5, -1) + _, nErr = ss.Channel().Save(rctx, &o5, -1) require.NoError(t, nErr) err := ss.Channel().Delete(o5.Id, model.GetMillis()) require.NoError(t, err, "channel should have been deleted") @@ -4325,7 +4325,7 @@ func testChannelStoreGetPublicChannelsByIdsForTeam(t *testing.T, rctx request.CT Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(&oc1, -1) + _, nErr := ss.Channel().Save(rctx, &oc1, -1) require.NoError(t, nErr) // oc2 is a public channel on another team @@ -4335,7 +4335,7 @@ func testChannelStoreGetPublicChannelsByIdsForTeam(t *testing.T, rctx request.CT Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&oc2, -1) + _, nErr = ss.Channel().Save(rctx, &oc2, -1) require.NoError(t, nErr) // pc3 is a private channel on the team @@ -4345,7 +4345,7 @@ func testChannelStoreGetPublicChannelsByIdsForTeam(t *testing.T, rctx request.CT Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&pc3, -1) + _, nErr = ss.Channel().Save(rctx, &pc3, -1) require.NoError(t, nErr) t.Run("oc1 by itself should be found as a public channel in the team", func(t *testing.T) { @@ -4367,7 +4367,7 @@ func testChannelStoreGetPublicChannelsByIdsForTeam(t *testing.T, rctx request.CT Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&oc4, -1) + _, nErr = ss.Channel().Save(rctx, &oc4, -1) require.NoError(t, nErr) // oc4 is another public, but deleted channel on the team @@ -4377,7 +4377,7 @@ func testChannelStoreGetPublicChannelsByIdsForTeam(t *testing.T, rctx request.CT Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&oc5, -1) + _, nErr = ss.Channel().Save(rctx, &oc5, -1) require.NoError(t, nErr) err := ss.Channel().Delete(oc5.Id, model.GetMillis()) @@ -4403,7 +4403,7 @@ func testChannelStoreGetChannelCounts(t *testing.T, rctx request.CTX, ss store.S o2.DisplayName = "Channel2" o2.Name = NewTestId() o2.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o2, -1) + _, nErr := ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) o1 := model.Channel{} @@ -4411,7 +4411,7 @@ func testChannelStoreGetChannelCounts(t *testing.T, rctx request.CTX, ss store.S o1.DisplayName = "Channel1" o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o1, -1) + _, nErr = ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} @@ -4455,7 +4455,7 @@ func testChannelStoreGetMembersForUser(t *testing.T, rctx request.CTX, ss store. o1.DisplayName = "Channel1" o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) o2 := model.Channel{} @@ -4463,7 +4463,7 @@ func testChannelStoreGetMembersForUser(t *testing.T, rctx request.CTX, ss store. o2.DisplayName = "Channel2" o2.Name = NewTestId() o2.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} @@ -4517,7 +4517,7 @@ func testChannelStoreGetMembersForUser(t *testing.T, rctx request.CTX, ss store. Type: model.ChannelTypeGroup, } var channel *model.Channel - channel, nErr = ss.Channel().Save(group, 10000) + channel, nErr = ss.Channel().Save(rctx, group, 10000) require.NoError(t, nErr) for _, userId := range userIds { cm := &model.ChannelMember{ @@ -4554,7 +4554,7 @@ func testChannelStoreGetMembersForUserWithPagination(t *testing.T, rctx request. Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, err = ss.Channel().Save(&o1, -1) + _, err = ss.Channel().Save(rctx, &o1, -1) require.NoError(t, err) t2 := model.Team{ @@ -4572,7 +4572,7 @@ func testChannelStoreGetMembersForUserWithPagination(t *testing.T, rctx request. Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, err = ss.Channel().Save(&o2, -1) + _, err = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, err) m1 := model.ChannelMember{} @@ -4839,7 +4839,7 @@ func testChannelStoreUpdateLastViewedAt(t *testing.T, rctx request.CTX, ss store o1.TotalMsgCount = 25 o1.LastPostAt = 12345 o1.LastRootPostAt = 12345 - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} @@ -4857,7 +4857,7 @@ func testChannelStoreUpdateLastViewedAt(t *testing.T, rctx request.CTX, ss store o2.TotalMsgCount = 26 o2.LastPostAt = 123456 o2.LastRootPostAt = 123456 - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) m2 := model.ChannelMember{} @@ -4899,7 +4899,7 @@ func testChannelStoreIncrementMentionCount(t *testing.T, rctx request.CTX, ss st o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen o1.TotalMsgCount = 25 - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} @@ -4931,7 +4931,7 @@ func testUpdateChannelMember(t *testing.T, rctx request.CTX, ss store.Store) { Name: model.NewId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(c1, -1) + _, nErr := ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) m1 := &model.ChannelMember{ @@ -4960,7 +4960,7 @@ func testGetMember(t *testing.T, rctx request.CTX, ss store.Store) { Name: model.NewId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(c1, -1) + _, nErr := ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) c2 := &model.Channel{ @@ -4969,7 +4969,7 @@ func testGetMember(t *testing.T, rctx request.CTX, ss store.Store) { Name: model.NewId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(c2, -1) + _, nErr = ss.Channel().Save(rctx, c2, -1) require.NoError(t, nErr) m1 := &model.ChannelMember{ @@ -5024,7 +5024,7 @@ func testGetMemberLastViewedAt(t *testing.T, rctx request.CTX, ss store.Store) { Name: model.NewId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(c1, -1) + _, nErr := ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) c2 := &model.Channel{ @@ -5033,7 +5033,7 @@ func testGetMemberLastViewedAt(t *testing.T, rctx request.CTX, ss store.Store) { Name: model.NewId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(c2, -1) + _, nErr = ss.Channel().Save(rctx, c2, -1) require.NoError(t, nErr) m1 := &model.ChannelMember{ @@ -5079,7 +5079,7 @@ func testChannelStoreGetMemberForPost(t *testing.T, rctx request.CTX, ss store.S Type: model.ChannelTypeOpen, } - o1, nErr := ss.Channel().Save(ch, -1) + o1, nErr := ss.Channel().Save(rctx, ch, -1) require.NoError(t, nErr) m1, err := ss.Channel().SaveMember(rctx, &model.ChannelMember{ @@ -5113,7 +5113,7 @@ func testGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) { Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(&c1, -1) + _, nErr := ss.Channel().Save(rctx, &c1, -1) require.NoError(t, nErr) c2 := model.Channel{ @@ -5122,7 +5122,7 @@ func testGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) { Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&c2, -1) + _, nErr = ss.Channel().Save(rctx, &c2, -1) require.NoError(t, nErr) u1 := &model.User{ @@ -5230,7 +5230,7 @@ func testGetMemberCountsByGroup(t *testing.T, rctx request.CTX, ss store.Store) Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(&c1, -1) + _, nErr := ss.Channel().Save(rctx, &c1, -1) require.NoError(t, nErr) u1 := &model.User{ @@ -5436,7 +5436,7 @@ func testGetGuestCount(t *testing.T, rctx request.CTX, ss store.Store) { Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(&c1, -1) + _, nErr := ss.Channel().Save(rctx, &c1, -1) require.NoError(t, nErr) c2 := model.Channel{ @@ -5445,7 +5445,7 @@ func testGetGuestCount(t *testing.T, rctx request.CTX, ss store.Store) { Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&c2, -1) + _, nErr = ss.Channel().Save(rctx, &c2, -1) require.NoError(t, nErr) t.Run("Regular member doesn't count", func(t *testing.T) { @@ -5559,7 +5559,7 @@ func testChannelStoreSearchMore(t *testing.T, rctx request.CTX, ss store.Store) Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) m1 := model.ChannelMember{ @@ -5584,7 +5584,7 @@ func testChannelStoreSearchMore(t *testing.T, rctx request.CTX, ss store.Store) Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) m3 := model.ChannelMember{ @@ -5601,7 +5601,7 @@ func testChannelStoreSearchMore(t *testing.T, rctx request.CTX, ss store.Store) Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o3, -1) + _, nErr = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, nErr) o4 := model.Channel{ @@ -5610,7 +5610,7 @@ func testChannelStoreSearchMore(t *testing.T, rctx request.CTX, ss store.Store) Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&o4, -1) + _, nErr = ss.Channel().Save(rctx, &o4, -1) require.NoError(t, nErr) o5 := model.Channel{ @@ -5619,7 +5619,7 @@ func testChannelStoreSearchMore(t *testing.T, rctx request.CTX, ss store.Store) Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&o5, -1) + _, nErr = ss.Channel().Save(rctx, &o5, -1) require.NoError(t, nErr) o6 := model.Channel{ @@ -5628,7 +5628,7 @@ func testChannelStoreSearchMore(t *testing.T, rctx request.CTX, ss store.Store) Name: "off-topic", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o6, -1) + _, nErr = ss.Channel().Save(rctx, &o6, -1) require.NoError(t, nErr) o7 := model.Channel{ @@ -5637,7 +5637,7 @@ func testChannelStoreSearchMore(t *testing.T, rctx request.CTX, ss store.Store) Name: "off-set", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o7, -1) + _, nErr = ss.Channel().Save(rctx, &o7, -1) require.NoError(t, nErr) o8 := model.Channel{ @@ -5646,7 +5646,7 @@ func testChannelStoreSearchMore(t *testing.T, rctx request.CTX, ss store.Store) Name: "off-limit", Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&o8, -1) + _, nErr = ss.Channel().Save(rctx, &o8, -1) require.NoError(t, nErr) o9 := model.Channel{ @@ -5656,7 +5656,7 @@ func testChannelStoreSearchMore(t *testing.T, rctx request.CTX, ss store.Store) Name: "with-purpose", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o9, -1) + _, nErr = ss.Channel().Save(rctx, &o9, -1) require.NoError(t, nErr) o10 := model.Channel{ @@ -5665,7 +5665,7 @@ func testChannelStoreSearchMore(t *testing.T, rctx request.CTX, ss store.Store) Name: "channel-a-deleted", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o10, -1) + _, nErr = ss.Channel().Save(rctx, &o10, -1) require.NoError(t, nErr) o10.DeleteAt = model.GetMillis() @@ -5726,7 +5726,7 @@ func testChannelStoreSearchArchivedInTeam(t *testing.T, rctx request.CTX, ss sto o1.DisplayName = "Channel1" o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) o1.DeleteAt = model.GetMillis() o1.UpdateAt = o1.DeleteAt @@ -5769,7 +5769,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) o2 := model.Channel{ @@ -5778,7 +5778,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) m1 := model.ChannelMember{ @@ -5811,7 +5811,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o3, -1) + _, nErr = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, nErr) o4 := model.Channel{ @@ -5820,7 +5820,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&o4, -1) + _, nErr = ss.Channel().Save(rctx, &o4, -1) require.NoError(t, nErr) m4 := &model.ChannelMember{ @@ -5837,7 +5837,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&o5, -1) + _, nErr = ss.Channel().Save(rctx, &o5, -1) require.NoError(t, nErr) o6 := model.Channel{ @@ -5846,7 +5846,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store Name: "off-topic", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o6, -1) + _, nErr = ss.Channel().Save(rctx, &o6, -1) require.NoError(t, nErr) o7 := model.Channel{ @@ -5855,7 +5855,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store Name: "off-set", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o7, -1) + _, nErr = ss.Channel().Save(rctx, &o7, -1) require.NoError(t, nErr) o8 := model.Channel{ @@ -5864,7 +5864,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store Name: "off-limit", Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&o8, -1) + _, nErr = ss.Channel().Save(rctx, &o8, -1) require.NoError(t, nErr) m5 := &model.ChannelMember{ @@ -5881,7 +5881,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store Name: "town-square", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o9, -1) + _, nErr = ss.Channel().Save(rctx, &o9, -1) require.NoError(t, nErr) o10 := model.Channel{ @@ -5890,7 +5890,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store Name: "thename", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o10, -1) + _, nErr = ss.Channel().Save(rctx, &o10, -1) require.NoError(t, nErr) o11 := model.Channel{ @@ -5899,7 +5899,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store Name: "native-mobile-apps", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o11, -1) + _, nErr = ss.Channel().Save(rctx, &o11, -1) require.NoError(t, nErr) o12 := model.Channel{ @@ -5909,7 +5909,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store Name: "with-purpose", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o12, -1) + _, nErr = ss.Channel().Save(rctx, &o12, -1) require.NoError(t, nErr) o13 := model.Channel{ @@ -5918,7 +5918,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store Name: model.NewId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o13, -1) + _, nErr = ss.Channel().Save(rctx, &o13, -1) require.NoError(t, nErr) o13.DeleteAt = model.GetMillis() o13.UpdateAt = o13.DeleteAt @@ -6005,7 +6005,7 @@ func testAutocomplete(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, err = ss.Channel().Save(&o1, -1) + _, err = ss.Channel().Save(rctx, &o1, -1) require.NoError(t, err) o2 := model.Channel{ @@ -6014,7 +6014,7 @@ func testAutocomplete(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, err = ss.Channel().Save(&o2, -1) + _, err = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, err) o6 := model.Channel{ @@ -6023,7 +6023,7 @@ func testAutocomplete(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, err = ss.Channel().Save(&o6, -1) + _, err = ss.Channel().Save(rctx, &o6, -1) require.NoError(t, err) m1 := model.ChannelMember{ @@ -6072,7 +6072,7 @@ func testAutocomplete(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, err = ss.Channel().Save(&o3, -1) + _, err = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, err) o4 := model.Channel{ @@ -6081,7 +6081,7 @@ func testAutocomplete(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, err = ss.Channel().Save(&o4, -1) + _, err = ss.Channel().Save(rctx, &o4, -1) require.NoError(t, err) m4 := &model.ChannelMember{ @@ -6116,7 +6116,7 @@ func testAutocomplete(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, err = ss.Channel().Save(&o5, -1) + _, err = ss.Channel().Save(rctx, &o5, -1) require.NoError(t, err) m6 := model.ChannelMember{ @@ -6173,7 +6173,7 @@ func testAutocomplete(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore t.Run("Limit", func(t *testing.T) { for i := 0; i < model.ChannelSearchDefaultLimit+10; i++ { - _, err = ss.Channel().Save(&model.Channel{ + _, err = ss.Channel().Save(rctx, &model.Channel{ TeamId: teamID, DisplayName: "Channel " + strconv.Itoa(i), Name: NewTestId(), @@ -6202,7 +6202,7 @@ func testChannelStoreSearchForUserInTeam(t *testing.T, rctx request.CTX, ss stor Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) o2 := model.Channel{ @@ -6211,7 +6211,7 @@ func testChannelStoreSearchForUserInTeam(t *testing.T, rctx request.CTX, ss stor Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) o3 := model.Channel{ @@ -6220,7 +6220,7 @@ func testChannelStoreSearchForUserInTeam(t *testing.T, rctx request.CTX, ss stor Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o3, -1) + _, nErr = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, nErr) o4 := model.Channel{ @@ -6229,7 +6229,7 @@ func testChannelStoreSearchForUserInTeam(t *testing.T, rctx request.CTX, ss stor Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o4, -1) + _, nErr = ss.Channel().Save(rctx, &o4, -1) require.NoError(t, nErr) o5 := model.Channel{ @@ -6238,7 +6238,7 @@ func testChannelStoreSearchForUserInTeam(t *testing.T, rctx request.CTX, ss stor Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o5, -1) + _, nErr = ss.Channel().Save(rctx, &o5, -1) require.NoError(t, nErr) // add the user to the first 3 channels and the other team channel @@ -6321,7 +6321,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) o2 := model.Channel{ @@ -6330,7 +6330,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) m1 := model.ChannelMember{ @@ -6363,7 +6363,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Name: NewTestId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o3, -1) + _, nErr = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, nErr) o4 := model.Channel{ @@ -6372,7 +6372,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Name: NewTestId(), Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&o4, -1) + _, nErr = ss.Channel().Save(rctx, &o4, -1) require.NoError(t, nErr) o5 := model.Channel{ @@ -6382,7 +6382,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Type: model.ChannelTypePrivate, GroupConstrained: model.NewBool(true), } - _, nErr = ss.Channel().Save(&o5, -1) + _, nErr = ss.Channel().Save(rctx, &o5, -1) require.NoError(t, nErr) o6 := model.Channel{ @@ -6391,7 +6391,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Name: "off-topic", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o6, -1) + _, nErr = ss.Channel().Save(rctx, &o6, -1) require.NoError(t, nErr) o7 := model.Channel{ @@ -6400,7 +6400,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Name: "off-set", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o7, -1) + _, nErr = ss.Channel().Save(rctx, &o7, -1) require.NoError(t, nErr) group := &model.Group{ @@ -6421,7 +6421,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Name: "off-limit", Type: model.ChannelTypePrivate, } - _, nErr = ss.Channel().Save(&o8, -1) + _, nErr = ss.Channel().Save(rctx, &o8, -1) require.NoError(t, nErr) o9 := model.Channel{ @@ -6430,7 +6430,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Name: "town-square", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o9, -1) + _, nErr = ss.Channel().Save(rctx, &o9, -1) require.NoError(t, nErr) o10 := model.Channel{ @@ -6439,7 +6439,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Name: "which", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o10, -1) + _, nErr = ss.Channel().Save(rctx, &o10, -1) require.NoError(t, nErr) o11 := model.Channel{ @@ -6448,7 +6448,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Name: "native-mobile-apps", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o11, -1) + _, nErr = ss.Channel().Save(rctx, &o11, -1) require.NoError(t, nErr) o12 := model.Channel{ @@ -6458,7 +6458,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Name: "with-purpose", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o12, -1) + _, nErr = ss.Channel().Save(rctx, &o12, -1) require.NoError(t, nErr) o13 := model.Channel{ @@ -6467,7 +6467,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Name: model.NewId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o13, -1) + _, nErr = ss.Channel().Save(rctx, &o13, -1) require.NoError(t, nErr) o13.DeleteAt = model.GetMillis() @@ -6481,7 +6481,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, rctx request.CTX, ss store. Name: "whatever", Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o14, -1) + _, nErr = ss.Channel().Save(rctx, &o14, -1) require.NoError(t, nErr) _, nErr = ss.RetentionPolicy().Save(&model.RetentionPolicyWithTeamAndChannelIDs{ @@ -6560,7 +6560,7 @@ func testChannelStoreGetMembersByIds(t *testing.T, rctx request.CTX, ss store.St o1.DisplayName = "ChannelA" o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) m1 := &model.ChannelMember{ChannelId: o1.Id, UserId: model.NewId(), NotifyProps: model.GetDefaultChannelNotifyProps()} @@ -6592,7 +6592,7 @@ func testChannelStoreGetMembersByChannelIds(t *testing.T, rctx request.CTX, ss s userId := model.NewId() // Create a couple channels and add the user to them - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: model.NewId(), DisplayName: model.NewId(), Name: model.NewId(), @@ -6600,7 +6600,7 @@ func testChannelStoreGetMembersByChannelIds(t *testing.T, rctx request.CTX, ss s }, -1) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: model.NewId(), DisplayName: model.NewId(), Name: model.NewId(), @@ -6655,7 +6655,7 @@ func testChannelStoreGetMembersInfoByChannelIds(t *testing.T, rctx request.CTX, require.NoError(t, err) // Create a couple channels and add the user to them - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: model.NewId(), DisplayName: model.NewId(), Name: model.NewId(), @@ -6663,7 +6663,7 @@ func testChannelStoreGetMembersInfoByChannelIds(t *testing.T, rctx request.CTX, }, -1) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: model.NewId(), DisplayName: model.NewId(), Name: model.NewId(), @@ -6738,7 +6738,7 @@ func testChannelStoreSearchGroupChannels(t *testing.T, rctx request.CTX, ss stor gc1.Name = model.GetGroupNameFromUserIds(userIds) gc1.DisplayName = "GroupChannel" + model.NewId() gc1.Type = model.ChannelTypeGroup - _, nErr := ss.Channel().Save(&gc1, -1) + _, nErr := ss.Channel().Save(rctx, &gc1, -1) require.NoError(t, nErr) for _, userId := range userIds { @@ -6755,7 +6755,7 @@ func testChannelStoreSearchGroupChannels(t *testing.T, rctx request.CTX, ss stor gc2.Name = model.GetGroupNameFromUserIds(userIds) gc2.DisplayName = "GroupChannel" + model.NewId() gc2.Type = model.ChannelTypeGroup - _, nErr = ss.Channel().Save(&gc2, -1) + _, nErr = ss.Channel().Save(rctx, &gc2, -1) require.NoError(t, nErr) for _, userId := range userIds { @@ -6772,7 +6772,7 @@ func testChannelStoreSearchGroupChannels(t *testing.T, rctx request.CTX, ss stor gc3.Name = model.GetGroupNameFromUserIds(userIds) gc3.DisplayName = "GroupChannel" + model.NewId() gc3.Type = model.ChannelTypeGroup - _, nErr = ss.Channel().Save(&gc3, -1) + _, nErr = ss.Channel().Save(rctx, &gc3, -1) require.NoError(t, nErr) for _, userId := range userIds { @@ -6862,7 +6862,7 @@ func testChannelStoreAnalyticsDeletedTypeCount(t *testing.T, rctx request.CTX, s o1.DisplayName = "ChannelA" o1.Name = NewTestId() o1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) o2 := model.Channel{} @@ -6870,7 +6870,7 @@ func testChannelStoreAnalyticsDeletedTypeCount(t *testing.T, rctx request.CTX, s o2.DisplayName = "Channel2" o2.Name = NewTestId() o2.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) p3 := model.Channel{} @@ -6878,7 +6878,7 @@ func testChannelStoreAnalyticsDeletedTypeCount(t *testing.T, rctx request.CTX, s p3.DisplayName = "Channel3" p3.Name = NewTestId() p3.Type = model.ChannelTypePrivate - _, nErr = ss.Channel().Save(&p3, -1) + _, nErr = ss.Channel().Save(rctx, &p3, -1) require.NoError(t, nErr) u1 := &model.User{} @@ -6944,7 +6944,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, rctx request.CTX, ss store.Sto Type: model.ChannelTypeOpen, } - o1, nErr := ss.Channel().Save(ch1, -1) + o1, nErr := ss.Channel().Save(rctx, ch1, -1) require.NoError(t, nErr) p1, err := ss.Post().Save(rctx, &model.Post{ @@ -6966,7 +6966,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, rctx request.CTX, ss store.Sto Type: model.ChannelTypeOpen, } - o2, nErr := ss.Channel().Save(ch2, -1) + o2, nErr := ss.Channel().Save(rctx, ch2, -1) require.NoError(t, nErr) _, err = ss.Post().Save(rctx, &model.Post{ @@ -6982,7 +6982,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, rctx request.CTX, ss store.Sto t.Run("with correct ReplyCount", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName", Name: "channel" + model.NewId(), @@ -7037,7 +7037,7 @@ func testChannelStoreGetPinnedPostCount(t *testing.T, rctx request.CTX, ss store Type: model.ChannelTypeOpen, } - o1, nErr := ss.Channel().Save(ch1, -1) + o1, nErr := ss.Channel().Save(rctx, ch1, -1) require.NoError(t, nErr) _, err := ss.Post().Save(rctx, &model.Post{ @@ -7067,7 +7067,7 @@ func testChannelStoreGetPinnedPostCount(t *testing.T, rctx request.CTX, ss store Type: model.ChannelTypeOpen, } - o2, nErr := ss.Channel().Save(ch2, -1) + o2, nErr := ss.Channel().Save(rctx, ch2, -1) require.NoError(t, nErr) _, err = ss.Post().Save(rctx, &model.Post{ @@ -7096,13 +7096,13 @@ func testChannelStoreMaxChannelsPerTeam(t *testing.T, rctx request.CTX, ss store Name: model.NewId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(channel, 0) + _, nErr := ss.Channel().Save(rctx, channel, 0) assert.Error(t, nErr) var ltErr *store.ErrLimitExceeded assert.True(t, errors.As(nErr, <Err)) channel.Id = "" - _, nErr = ss.Channel().Save(channel, 1) + _, nErr = ss.Channel().Save(rctx, channel, 1) assert.NoError(t, nErr) } @@ -7151,9 +7151,9 @@ func testChannelStoreGetChannelsByScheme(t *testing.T, rctx request.CTX, ss stor Type: model.ChannelTypeOpen, } - _, _ = ss.Channel().Save(c1, 100) - _, _ = ss.Channel().Save(c2, 100) - _, _ = ss.Channel().Save(c3, 100) + _, _ = ss.Channel().Save(rctx, c1, 100) + _, _ = ss.Channel().Save(rctx, c2, 100) + _, _ = ss.Channel().Save(rctx, c3, 100) // Get the channels by a valid Scheme ID. d1, err := ss.Channel().GetChannelsByScheme(s1.Id, 0, 100) @@ -7180,7 +7180,7 @@ func testChannelStoreMigrateChannelMembers(t *testing.T, rctx request.CTX, ss st Type: model.ChannelTypeOpen, SchemeId: &s1, } - c1, _ = ss.Channel().Save(c1, 100) + c1, _ = ss.Channel().Save(rctx, c1, 100) cm1 := &model.ChannelMember{ ChannelId: c1.Id, @@ -7269,8 +7269,8 @@ func testResetAllChannelSchemes(t *testing.T, rctx request.CTX, ss store.Store) SchemeId: &s1.Id, } - c1, _ = ss.Channel().Save(c1, 100) - c2, _ = ss.Channel().Save(c2, 100) + c1, _ = ss.Channel().Save(rctx, c1, 100) + c2, _ = ss.Channel().Save(rctx, c2, 100) assert.Equal(t, s1.Id, *c1.SchemeId) assert.Equal(t, s1.Id, *c2.SchemeId) @@ -7293,7 +7293,7 @@ func testChannelStoreClearAllCustomRoleAssignments(t *testing.T, rctx request.CT Type: model.ChannelTypeOpen, } - c, _ = ss.Channel().Save(c, 100) + c, _ = ss.Channel().Save(rctx, c, 100) m1 := &model.ChannelMember{ ChannelId: c.Id, @@ -7360,7 +7360,7 @@ func testMaterializedPublicChannels(t *testing.T, rctx request.CTX, ss store.Sto Name: model.NewId(), Type: model.ChannelTypeOpen, } - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) // o2 is another public channel on the team @@ -7370,7 +7370,7 @@ func testMaterializedPublicChannels(t *testing.T, rctx request.CTX, ss store.Sto Name: model.NewId(), Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o2, -1) + _, nErr = ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) t.Run("o1 and o2 initially listed in public channels", func(t *testing.T) { @@ -7484,7 +7484,7 @@ func testMaterializedPublicChannels(t *testing.T, rctx request.CTX, ss store.Sto Type: model.ChannelTypeOpen, } - _, nErr = ss.Channel().Save(&o4, -1) + _, nErr = ss.Channel().Save(rctx, &o4, -1) require.NoError(t, nErr) _, execerr = s.GetMasterX().Exec(` @@ -7520,7 +7520,7 @@ func testChannelStoreGetAllChannelsForExportAfter(t *testing.T, rctx request.CTX c1.DisplayName = "Channel1" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&c1, -1) + _, nErr := ss.Channel().Save(rctx, &c1, -1) require.NoError(t, nErr) d1, err := ss.Channel().GetAllChannelsForExportAfter(10000, strings.Repeat("0", 26)) @@ -7552,7 +7552,7 @@ func testChannelStoreGetChannelMembersForExport(t *testing.T, rctx request.CTX, c1.DisplayName = "Channel1" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&c1, -1) + _, nErr := ss.Channel().Save(rctx, &c1, -1) require.NoError(t, nErr) c2 := model.Channel{} @@ -7560,7 +7560,7 @@ func testChannelStoreGetChannelMembersForExport(t *testing.T, rctx request.CTX, c2.DisplayName = "Channel2" c2.Name = NewTestId() c2.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&c2, -1) + _, nErr = ss.Channel().Save(rctx, &c2, -1) require.NoError(t, nErr) u1 := model.User{} @@ -7609,7 +7609,7 @@ func testChannelStoreRemoveAllDeactivatedMembers(t *testing.T, rctx request.CTX, c1.DisplayName = "Channel1" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&c1, -1) + _, nErr := ss.Channel().Save(rctx, &c1, -1) require.NoError(t, nErr) u1 := model.User{} @@ -7701,7 +7701,7 @@ func testChannelStoreExportAllDirectChannels(t *testing.T, rctx request.CTX, ss o2.DisplayName = "GroupChannel" + model.NewId() o2.Name = NewTestId() o2.Type = model.ChannelTypeGroup - _, nErr := ss.Channel().Save(&o2, -1) + _, nErr := ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) u1 := &model.User{} @@ -7756,7 +7756,7 @@ func testChannelStoreExportAllDirectChannelsExcludePrivateAndPublic(t *testing.T o2.DisplayName = "Channel2" + model.NewId() o2.Name = NewTestId() o2.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&o2, -1) + _, nErr := ss.Channel().Save(rctx, &o2, -1) require.NoError(t, nErr) o3 := model.Channel{} @@ -7764,7 +7764,7 @@ func testChannelStoreExportAllDirectChannelsExcludePrivateAndPublic(t *testing.T o3.DisplayName = "Channel3" + model.NewId() o3.Name = NewTestId() o3.Type = model.ChannelTypePrivate - _, nErr = ss.Channel().Save(&o3, -1) + _, nErr = ss.Channel().Save(rctx, &o3, -1) require.NoError(t, nErr) u1 := &model.User{} @@ -7865,7 +7865,7 @@ func testChannelStoreGetChannelsBatchForIndexing(t *testing.T, rctx request.CTX, c1.DisplayName = "Channel1" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(c1, -1) + _, nErr := ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) time.Sleep(10 * time.Millisecond) @@ -7874,7 +7874,7 @@ func testChannelStoreGetChannelsBatchForIndexing(t *testing.T, rctx request.CTX, c2.DisplayName = "Channel2" c2.Name = NewTestId() c2.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(c2, -1) + _, nErr = ss.Channel().Save(rctx, c2, -1) require.NoError(t, nErr) time.Sleep(10 * time.Millisecond) @@ -7883,21 +7883,21 @@ func testChannelStoreGetChannelsBatchForIndexing(t *testing.T, rctx request.CTX, c3.DisplayName = "Channel3" c3.Name = NewTestId() c3.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(c3, -1) + _, nErr = ss.Channel().Save(rctx, c3, -1) require.NoError(t, nErr) c4 := &model.Channel{} c4.DisplayName = "Channel4" c4.Name = NewTestId() c4.Type = model.ChannelTypePrivate - _, nErr = ss.Channel().Save(c4, -1) + _, nErr = ss.Channel().Save(rctx, c4, -1) require.NoError(t, nErr) c5 := &model.Channel{} c5.DisplayName = "Channel5" c5.Name = NewTestId() c5.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(c5, -1) + _, nErr = ss.Channel().Save(rctx, c5, -1) require.NoError(t, nErr) time.Sleep(10 * time.Millisecond) @@ -7906,7 +7906,7 @@ func testChannelStoreGetChannelsBatchForIndexing(t *testing.T, rctx request.CTX, c6.DisplayName = "Channel6" c6.Name = NewTestId() c6.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(c6, -1) + _, nErr = ss.Channel().Save(rctx, c6, -1) require.NoError(t, nErr) // First and last channel should be outside the range @@ -7926,7 +7926,7 @@ func testChannelStoreGetChannelsBatchForIndexing(t *testing.T, rctx request.CTX, } func testGroupSyncedChannelCount(t *testing.T, rctx request.CTX, ss store.Store) { - channel1, nErr := ss.Channel().Save(&model.Channel{ + channel1, nErr := ss.Channel().Save(rctx, &model.Channel{ DisplayName: model.NewId(), Name: model.NewId(), Type: model.ChannelTypePrivate, @@ -7936,7 +7936,7 @@ func testGroupSyncedChannelCount(t *testing.T, rctx request.CTX, ss store.Store) require.True(t, channel1.IsGroupConstrained()) defer ss.Channel().PermanentDelete(rctx, channel1.Id) - channel2, nErr := ss.Channel().Save(&model.Channel{ + channel2, nErr := ss.Channel().Save(rctx, &model.Channel{ DisplayName: model.NewId(), Name: model.NewId(), Type: model.ChannelTypePrivate, @@ -7966,7 +7966,7 @@ func testSetShared(t *testing.T, rctx request.CTX, ss store.Store) { Name: "test_share_flag", Type: model.ChannelTypeOpen, } - channelSaved, err := ss.Channel().Save(channel, 999) + channelSaved, err := ss.Channel().Save(rctx, channel, 999) require.NoError(t, err) t.Run("Check default", func(t *testing.T) { @@ -8004,7 +8004,7 @@ func testGetTeamForChannel(t *testing.T, rctx request.CTX, ss store.Store) { Name: "test_share_flag", Type: model.ChannelTypeOpen, } - channelSaved, err := ss.Channel().Save(channel, 999) + channelSaved, err := ss.Channel().Save(rctx, channel, 999) require.NoError(t, err) got, err := ss.Channel().GetTeamForChannel(channelSaved.Id) @@ -8033,7 +8033,7 @@ func testGetChannelsWithUnreadsAndWithMentions(t *testing.T, rctx request.CTX, s o1.TotalMsgCount = 25 o1.LastPostAt = 12345 o1.LastRootPostAt = 12345 - _, nErr := ss.Channel().Save(&o1, -1) + _, nErr := ss.Channel().Save(rctx, &o1, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} diff --git a/server/channels/store/storetest/channel_store_categories.go b/server/channels/store/storetest/channel_store_categories.go index 9d5ae2a2e5e..7f373ee5183 100644 --- a/server/channels/store/storetest/channel_store_categories.go +++ b/server/channels/store/storetest/channel_store_categories.go @@ -193,7 +193,7 @@ func testCreateInitialSidebarCategories(t *testing.T, rctx request.CTX, ss store team := setupTeam(t, rctx, ss, userId) // Set up two channels, one favorited and one not - channel1, nErr := ss.Channel().Save(&model.Channel{ + channel1, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: team.Id, Type: model.ChannelTypeOpen, Name: "channel1", @@ -206,7 +206,7 @@ func testCreateInitialSidebarCategories(t *testing.T, rctx request.CTX, ss store }) require.NoError(t, err) - channel2, nErr := ss.Channel().Save(&model.Channel{ + channel2, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: team.Id, Type: model.ChannelTypeOpen, Name: "channel2", @@ -254,7 +254,7 @@ func testCreateInitialSidebarCategories(t *testing.T, rctx request.CTX, ss store team := setupTeam(t, rctx, ss, userId) // Set up two channels - channel1, nErr := ss.Channel().Save(&model.Channel{ + channel1, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: team.Id, Type: model.ChannelTypeOpen, Name: "channel1", @@ -268,7 +268,7 @@ func testCreateInitialSidebarCategories(t *testing.T, rctx request.CTX, ss store }) require.NoError(t, err) - channel2, nErr := ss.Channel().Save(&model.Channel{ + channel2, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: team.Id, Type: model.ChannelTypeOpen, Name: "channel2", @@ -392,7 +392,7 @@ func testCreateInitialSidebarCategories(t *testing.T, rctx request.CTX, ss store team2 := setupTeam(t, rctx, ss, userId) // Set up a channel on another team and favorite it - channel1, nErr := ss.Channel().Save(&model.Channel{ + channel1, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: team2.Id, Type: model.ChannelTypeOpen, Name: "channel1", @@ -537,13 +537,13 @@ func testCreateSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store) { require.NotEmpty(t, res) // Create some channels - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ Type: model.ChannelTypeOpen, TeamId: team.Id, Name: model.NewId(), }, 100) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ Type: model.ChannelTypeOpen, TeamId: team.Id, Name: model.NewId(), @@ -588,13 +588,13 @@ func testCreateSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store) { require.Equal(t, model.SidebarCategoryChannels, channelsCategory.Type) // Create some channels - channel1, nErr := ss.Channel().Save(&model.Channel{ + channel1, nErr := ss.Channel().Save(rctx, &model.Channel{ Type: model.ChannelTypeOpen, TeamId: team.Id, Name: model.NewId(), }, 100) require.NoError(t, nErr) - channel2, nErr := ss.Channel().Save(&model.Channel{ + channel2, nErr := ss.Channel().Save(rctx, &model.Channel{ Type: model.ChannelTypeOpen, TeamId: team.Id, Name: model.NewId(), @@ -721,7 +721,7 @@ func testGetSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s Sq require.Equal(t, model.SidebarCategoryChannels, channelsCategory.Type) // Join some channels - channel1, nErr := ss.Channel().Save(&model.Channel{ + channel1, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: "channel1", DisplayName: "DEF", TeamId: team.Id, @@ -735,7 +735,7 @@ func testGetSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s Sq }) require.NoError(t, nErr) - channel2, nErr := ss.Channel().Save(&model.Channel{ + channel2, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: "channel2", DisplayName: "ABC", TeamId: team.Id, @@ -789,7 +789,7 @@ func testGetSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s Sq channelsCategory := categories.Categories[1] // Join a channel on another team - channel1, nErr := ss.Channel().Save(&model.Channel{ + channel1, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: "abc", TeamId: model.NewId(), Type: model.ChannelTypeOpen, @@ -834,7 +834,7 @@ func testGetSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s Sq require.Equal(t, model.SidebarCategoryChannels, channelsCategory.Type) // Join some channels - channel1, nErr := ss.Channel().Save(&model.Channel{ + channel1, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: "channel1", DisplayName: "DEF", TeamId: team.Id, @@ -848,7 +848,7 @@ func testGetSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s Sq }) require.NoError(t, nErr) - channel2, nErr := ss.Channel().Save(&model.Channel{ + channel2, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: "channel2", DisplayName: "ABC", TeamId: team.Id, @@ -944,7 +944,7 @@ func testGetSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s Sq dmsCategory := categories.Categories[2] // Create a GM - gmChannel, nErr := ss.Channel().Save(&model.Channel{ + gmChannel, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: "abc", TeamId: "", Type: model.ChannelTypeGroup, @@ -1293,7 +1293,7 @@ func testUpdateSidebarCategories(t *testing.T, rctx request.CTX, ss store.Store) require.Equal(t, model.SidebarCategoryFavorites, favoritesCategory.Type) // Join a channel - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: "channel", Type: model.ChannelTypeOpen, TeamId: team.Id, @@ -1553,7 +1553,7 @@ func testUpdateSidebarCategories(t *testing.T, rctx request.CTX, ss store.Store) require.Equal(t, model.SidebarCategoryChannels, channelsCategory2.Type) // Have both users join a channel - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: "channel", Type: model.ChannelTypeOpen, TeamId: team.Id, @@ -1666,7 +1666,7 @@ func testUpdateSidebarCategories(t *testing.T, rctx request.CTX, ss store.Store) team := setupTeam(t, rctx, ss, userId) // Create some channels - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: "channel", Type: model.ChannelTypeOpen, TeamId: team.Id, @@ -1834,7 +1834,7 @@ func testUpdateSidebarCategories(t *testing.T, rctx request.CTX, ss store.Store) team := setupTeam(t, rctx, ss, userId) // Join a channel - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: "channel", Type: model.ChannelTypeOpen, TeamId: team.Id, @@ -1902,7 +1902,7 @@ func testUpdateSidebarCategories(t *testing.T, rctx request.CTX, ss store.Store) team := setupTeam(t, rctx, ss, userId) // Join a channel - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: "channel", Type: model.ChannelTypeOpen, TeamId: team.Id, @@ -2002,7 +2002,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, rctx request.CTX, ss store.Store, } // Create some channels and assign them to a custom category - channel1, nErr := ss.Channel().Save(&model.Channel{ + channel1, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: model.NewId(), TeamId: teamId, Type: model.ChannelTypeOpen, @@ -2051,7 +2051,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, rctx request.CTX, ss store.Store, } // Create some channels and assign them to a custom category - channel1, nErr := ss.Channel().Save(&model.Channel{ + channel1, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: model.NewId(), TeamId: teamId, Type: model.ChannelTypeOpen, @@ -2118,7 +2118,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, rctx request.CTX, ss store.Store, require.Len(t, res.Categories, 3) // On the first team, create some channels and assign them to a custom category - channel1, nErr := ss.Channel().Save(&model.Channel{ + channel1, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: model.NewId(), TeamId: teamId, Type: model.ChannelTypeOpen, @@ -2134,7 +2134,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, rctx request.CTX, ss store.Store, require.NoError(t, err) // Do the same on the second team - channel2, nErr := ss.Channel().Save(&model.Channel{ + channel2, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: model.NewId(), TeamId: team2.Id, Type: model.ChannelTypeOpen, @@ -2211,7 +2211,7 @@ func testDeleteSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s } // Create some channels - channel1, nErr := ss.Channel().Save(&model.Channel{ + channel1, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: model.NewId(), TeamId: teamId, Type: model.ChannelTypeOpen, @@ -2219,7 +2219,7 @@ func testDeleteSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s require.NoError(t, nErr) defer ss.Channel().PermanentDelete(rctx, channel1.Id) - channel2, nErr := ss.Channel().Save(&model.Channel{ + channel2, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: model.NewId(), TeamId: teamId, Type: model.ChannelTypePrivate, @@ -2304,7 +2304,7 @@ func testUpdateSidebarChannelsByPreferences(t *testing.T, rctx request.CTX, ss s require.NoError(t, nErr) require.NotEmpty(t, res) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ Name: "channel", Type: model.ChannelTypeOpen, TeamId: teamId, @@ -2353,7 +2353,7 @@ func testSidebarCategoryDeadlock(t *testing.T, rctx request.CTX, ss store.Store) team := setupTeam(t, rctx, ss, userID) // Join a channel - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ Name: "channel", Type: model.ChannelTypeOpen, TeamId: team.Id, diff --git a/server/channels/store/storetest/compliance_store.go b/server/channels/store/storetest/compliance_store.go index bf191aee895..98d894017bc 100644 --- a/server/channels/store/storetest/compliance_store.go +++ b/server/channels/store/storetest/compliance_store.go @@ -132,7 +132,7 @@ func testComplianceExport(t *testing.T, rctx request.CTX, ss store.Store) { c1.DisplayName = "Channel2" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - c1, nErr = ss.Channel().Save(c1, -1) + c1, nErr = ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) o1 := &model.Post{} @@ -266,7 +266,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store c1.DisplayName = "Channel2" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - c1, nErr = ss.Channel().Save(c1, -1) + c1, nErr = ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) cDM, nErr := ss.Channel().CreateDirectChannel(rctx, u1, u2) @@ -446,7 +446,7 @@ func testMessageExportPublicChannel(t *testing.T, rctx request.CTX, ss store.Sto DisplayName: "Public Channel", Type: model.ChannelTypeOpen, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) // user1 posts twice in the public channel @@ -550,7 +550,7 @@ func testMessageExportPrivateChannel(t *testing.T, rctx request.CTX, ss store.St DisplayName: "Private Channel", Type: model.ChannelTypePrivate, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) // user1 posts twice in the private channel @@ -748,7 +748,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, rctx request.CTX, ss sto Name: model.NewId(), Type: model.ChannelTypeGroup, } - groupMessageChannel, nErr = ss.Channel().Save(groupMessageChannel, -1) + groupMessageChannel, nErr = ss.Channel().Save(rctx, groupMessageChannel, -1) require.NoError(t, nErr) // user1 posts in the GM @@ -823,7 +823,7 @@ func testEditExportMessage(t *testing.T, rctx request.CTX, ss store.Store) { DisplayName: "Public Channel", Type: model.ChannelTypeOpen, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) // user1 posts in the public channel @@ -915,7 +915,7 @@ func testEditAfterExportMessage(t *testing.T, rctx request.CTX, ss store.Store) DisplayName: "Public Channel", Type: model.ChannelTypeOpen, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) // user1 posts in the public channel @@ -1026,7 +1026,7 @@ func testDeleteExportMessage(t *testing.T, rctx request.CTX, ss store.Store) { DisplayName: "Public Channel", Type: model.ChannelTypeOpen, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) // user1 posts in the public channel @@ -1111,7 +1111,7 @@ func testDeleteAfterExportMessage(t *testing.T, rctx request.CTX, ss store.Store DisplayName: "Public Channel", Type: model.ChannelTypeOpen, } - channel, nErr = ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) // user1 posts in the public channel diff --git a/server/channels/store/storetest/file_info_store.go b/server/channels/store/storetest/file_info_store.go index 78471acdc7d..172b9bf42f3 100644 --- a/server/channels/store/storetest/file_info_store.go +++ b/server/channels/store/storetest/file_info_store.go @@ -683,14 +683,14 @@ func testFileInfoStoreGetFilesBatchForIndexing(t *testing.T, rctx request.CTX, s c1.DisplayName = "Channel1" c1.Name = "zz" + model.NewId() + "b" c1.Type = model.ChannelTypeOpen - c1, _ = ss.Channel().Save(c1, -1) + c1, _ = ss.Channel().Save(rctx, c1, -1) c2 := &model.Channel{} c2.TeamId = model.NewId() c2.DisplayName = "Channel2" c2.Name = "zz" + model.NewId() + "b" c2.Type = model.ChannelTypeOpen - c2, _ = ss.Channel().Save(c2, -1) + c2, _ = ss.Channel().Save(rctx, c2, -1) o1 := &model.Post{} o1.ChannelId = c1.Id diff --git a/server/channels/store/storetest/group_store.go b/server/channels/store/storetest/group_store.go index cf8b5b6b9a3..aa465286f51 100644 --- a/server/channels/store/storetest/group_store.go +++ b/server/channels/store/storetest/group_store.go @@ -1151,7 +1151,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, rctx request.CTX, ss stor Name: model.NewId(), Type: model.ChannelTypeOpen, // Query does not look at type so this shouldn't matter. } - channel, nErr := ss.Channel().Save(channel, 9999) + channel, nErr := ss.Channel().Save(rctx, channel, 9999) require.NoError(t, nErr) // returns no members when channel does not exist @@ -2045,7 +2045,7 @@ func testChannelMembersToAdd(t *testing.T, rctx request.CTX, ss store.Store) { Name: model.NewId(), Type: model.ChannelTypeOpen, // Query does not look at type so this shouldn't matter. } - channel, nErr = ss.Channel().Save(channel, 9999) + channel, nErr = ss.Channel().Save(rctx, channel, 9999) require.NoError(t, nErr) // Create GroupChannel @@ -2243,7 +2243,7 @@ func testChannelMembersToAddSingleChannel(t *testing.T, rctx request.CTX, ss sto Name: "z-z-" + model.NewId() + "a", Type: model.ChannelTypeOpen, } - channel1, nErr = ss.Channel().Save(channel1, 999) + channel1, nErr = ss.Channel().Save(rctx, channel1, 999) require.NoError(t, nErr) channel2 := &model.Channel{ @@ -2251,7 +2251,7 @@ func testChannelMembersToAddSingleChannel(t *testing.T, rctx request.CTX, ss sto Name: "z-z-" + model.NewId() + "a", Type: model.ChannelTypeOpen, } - channel2, nErr = ss.Channel().Save(channel2, 999) + channel2, nErr = ss.Channel().Save(rctx, channel2, 999) require.NoError(t, nErr) _, err = ss.Group().CreateGroupSyncable(model.NewGroupChannel(group1.Id, channel1.Id, true)) @@ -2528,7 +2528,7 @@ func testChannelMembersToRemoveSingleChannel(t *testing.T, rctx request.CTX, ss Type: model.ChannelTypeOpen, GroupConstrained: model.NewBool(true), } - channel1, nErr := ss.Channel().Save(channel1, 999) + channel1, nErr := ss.Channel().Save(rctx, channel1, 999) require.NoError(t, nErr) channel2 := &model.Channel{ @@ -2537,7 +2537,7 @@ func testChannelMembersToRemoveSingleChannel(t *testing.T, rctx request.CTX, ss Type: model.ChannelTypeOpen, GroupConstrained: model.NewBool(true), } - channel2, nErr = ss.Channel().Save(channel2, 999) + channel2, nErr = ss.Channel().Save(rctx, channel2, 999) require.NoError(t, nErr) for _, user := range []*model.User{user1, user2} { @@ -2630,7 +2630,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, rctx request.CTX, ss store.Sto Type: model.ChannelTypePrivate, GroupConstrained: model.NewBool(true), } - channelConstrained, nErr = ss.Channel().Save(channelConstrained, 9999) + channelConstrained, nErr = ss.Channel().Save(rctx, channelConstrained, 9999) require.NoError(t, nErr) channelUnconstrained := &model.Channel{ @@ -2639,7 +2639,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, rctx request.CTX, ss store.Sto Name: model.NewId(), Type: model.ChannelTypePrivate, } - channelUnconstrained, nErr = ss.Channel().Save(channelUnconstrained, 9999) + channelUnconstrained, nErr = ss.Channel().Save(rctx, channelUnconstrained, 9999) require.NoError(t, nErr) // create teams @@ -2741,7 +2741,7 @@ func testGetGroupsByChannel(t *testing.T, rctx request.CTX, ss store.Store) { Name: model.NewId(), Type: model.ChannelTypeOpen, } - channel1, err := ss.Channel().Save(channel1, 9999) + channel1, err := ss.Channel().Save(rctx, channel1, 9999) require.NoError(t, err) // Create Groups 1, 2 and a deleted group @@ -2791,7 +2791,7 @@ func testGetGroupsByChannel(t *testing.T, rctx request.CTX, ss store.Store) { Name: model.NewId(), Type: model.ChannelTypeOpen, } - channel2, nErr := ss.Channel().Save(channel2, 9999) + channel2, nErr := ss.Channel().Save(rctx, channel2, 9999) require.NoError(t, nErr) // Create Group3 @@ -2989,7 +2989,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, rctx request.CTX, ss Name: model.NewId(), Type: model.ChannelTypeOpen, } - channel1, err := ss.Channel().Save(channel1, 9999) + channel1, err := ss.Channel().Save(rctx, channel1, 9999) require.NoError(t, err) // Create Groups 1, 2 and a deleted group @@ -3039,7 +3039,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, rctx request.CTX, ss Name: model.NewId(), Type: model.ChannelTypeOpen, } - channel2, err = ss.Channel().Save(channel2, 9999) + channel2, err = ss.Channel().Save(rctx, channel2, 9999) require.NoError(t, err) // Create Group3 @@ -3481,7 +3481,7 @@ func testGetGroups(t *testing.T, rctx request.CTX, ss store.Store) { Name: model.NewId(), Type: model.ChannelTypePrivate, } - channel1, nErr := ss.Channel().Save(channel1, 9999) + channel1, nErr := ss.Channel().Save(rctx, channel1, 9999) require.NoError(t, nErr) // Create Groups 1 and 2 @@ -3545,7 +3545,7 @@ func testGetGroups(t *testing.T, rctx request.CTX, ss store.Store) { Name: model.NewId(), Type: model.ChannelTypePrivate, } - channel2, nErr = ss.Channel().Save(channel2, 9999) + channel2, nErr = ss.Channel().Save(rctx, channel2, 9999) require.NoError(t, nErr) // Create Channel3 @@ -3555,7 +3555,7 @@ func testGetGroups(t *testing.T, rctx request.CTX, ss store.Store) { Name: model.NewId(), Type: model.ChannelTypePrivate, } - channel3, nErr = ss.Channel().Save(channel3, 9999) + channel3, nErr = ss.Channel().Save(rctx, channel3, 9999) require.NoError(t, nErr) // Create Group3 @@ -3669,7 +3669,7 @@ func testGetGroups(t *testing.T, rctx request.CTX, ss store.Store) { Name: model.NewId(), Type: model.ChannelTypePrivate, } - channel4, nErr = ss.Channel().Save(channel4, 9999) + channel4, nErr = ss.Channel().Save(rctx, channel4, 9999) require.NoError(t, nErr) testCases := []struct { @@ -4164,7 +4164,7 @@ func testChannelMembersMinusGroupMembers(t *testing.T, rctx request.CTX, ss stor Type: model.ChannelTypePrivate, GroupConstrained: model.NewBool(true), } - channel, err := ss.Channel().Save(channel, 9999) + channel, err := ss.Channel().Save(rctx, channel, 9999) require.NoError(t, err) for i := 0; i < numberOfUsers; i++ { @@ -4391,7 +4391,7 @@ func groupTestAdminRoleGroupsForSyncableMemberChannel(t *testing.T, rctx request Name: model.NewId(), Type: model.ChannelTypeOpen, } - channel, nErr := ss.Channel().Save(channel, 9999) + channel, nErr := ss.Channel().Save(rctx, channel, 9999) require.NoError(t, nErr) _, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{ @@ -4688,7 +4688,7 @@ func groupTestPermittedSyncableAdminsChannel(t *testing.T, rctx request.CTX, ss Name: model.NewId(), Type: model.ChannelTypeOpen, } - channel, nErr := ss.Channel().Save(channel, 9999) + channel, nErr := ss.Channel().Save(rctx, channel, 9999) require.NoError(t, nErr) _, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{ @@ -4850,7 +4850,7 @@ func groupTestpUpdateMembersRoleChannel(t *testing.T, rctx request.CTX, ss store Name: model.NewId(), Type: model.ChannelTypeOpen, // Query does not look at type so this shouldn't matter. } - channel, err := ss.Channel().Save(channel, 9999) + channel, err := ss.Channel().Save(rctx, channel, 9999) require.NoError(t, err) user1 := &model.User{ @@ -5030,7 +5030,7 @@ func groupTestGroupTeamCount(t *testing.T, rctx request.CTX, ss store.Store) { } func groupTestGroupChannelCount(t *testing.T, rctx request.CTX, ss store.Store) { - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: model.NewId(), DisplayName: model.NewId(), Name: model.NewId(), diff --git a/server/channels/store/storetest/mocks/ChannelStore.go b/server/channels/store/storetest/mocks/ChannelStore.go index 05f043a16a9..a2fa85bbc02 100644 --- a/server/channels/store/storetest/mocks/ChannelStore.go +++ b/server/channels/store/storetest/mocks/ChannelStore.go @@ -2081,25 +2081,25 @@ func (_m *ChannelStore) Restore(channelID string, timestamp int64) error { return r0 } -// Save provides a mock function with given fields: channel, maxChannelsPerTeam -func (_m *ChannelStore) Save(channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) { - ret := _m.Called(channel, maxChannelsPerTeam) +// Save provides a mock function with given fields: rctx, channel, maxChannelsPerTeam +func (_m *ChannelStore) Save(rctx request.CTX, channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) { + ret := _m.Called(rctx, channel, maxChannelsPerTeam) var r0 *model.Channel var r1 error - if rf, ok := ret.Get(0).(func(*model.Channel, int64) (*model.Channel, error)); ok { - return rf(channel, maxChannelsPerTeam) + if rf, ok := ret.Get(0).(func(request.CTX, *model.Channel, int64) (*model.Channel, error)); ok { + return rf(rctx, channel, maxChannelsPerTeam) } - if rf, ok := ret.Get(0).(func(*model.Channel, int64) *model.Channel); ok { - r0 = rf(channel, maxChannelsPerTeam) + if rf, ok := ret.Get(0).(func(request.CTX, *model.Channel, int64) *model.Channel); ok { + r0 = rf(rctx, channel, maxChannelsPerTeam) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Channel) } } - if rf, ok := ret.Get(1).(func(*model.Channel, int64) error); ok { - r1 = rf(channel, maxChannelsPerTeam) + if rf, ok := ret.Get(1).(func(request.CTX, *model.Channel, int64) error); ok { + r1 = rf(rctx, channel, maxChannelsPerTeam) } else { r1 = ret.Error(1) } diff --git a/server/channels/store/storetest/post_persistent_notification_store.go b/server/channels/store/storetest/post_persistent_notification_store.go index b49455583ff..cbc388a5801 100644 --- a/server/channels/store/storetest/post_persistent_notification_store.go +++ b/server/channels/store/storetest/post_persistent_notification_store.go @@ -351,13 +351,13 @@ func testPostPersistentNotificationStoreDelete(t *testing.T, rctx request.CTX, s require.NoError(t, err) c1 := &model.Channel{TeamId: t1.Id, Name: model.NewId(), DisplayName: "c1", Type: model.ChannelTypeOpen} - _, err = ss.Channel().Save(c1, -1) + _, err = ss.Channel().Save(rctx, c1, -1) require.NoError(t, err) c2 := &model.Channel{TeamId: t1.Id, Name: model.NewId(), DisplayName: "c2", Type: model.ChannelTypeOpen} - _, err = ss.Channel().Save(c2, -1) + _, err = ss.Channel().Save(rctx, c2, -1) require.NoError(t, err) c3 := &model.Channel{TeamId: t2.Id, Name: model.NewId(), DisplayName: "c1", Type: model.ChannelTypeOpen} - _, err = ss.Channel().Save(c3, -1) + _, err = ss.Channel().Save(rctx, c3, -1) require.NoError(t, err) p1 := model.Post{} diff --git a/server/channels/store/storetest/post_store.go b/server/channels/store/storetest/post_store.go index 287aa11859f..0d62cdfdc82 100644 --- a/server/channels/store/storetest/post_store.go +++ b/server/channels/store/storetest/post_store.go @@ -81,7 +81,7 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("Save replies", func(t *testing.T) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -95,7 +95,7 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) { o1.RootId = model.NewId() o1.Message = NewTestId() - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName2", Name: "channel" + model.NewId(), @@ -109,7 +109,7 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) { o2.RootId = o1.RootId o2.Message = NewTestId() - channel3, err := ss.Channel().Save(&model.Channel{ + channel3, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName3", Name: "channel" + model.NewId(), @@ -151,7 +151,7 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("Update reply should update the UpdateAt of the root post", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -191,7 +191,7 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) { channel.DisplayName = NewTestId() channel.Type = model.ChannelTypeOpen - _, err := ss.Channel().Save(&channel, 100) + _, err := ss.Channel().Save(rctx, &channel, 100) require.NoError(t, err) post := model.Post{} @@ -303,7 +303,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("Save replies", func(t *testing.T) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -311,7 +311,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) { }, -1) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName2", Name: "channel" + model.NewId(), @@ -319,7 +319,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) { }, -1) require.NoError(t, err) - channel3, err := ss.Channel().Save(&model.Channel{ + channel3, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName3", Name: "channel" + model.NewId(), @@ -327,7 +327,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) { }, -1) require.NoError(t, err) - channel4, err := ss.Channel().Save(&model.Channel{ + channel4, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName4", Name: "channel" + model.NewId(), @@ -385,7 +385,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("Update reply should update the UpdateAt of the root post", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName", Name: "channel" + model.NewId(), @@ -440,7 +440,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) { channel.DisplayName = NewTestId() channel.Type = model.ChannelTypeOpen - _, err := ss.Channel().Save(&channel, 100) + _, err := ss.Channel().Save(rctx, &channel, 100) require.NoError(t, err) post1 := model.Post{} @@ -470,7 +470,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("Thread participants", func(t *testing.T) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -486,7 +486,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) { root, err := ss.Post().Save(rctx, &o1) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName2", Name: "channel" + model.NewId(), @@ -494,7 +494,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) { }, -1) require.NoError(t, err) - channel3, err := ss.Channel().Save(&model.Channel{ + channel3, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName3", Name: "channel" + model.NewId(), @@ -502,7 +502,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) { }, -1) require.NoError(t, err) - channel4, err := ss.Channel().Save(&model.Channel{ + channel4, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName4", Name: "channel" + model.NewId(), @@ -510,7 +510,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) { }, -1) require.NoError(t, err) - channel5, err := ss.Channel().Save(&model.Channel{ + channel5, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName5", Name: "channel" + model.NewId(), @@ -581,7 +581,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) { func testPostStoreSaveChannelMsgCounts(t *testing.T, rctx request.CTX, ss store.Store) { c1 := &model.Channel{Name: model.NewId(), DisplayName: "posttestchannel", Type: model.ChannelTypeOpen, TeamId: model.NewId()} - _, err := ss.Channel().Save(c1, 1000000) + _, err := ss.Channel().Save(rctx, c1, 1000000) require.NoError(t, err) o1 := model.Post{} @@ -627,7 +627,7 @@ func testPostStoreSaveChannelMsgCounts(t *testing.T, rctx request.CTX, ss store. func testPostStoreGet(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -662,7 +662,7 @@ func testPostStoreGet(t *testing.T, rctx request.CTX, ss store.Store) { func testPostStoreGetForThread(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("Post thread is followed", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -692,7 +692,7 @@ func testPostStoreGetForThread(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("Post thread is explicitly not followed", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -722,7 +722,7 @@ func testPostStoreGetForThread(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("Post threadmembership does not exist", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -747,7 +747,7 @@ func testPostStoreGetForThread(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("Pagination", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -899,7 +899,7 @@ func testPostStoreGetForThread(t *testing.T, rctx request.CTX, ss store.Store) { func testPostStoreGetSingle(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -967,7 +967,7 @@ func testPostStoreGetSingle(t *testing.T, rctx request.CTX, ss store.Store) { func testPostStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1046,7 +1046,7 @@ func testPostStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) { require.Equal(t, ro3a.Hashtags, o3a.Hashtags, "Failed to update/get") } - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1082,7 +1082,7 @@ func testPostStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) { func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("single post, no replies", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1131,7 +1131,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("thread with one reply", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1173,7 +1173,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("thread with multiple replies", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1207,7 +1207,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1244,7 +1244,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("thread with multiple replies, update thread last reply at", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1321,7 +1321,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("thread with file attachments", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1404,7 +1404,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) { func testPostStorePermDelete1Level(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1451,7 +1451,7 @@ func testPostStorePermDelete1Level(t *testing.T, rctx request.CTX, ss store.Stor r3, err = ss.Reaction().Save(r3) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName2", Name: "channel" + model.NewId(), @@ -1473,7 +1473,7 @@ func testPostStorePermDelete1Level(t *testing.T, rctx request.CTX, ss store.Stor _, err = ss.Reaction().Save(r4) require.NoError(t, err) - channel3, err := ss.Channel().Save(&model.Channel{ + channel3, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName3", Name: "channel" + model.NewId(), @@ -1575,7 +1575,7 @@ func testPostStorePermDelete1Level(t *testing.T, rctx request.CTX, ss store.Stor func testPostStorePermDelete1Level2(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1598,7 +1598,7 @@ func testPostStorePermDelete1Level2(t *testing.T, rctx request.CTX, ss store.Sto o2, err = ss.Post().Save(rctx, o2) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName2", Name: "channel" + model.NewId(), @@ -1628,7 +1628,7 @@ func testPostStorePermDelete1Level2(t *testing.T, rctx request.CTX, ss store.Sto func testPostStoreGetWithChildren(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1683,7 +1683,7 @@ func testPostStoreGetWithChildren(t *testing.T, rctx request.CTX, ss store.Store func testPostStoreGetPostsWithDetails(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1787,7 +1787,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, rctx request.CTX, ss store.S func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("without threads", func(t *testing.T) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1891,7 +1891,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S }) t.Run("with threads", func(t *testing.T) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -1998,7 +1998,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S }) t.Run("with threads (skipFetchThreads)", func(t *testing.T) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -2113,7 +2113,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S }) t.Run("with threads (collapsedThreads)", func(t *testing.T) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -2217,7 +2217,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S func testPostStoreGetPostsSince(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("should return posts created after the given time", func(t *testing.T) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -2299,7 +2299,7 @@ func testPostStoreGetPostsSince(t *testing.T, rctx request.CTX, ss store.Store) t.Run("should return empty list when nothing has changed", func(t *testing.T) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -2329,7 +2329,7 @@ func testPostStoreGetPostsSince(t *testing.T, rctx request.CTX, ss store.Store) ss.Post().ClearCaches() teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -2366,7 +2366,7 @@ func testPostStoreGetPostsSince(t *testing.T, rctx request.CTX, ss store.Store) func testPostStoreGetPosts(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -2554,7 +2554,7 @@ func testPostStoreGetPosts(t *testing.T, rctx request.CTX, ss store.Store) { func testPostStoreGetPostBeforeAfter(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -2600,7 +2600,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, rctx request.CTX, ss store.St require.NoError(t, err) time.Sleep(2 * time.Millisecond) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName2", Name: "channel" + model.NewId(), @@ -2683,7 +2683,7 @@ func testUserCountsWithPostsByDay(t *testing.T, rctx request.CTX, ss store.Store c1.DisplayName = "Channel2" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - c1, nErr := ss.Channel().Save(c1, -1) + c1, nErr := ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) o1 := &model.Post{} @@ -2742,7 +2742,7 @@ func testPostCountsByDay(t *testing.T, rctx request.CTX, ss store.Store) { c1.DisplayName = "Channel2" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - c1, nErr := ss.Channel().Save(c1, -1) + c1, nErr := ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) o1 := &model.Post{} @@ -2859,7 +2859,7 @@ func testPostCounts(t *testing.T, rctx request.CTX, ss store.Store) { c1.DisplayName = "Channel2" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - c1, nErr := ss.Channel().Save(c1, -1) + c1, nErr := ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) // system post @@ -3009,7 +3009,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, rctx request.CTX, ss stor c1.DisplayName = "Channel1" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - c1, err := ss.Channel().Save(c1, -1) + c1, err := ss.Channel().Save(rctx, c1, -1) require.NoError(t, err) o1 := &model.Post{} @@ -3045,7 +3045,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, rctx request.CTX, ss stor require.NoError(t, err) teamId := model.NewId() - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName2", Name: "channel" + model.NewId(), @@ -3088,7 +3088,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, rctx request.CTX, ss stor time.Sleep(2 * time.Millisecond) // Post on channel where user is not a member - channel3, err := ss.Channel().Save(&model.Channel{ + channel3, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName3", Name: "channel" + model.NewId(), @@ -3228,7 +3228,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, rctx request.CTX, ss store.Store c1.DisplayName = "Channel1" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - c1, err := ss.Channel().Save(c1, -1) + c1, err := ss.Channel().Save(rctx, c1, -1) require.NoError(t, err) o1 := &model.Post{} @@ -3258,7 +3258,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, rctx request.CTX, ss store.Store // Post on channel where user is not a member teamId := model.NewId() - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName2", Name: "channel" + model.NewId(), @@ -3368,7 +3368,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, rctx request.CTX, ss s c1.DisplayName = "Channel1" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - c1, err := ss.Channel().Save(c1, -1) + c1, err := ss.Channel().Save(rctx, c1, -1) require.NoError(t, err) c2 := &model.Channel{} @@ -3376,7 +3376,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, rctx request.CTX, ss s c2.DisplayName = "Channel2" c2.Name = NewTestId() c2.Type = model.ChannelTypeOpen - c2, err = ss.Channel().Save(c2, -1) + c2, err = ss.Channel().Save(rctx, c2, -1) require.NoError(t, err) o1 := &model.Post{} @@ -3397,7 +3397,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, rctx request.CTX, ss s // deleted post teamId := model.NewId() - channel3, err := ss.Channel().Save(&model.Channel{ + channel3, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName3", Name: "channel" + model.NewId(), @@ -3423,7 +3423,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, rctx request.CTX, ss s time.Sleep(2 * time.Millisecond) // Post on channel where user is not a member - channel4, err := ss.Channel().Save(&model.Channel{ + channel4, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName4", Name: "channel" + model.NewId(), @@ -3514,7 +3514,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, rctx request.CTX, ss s func testPostStoreGetPostsCreatedAt(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -3549,7 +3549,7 @@ func testPostStoreGetPostsCreatedAt(t *testing.T, rctx request.CTX, ss store.Sto _, err = ss.Post().Save(rctx, o2) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName2", Name: "channel" + model.NewId(), @@ -3571,7 +3571,7 @@ func testPostStoreGetPostsCreatedAt(t *testing.T, rctx request.CTX, ss store.Sto func testPostStoreOverwriteMultiple(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -3601,7 +3601,7 @@ func testPostStoreOverwriteMultiple(t *testing.T, rctx request.CTX, ss store.Sto o3, err = ss.Post().Save(rctx, o3) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName2", Name: "channel" + model.NewId(), @@ -3617,7 +3617,7 @@ func testPostStoreOverwriteMultiple(t *testing.T, rctx request.CTX, ss store.Sto }) require.NoError(t, err) - channel3, err := ss.Channel().Save(&model.Channel{ + channel3, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName3", Name: "channel" + model.NewId(), @@ -3721,7 +3721,7 @@ func testPostStoreOverwriteMultiple(t *testing.T, rctx request.CTX, ss store.Sto func testPostStoreOverwrite(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -3751,7 +3751,7 @@ func testPostStoreOverwrite(t *testing.T, rctx request.CTX, ss store.Store) { o3, err = ss.Post().Save(rctx, o3) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName2", Name: "channel" + model.NewId(), @@ -3838,7 +3838,7 @@ func testPostStoreOverwrite(t *testing.T, rctx request.CTX, ss store.Store) { func testPostStoreGetPostsByIds(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -3903,14 +3903,14 @@ func testPostStoreGetPostsBatchForIndexing(t *testing.T, rctx request.CTX, ss st c1.DisplayName = "Channel1" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - c1, _ = ss.Channel().Save(c1, -1) + c1, _ = ss.Channel().Save(rctx, c1, -1) c2 := &model.Channel{} c2.TeamId = model.NewId() c2.DisplayName = "Channel2" c2.Name = NewTestId() c2.Type = model.ChannelTypeOpen - c2, _ = ss.Channel().Save(c2, -1) + c2, _ = ss.Channel().Save(rctx, c2, -1) o1 := &model.Post{} o1.ChannelId = c1.Id @@ -3965,7 +3965,7 @@ func testPostStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store. Type: model.TeamOpen, }) require.NoError(t, err) - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team.Id, DisplayName: "DisplayName", Name: "channel" + model.NewId(), @@ -4138,14 +4138,14 @@ func testPostStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store. c1.DisplayName = "Channel1" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - c1, _ = ss.Channel().Save(c1, -1) + c1, _ = ss.Channel().Save(rctx, c1, -1) c2 := &model.Channel{} c2.TeamId = model.NewId() c2.DisplayName = "Channel2" c2.Name = NewTestId() c2.Type = model.ChannelTypeOpen - c2, _ = ss.Channel().Save(c2, -1) + c2, _ = ss.Channel().Save(rctx, c2, -1) channelPolicy, err2 := ss.RetentionPolicy().Save(&model.RetentionPolicyWithTeamAndChannelIDs{ RetentionPolicy: model.RetentionPolicy{ @@ -4211,7 +4211,7 @@ func testPostStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store. func testPostStoreGetOldest(t *testing.T, rctx request.CTX, ss store.Store) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -4268,7 +4268,7 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, rctx request.CTX, ss st c1.DisplayName = "Channel1" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&c1, -1) + _, nErr := ss.Channel().Save(rctx, &c1, -1) require.NoError(t, nErr) c2 := model.Channel{} @@ -4276,7 +4276,7 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, rctx request.CTX, ss st c2.DisplayName = "Channel2" c2.Name = NewTestId() c2.Type = model.ChannelTypeOpen - _, nErr = ss.Channel().Save(&c2, -1) + _, nErr = ss.Channel().Save(rctx, &c2, -1) require.NoError(t, nErr) u1 := model.User{} @@ -4360,7 +4360,7 @@ func testPostStoreGetRepliesForExport(t *testing.T, rctx request.CTX, ss store.S c1.DisplayName = "Channel1" c1.Name = NewTestId() c1.Type = model.ChannelTypeOpen - _, nErr := ss.Channel().Save(&c1, -1) + _, nErr := ss.Channel().Save(rctx, &c1, -1) require.NoError(t, nErr) u1 := model.User{} @@ -4608,7 +4608,7 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, rctx r func testHasAutoResponsePostByUserSince(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("should return posts created after the given time", func(t *testing.T) { teamId := model.NewId() - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -4964,7 +4964,7 @@ func testGetPostReminderMetadata(t *testing.T, rctx request.CTX, ss store.Store, Name: NewTestId(), Type: model.ChannelTypeOpen, } - ch, err = ss.Channel().Save(ch, -1) + ch, err = ss.Channel().Save(rctx, ch, -1) require.NoError(t, err) ch2 := &model.Channel{ @@ -4973,7 +4973,7 @@ func testGetPostReminderMetadata(t *testing.T, rctx request.CTX, ss store.Store, Name: NewTestId(), Type: model.ChannelTypeGroup, } - ch2, err = ss.Channel().Save(ch2, -1) + ch2, err = ss.Channel().Save(rctx, ch2, -1) require.NoError(t, err) u1 := &model.User{ diff --git a/server/channels/store/storetest/preference_store.go b/server/channels/store/storetest/preference_store.go index abff0956105..82946b97c9d 100644 --- a/server/channels/store/storetest/preference_store.go +++ b/server/channels/store/storetest/preference_store.go @@ -339,7 +339,7 @@ func testPreferenceDeleteOrphanedRows(t *testing.T, rctx request.CTX, ss store.S Type: model.TeamOpen, }) require.NoError(t, err) - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team.Id, DisplayName: "DisplayName", Name: "channel" + model.NewId(), diff --git a/server/channels/store/storetest/reaction_store.go b/server/channels/store/storetest/reaction_store.go index 6fa1d7b770b..fed2a04fcaf 100644 --- a/server/channels/store/storetest/reaction_store.go +++ b/server/channels/store/storetest/reaction_store.go @@ -658,7 +658,7 @@ func testReactionStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss st Type: model.TeamOpen, }) require.NoError(t, err) - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team.Id, DisplayName: "DisplayName", Name: "channel" + model.NewId(), diff --git a/server/channels/store/storetest/retention_policy_store.go b/server/channels/store/storetest/retention_policy_store.go index 987da322228..8630d90a46a 100644 --- a/server/channels/store/storetest/retention_policy_store.go +++ b/server/channels/store/storetest/retention_policy_store.go @@ -106,7 +106,7 @@ func copyRetentionPolicyWithTeamAndChannelIds(policy *model.RetentionPolicyWithT return cpy } -func createChannelsForRetentionPolicy(t *testing.T, ss store.Store, teamId string, numChannels int) (channelIDs []string) { +func createChannelsForRetentionPolicy(rctx request.CTX, t *testing.T, ss store.Store, teamId string, numChannels int) (channelIDs []string) { channelIDs = make([]string, numChannels) for i := range channelIDs { name := "channel" + model.NewId() @@ -116,7 +116,7 @@ func createChannelsForRetentionPolicy(t *testing.T, ss store.Store, teamId strin Name: name, Type: model.ChannelTypeOpen, } - channel, err := ss.Channel().Save(channel, -1) + channel, err := ss.Channel().Save(rctx, channel, -1) require.NoError(t, err) channelIDs[i] = channel.Id } @@ -141,8 +141,8 @@ func createTeamsForRetentionPolicy(t *testing.T, ss store.Store, numTeams int) ( func createTeamsAndChannelsForRetentionPolicy(t *testing.T, rctx request.CTX, ss store.Store) (teamIDs, channelIDs []string) { teamIDs = createTeamsForRetentionPolicy(t, ss, 2) - channels1 := createChannelsForRetentionPolicy(t, ss, teamIDs[0], 1) - channels2 := createChannelsForRetentionPolicy(t, ss, teamIDs[1], 2) + channels1 := createChannelsForRetentionPolicy(rctx, t, ss, teamIDs[0], 1) + channels2 := createChannelsForRetentionPolicy(rctx, t, ss, teamIDs[1], 2) channelIDs = append(channels1, channels2...) return } @@ -454,7 +454,7 @@ func testRetentionPolicyStoreAddChannels(t *testing.T, rctx request.CTX, ss stor checkRetentionPolicyLikeThisExists(t, ss, policy) }) t.Run("add new channels", func(t *testing.T) { - channelIDs := createChannelsForRetentionPolicy(t, ss, teamIDs[0], 2) + channelIDs := createChannelsForRetentionPolicy(rctx, t, ss, teamIDs[0], 2) defer deleteTeamsAndChannels(rctx, ss, nil, channelIDs) err := ss.RetentionPolicy().AddChannels(policy.ID, channelIDs) require.NoError(t, err) @@ -469,7 +469,7 @@ func testRetentionPolicyStoreAddChannels(t *testing.T, rctx request.CTX, ss stor require.Error(t, err) }) t.Run("add channel to policy which does not exist", func(t *testing.T) { - channelIDs := createChannelsForRetentionPolicy(t, ss, teamIDs[0], 1) + channelIDs := createChannelsForRetentionPolicy(rctx, t, ss, teamIDs[0], 1) defer deleteTeamsAndChannels(rctx, ss, nil, channelIDs) err := ss.RetentionPolicy().AddChannels("no_such_policy", channelIDs) require.Error(t, err) @@ -665,7 +665,7 @@ func testRetentionPolicyStoreGetPoliciesForUser(t *testing.T, rctx request.CTX, func testRetentionPolicyStoreRemoveOrphanedRows(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore) { teamID := createTeamsForRetentionPolicy(t, ss, 1)[0] - channelID := createChannelsForRetentionPolicy(t, ss, teamID, 1)[0] + channelID := createChannelsForRetentionPolicy(rctx, t, ss, teamID, 1)[0] policy := saveRetentionPolicyWithTeamAndChannelIds(t, ss, "Policy 1", []string{teamID}, []string{channelID}) diff --git a/server/channels/store/storetest/role_store.go b/server/channels/store/storetest/role_store.go index 1f517dea26d..3202a7b4b32 100644 --- a/server/channels/store/storetest/role_store.go +++ b/server/channels/store/storetest/role_store.go @@ -436,7 +436,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, rctx request.CTX, Type: model.ChannelTypeOpen, SchemeId: &channelScheme1.Id, } - channel1, nErr := ss.Channel().Save(channel1, -1) + channel1, nErr := ss.Channel().Save(rctx, channel1, -1) require.NoError(t, nErr) defer ss.Channel().Delete(channel1.Id, 0) @@ -447,7 +447,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, rctx request.CTX, Type: model.ChannelTypeOpen, SchemeId: &channelScheme2.Id, } - channel2, nErr = ss.Channel().Save(channel2, -1) + channel2, nErr = ss.Channel().Save(rctx, channel2, -1) require.NoError(t, nErr) defer ss.Channel().Delete(channel2.Id, 0) @@ -559,7 +559,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t Type: model.ChannelTypeOpen, SchemeId: &channelScheme.Id, } - channel, nErr := ss.Channel().Save(channel, -1) + channel, nErr := ss.Channel().Save(rctx, channel, -1) require.NoError(t, nErr) defer ss.Channel().Delete(channel.Id, 0) diff --git a/server/channels/store/storetest/scheme_store.go b/server/channels/store/storetest/scheme_store.go index 045a0b47bdd..386fb86dcac 100644 --- a/server/channels/store/storetest/scheme_store.go +++ b/server/channels/store/storetest/scheme_store.go @@ -480,7 +480,7 @@ func testSchemeStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) { Type: model.ChannelTypeOpen, SchemeId: &d5.Id, } - c5, nErr := ss.Channel().Save(c5, -1) + c5, nErr := ss.Channel().Save(rctx, c5, -1) assert.NoError(t, nErr) _, err = ss.Scheme().Delete(d5.Id) diff --git a/server/channels/store/storetest/shared_channel_store.go b/server/channels/store/storetest/shared_channel_store.go index 9f1607fc560..9cf0073a600 100644 --- a/server/channels/store/storetest/shared_channel_store.go +++ b/server/channels/store/storetest/shared_channel_store.go @@ -872,7 +872,7 @@ func createSharedTestChannel(ss store.Store, rctx request.CTX, name string, shar CreatorId: model.NewId(), Shared: model.NewBool(shared), } - channel, err := ss.Channel().Save(channel, 10000) + channel, err := ss.Channel().Save(rctx, channel, 10000) if err != nil { return nil, err } diff --git a/server/channels/store/storetest/team_store.go b/server/channels/store/storetest/team_store.go index 8b1c1ad8381..a23357d6152 100644 --- a/server/channels/store/storetest/team_store.go +++ b/server/channels/store/storetest/team_store.go @@ -3122,11 +3122,11 @@ func testGetChannelUnreadsForAllTeams(t *testing.T, rctx request.CTX, ss store.S require.NoError(t, nErr) c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100} - _, nErr = ss.Channel().Save(c1, -1) + _, nErr = ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) c2 := &model.Channel{TeamId: m2.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100} - _, nErr = ss.Channel().Save(c2, -1) + _, nErr = ss.Channel().Save(rctx, c2, -1) require.NoError(t, nErr) cm1 := &model.ChannelMember{ChannelId: c1.Id, UserId: m1.UserId, NotifyProps: model.GetDefaultChannelNotifyProps(), MsgCount: 90} @@ -3176,11 +3176,11 @@ func testGetChannelUnreadsForTeam(t *testing.T, rctx request.CTX, ss store.Store require.NoError(t, nErr) c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100} - _, nErr = ss.Channel().Save(c1, -1) + _, nErr = ss.Channel().Save(rctx, c1, -1) require.NoError(t, nErr) c2 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100} - _, nErr = ss.Channel().Save(c2, -1) + _, nErr = ss.Channel().Save(rctx, c2, -1) require.NoError(t, nErr) cm1 := &model.ChannelMember{ChannelId: c1.Id, UserId: m1.UserId, NotifyProps: model.GetDefaultChannelNotifyProps(), MsgCount: 90} diff --git a/server/channels/store/storetest/thread_store.go b/server/channels/store/storetest/thread_store.go index c527921e523..4d576f65071 100644 --- a/server/channels/store/storetest/thread_store.go +++ b/server/channels/store/storetest/thread_store.go @@ -42,7 +42,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) { u, err := ss.User().Save(rctx, &u1) require.NoError(t, err) - c, err2 := ss.Channel().Save(&model.Channel{ + c, err2 := ss.Channel().Save(rctx, &model.Channel{ DisplayName: model.NewId(), Type: model.ChannelTypeOpen, Name: model.NewId(), @@ -118,7 +118,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) { require.ElementsMatch(t, model.StringArray{newPosts[0].UserId, newPosts[1].UserId}, thread.Participants) teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName1", Name: "channel" + model.NewId(), @@ -162,7 +162,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("Update reply should update the UpdateAt of the thread", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName", Name: "channel" + model.NewId(), @@ -218,7 +218,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("Deleting reply should update the thread", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName", Name: "channel" + model.NewId(), @@ -279,7 +279,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("Deleting root post should delete the thread", func(t *testing.T) { teamId := model.NewId() - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "DisplayName", Name: "channel" + model.NewId(), @@ -499,7 +499,7 @@ func testThreadStorePermanentDeleteBatchForRetentionPolicies(t *testing.T, rctx Type: model.TeamOpen, }) require.NoError(t, err) - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team.Id, DisplayName: "DisplayName", Name: "channel" + model.NewId(), @@ -588,7 +588,7 @@ func testThreadStorePermanentDeleteBatchThreadMembershipsForRetentionPolicies(t Type: model.TeamOpen, }) require.NoError(t, err) - channel, err := ss.Channel().Save(&model.Channel{ + channel, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team.Id, DisplayName: "DisplayName", Name: "channel" + model.NewId(), @@ -683,7 +683,7 @@ func testGetTeamsUnreadForUser(t *testing.T, rctx request.CTX, ss store.Store) { Type: model.TeamOpen, }) require.NoError(t, err) - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team1.Id, DisplayName: "DisplayName", Name: "channel" + model.NewId(), @@ -725,7 +725,7 @@ func testGetTeamsUnreadForUser(t *testing.T, rctx request.CTX, ss store.Store) { Type: model.TeamOpen, }) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team2.Id, DisplayName: "DisplayName", Name: "channel" + model.NewId(), @@ -835,7 +835,7 @@ func testVarious(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) - team1channel1, err := ss.Channel().Save(&model.Channel{ + team1channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team1.Id, DisplayName: "Channel1", Name: "channel" + model.NewId(), @@ -843,7 +843,7 @@ func testVarious(t *testing.T, rctx request.CTX, ss store.Store) { }, -1) require.NoError(t, err) - team2channel1, err := ss.Channel().Save(&model.Channel{ + team2channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team2.Id, DisplayName: "Channel2", Name: "channel" + model.NewId(), @@ -854,7 +854,7 @@ func testVarious(t *testing.T, rctx request.CTX, ss store.Store) { dm1, err := ss.Channel().CreateDirectChannel(rctx, &model.User{Id: user1ID}, &model.User{Id: user2ID}) require.NoError(t, err) - gm1, err := ss.Channel().Save(&model.Channel{ + gm1, err := ss.Channel().Save(rctx, &model.Channel{ DisplayName: "GM", Name: "gm" + model.NewId(), Type: model.ChannelTypeGroup, @@ -1216,7 +1216,7 @@ func testMarkAllAsReadByChannels(t *testing.T, rctx request.CTX, ss store.Store) }) require.NoError(t, err) - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team1.Id, DisplayName: "Channel1", Name: "channel1" + model.NewId(), @@ -1224,7 +1224,7 @@ func testMarkAllAsReadByChannels(t *testing.T, rctx request.CTX, ss store.Store) }, -1) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team1.Id, DisplayName: "Channel2", Name: "channel2" + model.NewId(), @@ -1382,7 +1382,7 @@ func testMarkAllAsReadByTeam(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) - team1channel1, err := ss.Channel().Save(&model.Channel{ + team1channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team1.Id, DisplayName: "Team1: Channel1", Name: "team1channel1" + model.NewId(), @@ -1390,7 +1390,7 @@ func testMarkAllAsReadByTeam(t *testing.T, rctx request.CTX, ss store.Store) { }, -1) require.NoError(t, err) - team1channel2, err := ss.Channel().Save(&model.Channel{ + team1channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team1.Id, DisplayName: "Team1: Channel2", Name: "team1channel2" + model.NewId(), @@ -1406,7 +1406,7 @@ func testMarkAllAsReadByTeam(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) - team2channel1, err := ss.Channel().Save(&model.Channel{ + team2channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team2.Id, DisplayName: "Team2: Channel1", Name: "team2channel1" + model.NewId(), @@ -1414,7 +1414,7 @@ func testMarkAllAsReadByTeam(t *testing.T, rctx request.CTX, ss store.Store) { }, -1) require.NoError(t, err) - team2channel2, err := ss.Channel().Save(&model.Channel{ + team2channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team2.Id, DisplayName: "Team2: Channel2", Name: "team2channel2" + model.NewId(), @@ -1482,7 +1482,7 @@ func testMarkAllAsReadByTeam(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) - gm1, err := ss.Channel().Save(&model.Channel{ + gm1, err := ss.Channel().Save(rctx, &model.Channel{ DisplayName: "GM1", Name: "gm1" + model.NewId(), Type: model.ChannelTypeGroup, @@ -1504,7 +1504,7 @@ func testMarkAllAsReadByTeam(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) - gm2, err := ss.Channel().Save(&model.Channel{ + gm2, err := ss.Channel().Save(rctx, &model.Channel{ DisplayName: "GM1", Name: "gm1" + model.NewId(), Type: model.ChannelTypeGroup, @@ -1604,14 +1604,14 @@ func testDeleteMembershipsForChannel(t *testing.T, rctx request.CTX, ss store.St }) require.NoError(t, err) - channel1, err := ss.Channel().Save(&model.Channel{ + channel1, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team.Id, DisplayName: "DisplayName", Name: "channel1" + model.NewId(), Type: model.ChannelTypeOpen, }, -1) require.NoError(t, err) - channel2, err := ss.Channel().Save(&model.Channel{ + channel2, err := ss.Channel().Save(rctx, &model.Channel{ TeamId: team.Id, DisplayName: "DisplayName2", Name: "channel2" + model.NewId(), diff --git a/server/channels/store/storetest/user_store.go b/server/channels/store/storetest/user_store.go index 846c2d1ee85..9d58cfbb8ec 100644 --- a/server/channels/store/storetest/user_store.go +++ b/server/channels/store/storetest/user_store.go @@ -898,7 +898,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, rctx request.CTX, ss store. Name: "profiles-" + model.NewId(), Type: model.ChannelTypeOpen, } - c1, nErr := ss.Channel().Save(ch1, -1) + c1, nErr := ss.Channel().Save(rctx, ch1, -1) require.NoError(t, nErr) ch2 := &model.Channel{ @@ -907,7 +907,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, rctx request.CTX, ss store. Name: "profiles-" + model.NewId(), Type: model.ChannelTypePrivate, } - c2, nErr := ss.Channel().Save(ch2, -1) + c2, nErr := ss.Channel().Save(rctx, ch2, -1) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{ @@ -1077,7 +1077,7 @@ func testUserStoreGetProfilesInChannelByAdmin(t *testing.T, rctx request.CTX, ss Name: "profiles-" + model.NewId(), Type: model.ChannelTypeOpen, } - c1, nErr := ss.Channel().Save(ch1, -1) + c1, nErr := ss.Channel().Save(rctx, ch1, -1) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{ @@ -1172,7 +1172,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, rctx request.CTX, s Name: "profiles-" + model.NewId(), Type: model.ChannelTypeOpen, } - c1, nErr := ss.Channel().Save(ch1, -1) + c1, nErr := ss.Channel().Save(rctx, ch1, -1) require.NoError(t, nErr) ch2 := &model.Channel{ @@ -1181,7 +1181,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, rctx request.CTX, s Name: "profiles-" + model.NewId(), Type: model.ChannelTypePrivate, } - c2, nErr := ss.Channel().Save(ch2, -1) + c2, nErr := ss.Channel().Save(rctx, ch2, -1) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{ @@ -1389,7 +1389,7 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, rctx request.CTX, ss sto Name: "profiles-" + model.NewId(), Type: model.ChannelTypeOpen, } - c1, nErr := ss.Channel().Save(ch1, -1) + c1, nErr := ss.Channel().Save(rctx, ch1, -1) require.NoError(t, nErr) ch2 := &model.Channel{ @@ -1398,7 +1398,7 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, rctx request.CTX, ss sto Name: "profiles-" + model.NewId(), Type: model.ChannelTypePrivate, } - c2, nErr := ss.Channel().Save(ch2, -1) + c2, nErr := ss.Channel().Save(rctx, ch2, -1) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{ @@ -1515,7 +1515,7 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, rctx request.CTX, ss sto Name: "profiles-" + model.NewId(), Type: model.ChannelTypeOpen, } - c1, nErr := ss.Channel().Save(ch1, -1) + c1, nErr := ss.Channel().Save(rctx, ch1, -1) require.NoError(t, nErr) ch2 := &model.Channel{ @@ -1524,7 +1524,7 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, rctx request.CTX, ss sto Name: "profiles-" + model.NewId(), Type: model.ChannelTypePrivate, } - c2, nErr := ss.Channel().Save(ch2, -1) + c2, nErr := ss.Channel().Save(rctx, ch2, -1) require.NoError(t, nErr) t.Run("get team 1, channel 1, offset 0, limit 100", func(t *testing.T) { @@ -1749,7 +1749,7 @@ func testUserStoreGetProfileByGroupChannelIdsForUser(t *testing.T, rctx request. require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() - gc1, nErr := ss.Channel().Save(&model.Channel{ + gc1, nErr := ss.Channel().Save(rctx, &model.Channel{ DisplayName: "Profiles in private", Name: "profiles-" + model.NewId(), Type: model.ChannelTypeGroup, @@ -1765,7 +1765,7 @@ func testUserStoreGetProfileByGroupChannelIdsForUser(t *testing.T, rctx request. require.NoError(t, nErr) } - gc2, nErr := ss.Channel().Save(&model.Channel{ + gc2, nErr := ss.Channel().Save(rctx, &model.Channel{ DisplayName: "Profiles in private", Name: "profiles-" + model.NewId(), Type: model.ChannelTypeGroup, @@ -2432,7 +2432,7 @@ func testUserUnreadCount(t *testing.T, rctx request.CTX, ss store.Store) { _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) - _, nErr = ss.Channel().Save(&c1, -1) + _, nErr = ss.Channel().Save(rctx, &c1, -1) require.NoError(t, nErr, "couldn't save item") m1 := model.ChannelMember{} @@ -2937,7 +2937,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, rctx request.CTX, ss store.St Name: NewTestId(), Type: model.ChannelTypeOpen, } - c1, nErr := ss.Channel().Save(&ch1, -1) + c1, nErr := ss.Channel().Save(rctx, &ch1, -1) require.NoError(t, nErr) ch2 := model.Channel{ @@ -2946,7 +2946,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, rctx request.CTX, ss store.St Name: NewTestId(), Type: model.ChannelTypeOpen, } - c2, nErr := ss.Channel().Save(&ch2, -1) + c2, nErr := ss.Channel().Save(rctx, &ch2, -1) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{ @@ -3166,7 +3166,7 @@ func testUserStoreSearchInChannel(t *testing.T, rctx request.CTX, ss store.Store Name: NewTestId(), Type: model.ChannelTypeOpen, } - c1, nErr := ss.Channel().Save(&ch1, -1) + c1, nErr := ss.Channel().Save(rctx, &ch1, -1) require.NoError(t, nErr) ch2 := model.Channel{ @@ -3175,7 +3175,7 @@ func testUserStoreSearchInChannel(t *testing.T, rctx request.CTX, ss store.Store Name: NewTestId(), Type: model.ChannelTypeOpen, } - c2, nErr := ss.Channel().Save(&ch2, -1) + c2, nErr := ss.Channel().Save(rctx, &ch2, -1) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{ @@ -4883,14 +4883,14 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, rctx request.CTX, ss st Name: model.NewId(), Type: model.ChannelTypeOpen, } - cPub1, nErr := ss.Channel().Save(ch1, -1) + cPub1, nErr := ss.Channel().Save(rctx, ch1, -1) require.NoError(t, nErr) ch2 := &model.Channel{ Name: model.NewId(), Type: model.ChannelTypeOpen, } - cPub2, nErr := ss.Channel().Save(ch2, -1) + cPub2, nErr := ss.Channel().Save(rctx, ch2, -1) require.NoError(t, nErr) ch3 := &model.Channel{ @@ -4898,7 +4898,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, rctx request.CTX, ss st Type: model.ChannelTypePrivate, } - cPriv, nErr := ss.Channel().Save(ch3, -1) + cPriv, nErr := ss.Channel().Save(rctx, ch3, -1) require.NoError(t, nErr) u1, err := ss.User().Save(rctx, &model.User{ @@ -5133,7 +5133,7 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, rctx request.CTX, ss store.Sto func testUserStoreGetChannelGroupUsers(t *testing.T, rctx request.CTX, ss store.Store) { // create channel id := model.NewId() - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ DisplayName: "dn_" + id, Name: "n-" + id, Type: model.ChannelTypePrivate, @@ -5272,7 +5272,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, rctx request.CTX, ss store.St _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "Channel name", Name: "channel-" + model.NewId(), @@ -5318,7 +5318,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, rctx request.CTX, ss store.St _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "Channel name", Name: "channel-" + model.NewId(), @@ -5414,7 +5414,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, rctx request.CTX, ss store.St _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "Channel name", Name: "channel-" + model.NewId(), @@ -5459,7 +5459,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, rctx request.CTX, ss store.St _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "Channel name", Name: "channel-" + model.NewId(), @@ -5504,7 +5504,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, rctx request.CTX, ss store.St _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId1, UserId: user1.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId1, DisplayName: "Channel name", Name: "channel-" + model.NewId(), @@ -5587,7 +5587,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, rctx request.CTX, ss store.Sto _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "Channel name", Name: "channel-" + model.NewId(), @@ -5631,7 +5631,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, rctx request.CTX, ss store.Sto _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "Channel name", Name: "channel-" + model.NewId(), @@ -5721,7 +5721,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, rctx request.CTX, ss store.Sto _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "Channel name", Name: "channel-" + model.NewId(), @@ -5764,7 +5764,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, rctx request.CTX, ss store.Sto _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId, DisplayName: "Channel name", Name: "channel-" + model.NewId(), @@ -5807,7 +5807,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, rctx request.CTX, ss store.Sto _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId1, UserId: user1.Id, SchemeGuest: false, SchemeUser: true}, 999) require.NoError(t, nErr) - channel, nErr := ss.Channel().Save(&model.Channel{ + channel, nErr := ss.Channel().Save(rctx, &model.Channel{ TeamId: teamId1, DisplayName: "Channel name", Name: "channel-" + model.NewId(), @@ -6033,7 +6033,7 @@ func testGetKnownUsers(t *testing.T, rctx request.CTX, ss store.Store) { Name: "profiles-" + model.NewId(), Type: model.ChannelTypeOpen, } - c1, nErr := ss.Channel().Save(ch1, -1) + c1, nErr := ss.Channel().Save(rctx, ch1, -1) require.NoError(t, nErr) ch2 := &model.Channel{ @@ -6042,7 +6042,7 @@ func testGetKnownUsers(t *testing.T, rctx request.CTX, ss store.Store) { Name: "profiles-" + model.NewId(), Type: model.ChannelTypePrivate, } - c2, nErr := ss.Channel().Save(ch2, -1) + c2, nErr := ss.Channel().Save(rctx, ch2, -1) require.NoError(t, nErr) ch3 := &model.Channel{ @@ -6051,7 +6051,7 @@ func testGetKnownUsers(t *testing.T, rctx request.CTX, ss store.Store) { Name: "profiles-" + model.NewId(), Type: model.ChannelTypePrivate, } - c3, nErr := ss.Channel().Save(ch3, -1) + c3, nErr := ss.Channel().Save(rctx, ch3, -1) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{ diff --git a/server/channels/store/timerlayer/timerlayer.go b/server/channels/store/timerlayer/timerlayer.go index ff86879f0d7..a3ce0a7b986 100644 --- a/server/channels/store/timerlayer/timerlayer.go +++ b/server/channels/store/timerlayer/timerlayer.go @@ -2094,10 +2094,10 @@ func (s *TimerLayerChannelStore) Restore(channelID string, timestamp int64) erro return err } -func (s *TimerLayerChannelStore) Save(channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) { +func (s *TimerLayerChannelStore) Save(rctx request.CTX, channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) { start := time.Now() - result, err := s.ChannelStore.Save(channel, maxChannelsPerTeam) + result, err := s.ChannelStore.Save(rctx, channel, maxChannelsPerTeam) elapsed := float64(time.Since(start)) / float64(time.Second) if s.Root.Metrics != nil { diff --git a/server/platform/services/slackimport/slackimport.go b/server/platform/services/slackimport/slackimport.go index a15d38e7b6c..36786d25ba0 100644 --- a/server/platform/services/slackimport/slackimport.go +++ b/server/platform/services/slackimport/slackimport.go @@ -774,7 +774,7 @@ func (si *SlackImporter) oldImportChannel(rctx request.CTX, channel *model.Chann return sc } - sc, err := si.store.Channel().Save(channel, *si.config.TeamSettings.MaxChannelsPerTeam) + sc, err := si.store.Channel().Save(rctx, channel, *si.config.TeamSettings.MaxChannelsPerTeam) if err != nil { return nil }