From 19173ea6ff6e25b2cb029bcf3c5b15f260390100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 12 Aug 2020 21:02:41 +0200 Subject: [PATCH] Migrating Team.SaveMember/SaveMultipleMembers into errors (#14924) * Migrating Team.SaveMember/SaveMultipleMembers into errors * Removing copy/paste comments * Fixing another small thing * Fixing tests * Addressing PR review comments * Fixing some tests * Fixing golangci-lint * Fixing linter * Regenerating store layers * Fix lint error after merge * Other lint error fixed Co-authored-by: Mattermod --- app/import_functions.go | 19 +- app/slashcommands/auto_users.go | 20 +- app/team.go | 19 +- i18n/en.json | 40 +- store/opentracinglayer/opentracinglayer.go | 4 +- store/retrylayer/retrylayer.go | 180 +++++++- store/searchlayer/team_layer.go | 2 +- store/sqlstore/team_store.go | 22 +- store/store.go | 4 +- store/storetest/channel_store.go | 132 +++--- store/storetest/compliance_store.go | 86 ++-- store/storetest/group_store.go | 56 +-- store/storetest/mocks/TeamStore.go | 20 +- store/storetest/post_store.go | 30 +- store/storetest/team_store.go | 258 +++++------ store/storetest/user_store.go | 488 ++++++++++----------- store/timerlayer/timerlayer.go | 4 +- 17 files changed, 797 insertions(+), 587 deletions(-) diff --git a/app/import_functions.go b/app/import_functions.go index 8182018158..470c29bb6c 100644 --- a/app/import_functions.go +++ b/app/import_functions.go @@ -754,9 +754,22 @@ func (a *App) importUserTeams(user *model.User, data *[]UserTeamImportData) *mod newMembers := []*model.TeamMember{} if len(newTeamMembers) > 0 { - newMembers, err = a.Srv().Store.Team().SaveMultipleMembers(newTeamMembers, *a.Config().TeamSettings.MaxUsersPerTeam) - if err != nil { - return err + var nErr error + newMembers, nErr = a.Srv().Store.Team().SaveMultipleMembers(newTeamMembers, *a.Config().TeamSettings.MaxUsersPerTeam) + if nErr != nil { + var appErr *model.AppError + var conflictErr *store.ErrConflict + var limitExeededErr *store.ErrLimitExceeded + switch { + case errors.As(nErr, &appErr): // in case we haven't converted to plain error. + return appErr + case errors.As(nErr, &conflictErr): + return model.NewAppError("BulkImport", "app.import.import_user_teams.save_members.conflict.app_error", nil, nErr.Error(), http.StatusBadRequest) + case errors.As(nErr, &limitExeededErr): + return model.NewAppError("BulkImport", "app.import.import_user_teams.save_members.max_accounts.app_error", nil, nErr.Error(), http.StatusBadRequest) + default: // last fallback in case it doesn't map to an existing app error. + return model.NewAppError("BulkImport", "app.import.import_user_teams.save_members.error", nil, nErr.Error(), http.StatusInternalServerError) + } } } diff --git a/app/slashcommands/auto_users.go b/app/slashcommands/auto_users.go index f5045f3b7e..c7560b374c 100644 --- a/app/slashcommands/auto_users.go +++ b/app/slashcommands/auto_users.go @@ -4,8 +4,12 @@ package slashcommands import ( + "errors" + "net/http" + "github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/mattermost-server/v5/utils" ) @@ -54,8 +58,20 @@ func CreateBasicUser(a *app.App, client *model.Client4) *model.AppError { if err != nil { return err } - if _, err = a.Srv().Store.Team().SaveMember(&model.TeamMember{TeamId: basicteam.Id, UserId: ruser.Id}, *a.Config().TeamSettings.MaxUsersPerTeam); err != nil { - return err + if _, nErr := a.Srv().Store.Team().SaveMember(&model.TeamMember{TeamId: basicteam.Id, UserId: ruser.Id}, *a.Config().TeamSettings.MaxUsersPerTeam); nErr != nil { + var appErr *model.AppError + var conflictErr *store.ErrConflict + var limitExceededErr *store.ErrLimitExceeded + switch { + case errors.As(nErr, &appErr): // in case we haven't converted to plain error. + return appErr + case errors.As(nErr, &conflictErr): + return model.NewAppError("CreateBasicUser", "app.create_basic_user.save_member.conflict.app_error", nil, nErr.Error(), http.StatusBadRequest) + case errors.As(nErr, &limitExceededErr): + return model.NewAppError("CreateBasicUser", "app.create_basic_user.save_member.max_accounts.app_error", nil, nErr.Error(), http.StatusBadRequest) + default: // last fallback in case it doesn't map to an existing app error. + return model.NewAppError("CreateBasicUser", "app.create_basic_user.save_member.app_error", nil, nErr.Error(), http.StatusInternalServerError) + } } return nil diff --git a/app/team.go b/app/team.go index 2d7d5aeaec..0fedc200c2 100644 --- a/app/team.go +++ b/app/team.go @@ -591,10 +591,21 @@ func (a *App) joinUserToTeam(team *model.Team, user *model.User) (*model.TeamMem rtm, err := a.Srv().Store.Team().GetMember(team.Id, user.Id) if err != nil { // Membership appears to be missing. Lets try to add. - var tmr *model.TeamMember - tmr, err = a.Srv().Store.Team().SaveMember(tm, *a.Config().TeamSettings.MaxUsersPerTeam) - if err != nil { - return nil, false, err + tmr, nErr := a.Srv().Store.Team().SaveMember(tm, *a.Config().TeamSettings.MaxUsersPerTeam) + if nErr != nil { + var appErr *model.AppError + var conflictErr *store.ErrConflict + var limitExeededErr *store.ErrLimitExceeded + switch { + case errors.As(nErr, &appErr): // in case we haven't converted to plain error. + return nil, false, appErr + case errors.As(nErr, &conflictErr): + return nil, false, model.NewAppError("joinUserToTeam", "app.team.join_user_to_team.save_member.conflict.app_error", nil, nErr.Error(), http.StatusBadRequest) + case errors.As(nErr, &limitExeededErr): + return nil, false, model.NewAppError("joinUserToTeam", "app.team.join_user_to_team.save_member.max_accounts.app_error", nil, nErr.Error(), http.StatusBadRequest) + default: // last fallback in case it doesn't map to an existing app error. + return nil, false, model.NewAppError("joinUserToTeam", "app.team.join_user_to_team.save_member.app_error", nil, nErr.Error(), http.StatusInternalServerError) + } } return tmr, false, nil } diff --git a/i18n/en.json b/i18n/en.json index e5552a0776..e5a61bd9e8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3366,6 +3366,18 @@ "id": "app.compliance.save.saving.app_error", "translation": "We encountered an error saving the compliance report." }, + { + "id": "app.create_basic_user.save_member.app_error", + "translation": "Unable to create default team memberships" + }, + { + "id": "app.create_basic_user.save_member.conflict.app_error", + "translation": "Unable to create default team membership because they already exists" + }, + { + "id": "app.create_basic_user.save_member.max_accounts.app_error", + "translation": "Unable to create default team membership because no more members are allowed in that team" + }, { "id": "app.emoji.create.internal_error", "translation": "Unable to save emoji." @@ -3546,6 +3558,18 @@ "id": "app.import.import_user_channels.save_preferences.error", "translation": "Error importing user channel memberships. Failed to save preferences." }, + { + "id": "app.import.import_user_teams.save_members.conflict.app_error", + "translation": "Unable to import the new team membership because it already exists" + }, + { + "id": "app.import.import_user_teams.save_members.error", + "translation": "Unable to import team memberships" + }, + { + "id": "app.import.import_user_teams.save_members.max_accounts.app_error", + "translation": "Unable to import team membership because no more members are allowed in that team" + }, { "id": "app.import.import_user_teams.save_preferences.error", "translation": "Unable to save the team theme preferences" @@ -4458,6 +4482,18 @@ "id": "app.team.join_user_to_team.max_accounts.app_error", "translation": "This team has reached the maximum number of allowed accounts. Contact your System Administrator to set a higher limit." }, + { + "id": "app.team.join_user_to_team.save_member.app_error", + "translation": "Unable to create the new team membership" + }, + { + "id": "app.team.join_user_to_team.save_member.conflict.app_error", + "translation": "Unable to create the new team membership because it already exists" + }, + { + "id": "app.team.join_user_to_team.save_member.max_accounts.app_error", + "translation": "Unable to create the new team membership because the team has reached the limit of members" + }, { "id": "app.team.permanentdeleteteam.internal_error", "translation": "Unable to delete team." @@ -7706,10 +7742,6 @@ "id": "store.sql_user.save.existing.app_error", "translation": "Must call update for existing user." }, - { - "id": "store.sql_user.save.max_accounts.app_error", - "translation": "This team has reached the maximum number of allowed accounts. Contact your System Administrator to set a higher limit." - }, { "id": "store.sql_user.save.member_count.app_error", "translation": "Failed to get current team member count." diff --git a/store/opentracinglayer/opentracinglayer.go b/store/opentracinglayer/opentracinglayer.go index a269ef83d6..5c064b2baf 100644 --- a/store/opentracinglayer/opentracinglayer.go +++ b/store/opentracinglayer/opentracinglayer.go @@ -7186,7 +7186,7 @@ func (s *OpenTracingLayerTeamStore) Save(team *model.Team) (*model.Team, *model. return result, err } -func (s *OpenTracingLayerTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, *model.AppError) { +func (s *OpenTracingLayerTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.SaveMember") s.Root.Store.SetContext(newCtx) @@ -7204,7 +7204,7 @@ func (s *OpenTracingLayerTeamStore) SaveMember(member *model.TeamMember, maxUser return result, err } -func (s *OpenTracingLayerTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, *model.AppError) { +func (s *OpenTracingLayerTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.SaveMultipleMembers") s.Root.Store.SetContext(newCtx) diff --git a/store/retrylayer/retrylayer.go b/store/retrylayer/retrylayer.go index 2ac8f67b77..d493509db6 100644 --- a/store/retrylayer/retrylayer.go +++ b/store/retrylayer/retrylayer.go @@ -3102,15 +3102,43 @@ func (s *RetryLayerPostStore) ClearCaches() { } -func (s *RetryLayerPostStore) Delete(postId string, time int64, deleteByID string) *model.AppError { +func (s *RetryLayerPostStore) Delete(postId string, time int64, deleteByID string) error { - return s.PostStore.Delete(postId, time, deleteByID) + tries := 0 + for { + err := s.PostStore.Delete(postId, time, deleteByID) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } } -func (s *RetryLayerPostStore) Get(id string, skipFetchThreads bool) (*model.PostList, *model.AppError) { +func (s *RetryLayerPostStore) Get(id string, skipFetchThreads bool) (*model.PostList, error) { - return s.PostStore.Get(id, skipFetchThreads) + tries := 0 + for { + result, err := s.PostStore.Get(id, skipFetchThreads) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } } @@ -3234,9 +3262,23 @@ func (s *RetryLayerPostStore) GetRepliesForExport(parentId string) ([]*model.Rep } -func (s *RetryLayerPostStore) GetSingle(id string) (*model.Post, *model.AppError) { +func (s *RetryLayerPostStore) GetSingle(id string) (*model.Post, error) { - return s.PostStore.GetSingle(id) + tries := 0 + for { + result, err := s.PostStore.GetSingle(id) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } } @@ -3264,27 +3306,83 @@ func (s *RetryLayerPostStore) PermanentDeleteBatch(endTime int64, limit int64) ( } -func (s *RetryLayerPostStore) PermanentDeleteByChannel(channelId string) *model.AppError { +func (s *RetryLayerPostStore) PermanentDeleteByChannel(channelId string) error { - return s.PostStore.PermanentDeleteByChannel(channelId) + tries := 0 + for { + err := s.PostStore.PermanentDeleteByChannel(channelId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } } -func (s *RetryLayerPostStore) PermanentDeleteByUser(userId string) *model.AppError { +func (s *RetryLayerPostStore) PermanentDeleteByUser(userId string) error { - return s.PostStore.PermanentDeleteByUser(userId) + tries := 0 + for { + err := s.PostStore.PermanentDeleteByUser(userId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } } -func (s *RetryLayerPostStore) Save(post *model.Post) (*model.Post, *model.AppError) { +func (s *RetryLayerPostStore) Save(post *model.Post) (*model.Post, error) { - return s.PostStore.Save(post) + tries := 0 + for { + result, err := s.PostStore.Save(post) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } } -func (s *RetryLayerPostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, *model.AppError) { +func (s *RetryLayerPostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, error) { - return s.PostStore.SaveMultiple(posts) + tries := 0 + for { + result, resultVar1, err := s.PostStore.SaveMultiple(posts) + if err == nil { + return result, resultVar1, err + } + if !isRepeatableError(err) { + return result, resultVar1, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, resultVar1, err + } + } } @@ -3300,9 +3398,23 @@ func (s *RetryLayerPostStore) SearchPostsInTeamForUser(paramsList []*model.Searc } -func (s *RetryLayerPostStore) Update(newPost *model.Post, oldPost *model.Post) (*model.Post, *model.AppError) { +func (s *RetryLayerPostStore) Update(newPost *model.Post, oldPost *model.Post) (*model.Post, error) { - return s.PostStore.Update(newPost, oldPost) + tries := 0 + for { + result, err := s.PostStore.Update(newPost, oldPost) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } } @@ -4596,15 +4708,43 @@ func (s *RetryLayerTeamStore) Save(team *model.Team) (*model.Team, *model.AppErr } -func (s *RetryLayerTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, *model.AppError) { +func (s *RetryLayerTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { - return s.TeamStore.SaveMember(member, maxUsersPerTeam) + tries := 0 + for { + result, err := s.TeamStore.SaveMember(member, maxUsersPerTeam) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } } -func (s *RetryLayerTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, *model.AppError) { +func (s *RetryLayerTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, error) { - return s.TeamStore.SaveMultipleMembers(members, maxUsersPerTeam) + tries := 0 + for { + result, err := s.TeamStore.SaveMultipleMembers(members, maxUsersPerTeam) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } } diff --git a/store/searchlayer/team_layer.go b/store/searchlayer/team_layer.go index 0408b7b11a..45b5a148db 100644 --- a/store/searchlayer/team_layer.go +++ b/store/searchlayer/team_layer.go @@ -13,7 +13,7 @@ type SearchTeamStore struct { rootStore *SearchStore } -func (s SearchTeamStore) SaveMember(teamMember *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, *model.AppError) { +func (s SearchTeamStore) SaveMember(teamMember *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { member, err := s.TeamStore.SaveMember(teamMember, maxUsersPerTeam) if err == nil { s.rootStore.indexUserFromID(member.UserId) diff --git a/store/sqlstore/team_store.go b/store/sqlstore/team_store.go index 2301960309..b710db3050 100644 --- a/store/sqlstore/team_store.go +++ b/store/sqlstore/team_store.go @@ -9,6 +9,8 @@ import ( "net/http" "strings" + "github.com/pkg/errors" + sq "github.com/Masterminds/squirrel" "github.com/mattermost/gorp" @@ -780,7 +782,7 @@ func (s SqlTeamStore) getTeamMembersWithSchemeSelectQuery() sq.SelectBuilder { LeftJoin("Schemes TeamScheme ON Teams.SchemeId = TeamScheme.Id") } -func (s SqlTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, *model.AppError) { +func (s SqlTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, error) { newTeamMembers := map[string]int{} users := map[string]bool{} for _, member := range members { @@ -821,7 +823,7 @@ func (s SqlTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersP sqlRolesQuery, argsRoles, err := queryRoles.ToSql() if err != nil { - return nil, model.NewAppError("SqlUserStore.Save", "store.sql.build_query.app_error", nil, err.Error(), http.StatusInternalServerError) + return nil, errors.Wrap(err, "team_roles_tosql") } var defaultTeamsRoles []struct { Id string @@ -831,7 +833,7 @@ func (s SqlTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersP } _, err = s.GetMaster().Select(&defaultTeamsRoles, sqlRolesQuery, argsRoles...) if err != nil { - return nil, model.NewAppError("SqlUserStore.Save", "store.sql_user.save.member_count.app_error", nil, err.Error(), http.StatusInternalServerError) + return nil, errors.Wrap(err, "default_team_roles_select") } for _, defaultRoles := range defaultTeamsRoles { @@ -852,7 +854,7 @@ func (s SqlTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersP sqlCountQuery, argsCount, errCount := queryCount.ToSql() if errCount != nil { - return nil, model.NewAppError("SqlUserStore.Save", "store.sql.build_query.app_error", nil, errCount.Error(), http.StatusInternalServerError) + return nil, errors.Wrap(err, "member_count_tosql") } var counters []struct { @@ -862,7 +864,7 @@ func (s SqlTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersP _, err = s.GetMaster().Select(&counters, sqlCountQuery, argsCount...) if err != nil { - return nil, model.NewAppError("SqlUserStore.Save", "store.sql_user.save.member_count.app_error", nil, err.Error(), http.StatusInternalServerError) + return nil, errors.Wrap(err, "failed to count users in the teams of the memberships") } for teamId, newMembers := range newTeamMembers { @@ -873,7 +875,7 @@ func (s SqlTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersP } } if existingMembers+newMembers > maxUsersPerTeam { - return nil, model.NewAppError("SqlUserStore.Save", "store.sql_user.save.max_accounts.app_error", nil, "", http.StatusBadRequest) + return nil, store.NewErrLimitExceeded("TeamMember", existingMembers+newMembers, "team members limit exceeded") } } } @@ -885,14 +887,14 @@ func (s SqlTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersP sql, args, err := query.ToSql() if err != nil { - return nil, model.NewAppError("SqlTeamStore.SaveMember", "store.sql.build_query.app_error", nil, err.Error(), http.StatusInternalServerError) + return nil, errors.Wrap(err, "insert_members_to_sql") } if _, err = s.GetMaster().Exec(sql, args...); err != nil { if IsUniqueConstraintError(err, []string{"TeamId", "teammembers_pkey", "PRIMARY"}) { - return nil, model.NewAppError("SqlTeamStore.SaveMember", TEAM_MEMBER_EXISTS_ERROR, nil, err.Error(), http.StatusBadRequest) + return nil, store.NewErrConflict("TeamMember", err, "") } - return nil, model.NewAppError("SqlTeamStore.SaveMember", "store.sql_team.save_member.save.app_error", nil, err.Error(), http.StatusInternalServerError) + return nil, errors.Wrap(err, "unable_to_save_team_member") } newMembers := []*model.TeamMember{} @@ -914,7 +916,7 @@ func (s SqlTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersP return newMembers, nil } -func (s SqlTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, *model.AppError) { +func (s SqlTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { members, err := s.SaveMultipleMembers([]*model.TeamMember{member}, maxUsersPerTeam) if err != nil { return nil, err diff --git a/store/store.go b/store/store.go index ac89e80e02..5e254e2070 100644 --- a/store/store.go +++ b/store/store.go @@ -91,8 +91,8 @@ type TeamStore interface { AnalyticsTeamCount(includeDeleted bool) (int64, *model.AppError) AnalyticsPublicTeamCount() (int64, *model.AppError) AnalyticsPrivateTeamCount() (int64, *model.AppError) - SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, *model.AppError) - SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, *model.AppError) + SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, error) + SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) UpdateMember(member *model.TeamMember) (*model.TeamMember, *model.AppError) UpdateMultipleMembers(members []*model.TeamMember) ([]*model.TeamMember, *model.AppError) GetMember(teamId string, userId string) (*model.TeamMember, *model.AppError) diff --git a/store/storetest/channel_store.go b/store/storetest/channel_store.go index 49c32dc52a..392da2fef4 100644 --- a/store/storetest/channel_store.go +++ b/store/storetest/channel_store.go @@ -174,16 +174,16 @@ func testChannelStoreSaveDirectChannel(t *testing.T, ss store.Store, s SqlSuppli u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + require.Nil(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -195,7 +195,7 @@ func testChannelStoreSaveDirectChannel(t *testing.T, ss store.Store, s SqlSuppli m2.UserId = u2.Id m2.NotifyProps = model.GetDefaultChannelNotifyProps() - _, nErr := ss.Channel().SaveDirectChannel(&o1, &m1, &m2) + _, nErr = ss.Channel().SaveDirectChannel(&o1, &m1, &m2) require.Nil(t, nErr, "couldn't save direct channel", nErr) members, err := ss.Channel().GetMembers(o1.Id, 0, 100) @@ -248,16 +248,16 @@ func testChannelStoreCreateDirectChannel(t *testing.T, ss store.Store) { u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + require.Nil(t, nErr) c1, nErr := ss.Channel().CreateDirectChannel(u1, u2) require.Nil(t, nErr, "couldn't create direct channel", nErr) @@ -316,19 +316,19 @@ func testGetChannelUnread(t *testing.T, ss store.Store) { uid := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: uid} m2 := &model.TeamMember{TeamId: teamId2, UserId: uid} - _, err := ss.Team().SaveMember(m1, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(m2, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(m1, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(m2, -1) + require.Nil(t, nErr) notifyPropsModel := model.GetDefaultChannelNotifyProps() // Setup Channel 1 c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Downtown", Type: model.CHANNEL_OPEN, TotalMsgCount: 100} - _, nErr := ss.Channel().Save(c1, -1) + _, nErr = ss.Channel().Save(c1, -1) require.Nil(t, nErr) cm1 := &model.ChannelMember{ChannelId: c1.Id, UserId: m1.UserId, NotifyProps: notifyPropsModel, MsgCount: 90} - _, err = ss.Channel().SaveMember(cm1) + _, err := ss.Channel().SaveMember(cm1) require.Nil(t, err) // Setup Channel 2 @@ -382,16 +382,16 @@ func testChannelStoreGet(t *testing.T, ss store.Store, s SqlSupplier) { u1.Nickname = model.NewId() _, err = ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + require.Nil(t, nErr) o2 := model.Channel{} o2.TeamId = model.NewId() @@ -446,16 +446,16 @@ func testChannelStoreGetChannelsByIds(t *testing.T, ss store.Store) { u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + require.Nil(t, nErr) o2 := model.Channel{} o2.TeamId = model.NewId() @@ -823,16 +823,16 @@ func testChannelMemberStore(t *testing.T, ss store.Store) { u1.Nickname = model.NewId() _, err := ss.User().Save(&u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + require.Nil(t, nErr) o1 := model.ChannelMember{} o1.ChannelId = c1.Id @@ -3060,16 +3060,16 @@ func testChannelDeleteMemberStore(t *testing.T, ss store.Store) { u1.Nickname = model.NewId() _, err := ss.User().Save(&u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + require.Nil(t, nErr) o1 := model.ChannelMember{} o1.ChannelId = c1.Id @@ -4353,8 +4353,8 @@ func testGetMemberCount(t *testing.T, ss store.Store) { } _, err := ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) m1 := model.ChannelMember{ ChannelId: c1.Id, @@ -4374,8 +4374,8 @@ func testGetMemberCount(t *testing.T, ss store.Store) { } _, err = ss.User().Save(&u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) m2 := model.ChannelMember{ ChannelId: c1.Id, @@ -4396,8 +4396,8 @@ func testGetMemberCount(t *testing.T, ss store.Store) { } _, err = ss.User().Save(&u3) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) m3 := model.ChannelMember{ ChannelId: c2.Id, @@ -4418,8 +4418,8 @@ func testGetMemberCount(t *testing.T, ss store.Store) { } _, err = ss.User().Save(u4) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) + require.Nil(t, nErr) m4 := model.ChannelMember{ ChannelId: c1.Id, @@ -4462,8 +4462,8 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { } _, err = ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) m1 := model.ChannelMember{ ChannelId: c1.Id, @@ -4533,8 +4533,8 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { } _, err = ss.User().Save(u) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u.Id}, -1) + require.Nil(t, nErr) m := model.ChannelMember{ ChannelId: c1.Id, @@ -4584,8 +4584,8 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { } _, err = ss.User().Save(u) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u.Id}, -1) + require.Nil(t, nErr) m := model.ChannelMember{ ChannelId: c1.Id, @@ -4675,8 +4675,8 @@ func testGetGuestCount(t *testing.T, ss store.Store) { } _, err := ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) m1 := model.ChannelMember{ ChannelId: c1.Id, @@ -4700,8 +4700,8 @@ func testGetGuestCount(t *testing.T, ss store.Store) { } _, err := ss.User().Save(&u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) m2 := model.ChannelMember{ ChannelId: c1.Id, @@ -4725,8 +4725,8 @@ func testGetGuestCount(t *testing.T, ss store.Store) { } _, err := ss.User().Save(&u3) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) m3 := model.ChannelMember{ ChannelId: c2.Id, @@ -4750,8 +4750,8 @@ func testGetGuestCount(t *testing.T, ss store.Store) { } _, err := ss.User().Save(u4) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) + require.Nil(t, nErr) m4 := model.ChannelMember{ ChannelId: c1.Id, @@ -6509,16 +6509,16 @@ func testChannelStoreExportAllDirectChannels(t *testing.T, ss store.Store, s Sql u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + require.Nil(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -6572,16 +6572,16 @@ func testChannelStoreExportAllDirectChannelsExcludePrivateAndPublic(t *testing.T u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + require.Nil(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -6618,16 +6618,16 @@ func testChannelStoreExportAllDirectChannelsDeletedChannel(t *testing.T, ss stor u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + require.Nil(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -6642,7 +6642,7 @@ func testChannelStoreExportAllDirectChannelsDeletedChannel(t *testing.T, ss stor ss.Channel().SaveDirectChannel(&o1, &m1, &m2) o1.DeleteAt = 1 - nErr := ss.Channel().SetDeleteAt(o1.Id, 1, 1) + nErr = ss.Channel().SetDeleteAt(o1.Id, 1, 1) require.Nil(t, nErr, "channel should have been deleted") d1, err := ss.Channel().GetAllDirectChannelsForExportAfter(10000, strings.Repeat("0", 26)) diff --git a/store/storetest/compliance_store.go b/store/storetest/compliance_store.go index 2595977c1b..47f9a19b7b 100644 --- a/store/storetest/compliance_store.go +++ b/store/storetest/compliance_store.go @@ -111,23 +111,23 @@ func testComplianceExport(t *testing.T, ss store.Store) { u1.Username = model.NewId() u1, err = ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Username = model.NewId() u2, err = ss.User().Save(u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1) + require.Nil(t, nErr) c1 := &model.Channel{} c1.TeamId = t1.Id c1.DisplayName = "Channel2" c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN - c1, nErr := ss.Channel().Save(c1, -1) + c1, nErr = ss.Channel().Save(c1, -1) require.Nil(t, nErr) o1 := &model.Post{} @@ -220,23 +220,23 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) { u1.Username = model.NewId() u1, err = ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Username = model.NewId() u2, err = ss.User().Save(u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1) + require.Nil(t, nErr) c1 := &model.Channel{} c1.TeamId = t1.Id c1.DisplayName = "Channel2" c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN - c1, nErr := ss.Channel().Save(c1, -1) + c1, nErr = ss.Channel().Save(c1, -1) require.Nil(t, nErr) cDM, nErr := ss.Channel().CreateDirectChannel(u1, u2) @@ -317,11 +317,11 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) { } user1, err = ss.User().Save(user1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, err) + require.Nil(t, nErr) user2 := &model.User{ Email: MakeEmail(), @@ -329,11 +329,11 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) { } user2, err = ss.User().Save(user2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user2.Id, }, -1) - require.Nil(t, err) + require.Nil(t, nErr) // need a public channel channel := &model.Channel{ @@ -342,7 +342,7 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) { DisplayName: "Public Channel", Type: model.CHANNEL_OPEN, } - channel, nErr := ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(channel, -1) require.Nil(t, nErr) // user1 posts twice in the public channel @@ -421,11 +421,11 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) { } user1, err = ss.User().Save(user1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, err) + require.Nil(t, nErr) user2 := &model.User{ Email: MakeEmail(), @@ -433,11 +433,11 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) { } user2, err = ss.User().Save(user2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user2.Id, }, -1) - require.Nil(t, err) + require.Nil(t, nErr) // need a private channel channel := &model.Channel{ @@ -446,7 +446,7 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) { DisplayName: "Private Channel", Type: model.CHANNEL_PRIVATE, } - channel, nErr := ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(channel, -1) require.Nil(t, nErr) // user1 posts twice in the private channel @@ -527,11 +527,11 @@ func testMessageExportDirectMessageChannel(t *testing.T, ss store.Store) { } user1, err = ss.User().Save(user1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, err) + require.Nil(t, nErr) user2 := &model.User{ Email: MakeEmail(), @@ -539,11 +539,11 @@ func testMessageExportDirectMessageChannel(t *testing.T, ss store.Store) { } user2, err = ss.User().Save(user2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user2.Id, }, -1) - require.Nil(t, err) + require.Nil(t, nErr) // as well as a DM channel between those users directMessageChannel, nErr := ss.Channel().CreateDirectChannel(user1, user2) @@ -608,11 +608,11 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) { } user1, err = ss.User().Save(user1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, err) + require.Nil(t, nErr) user2 := &model.User{ Email: MakeEmail(), @@ -620,11 +620,11 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) { } user2, err = ss.User().Save(user2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user2.Id, }, -1) - require.Nil(t, err) + require.Nil(t, nErr) user3 := &model.User{ Email: MakeEmail(), @@ -632,11 +632,11 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) { } user3, err = ss.User().Save(user3) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user3.Id, }, -1) - require.Nil(t, err) + require.Nil(t, nErr) // can't create a group channel directly, because importing app creates an import cycle, so we have to fake it groupMessageChannel := &model.Channel{ @@ -644,7 +644,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) { Name: model.NewId(), Type: model.CHANNEL_GROUP, } - groupMessageChannel, nErr := ss.Channel().Save(groupMessageChannel, -1) + groupMessageChannel, nErr = ss.Channel().Save(groupMessageChannel, -1) require.Nil(t, nErr) // user1 posts in the GM @@ -705,11 +705,11 @@ func testEditExportMessage(t *testing.T, ss store.Store) { } user1, err = ss.User().Save(user1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, err) + require.Nil(t, nErr) // need a public channel channel := &model.Channel{ @@ -718,7 +718,7 @@ func testEditExportMessage(t *testing.T, ss store.Store) { DisplayName: "Public Channel", Type: model.CHANNEL_OPEN, } - channel, nErr := ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(channel, -1) require.Nil(t, nErr) // user1 posts in the public channel @@ -798,11 +798,11 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) { } user1, err = ss.User().Save(user1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, err) + require.Nil(t, nErr) // need a public channel channel := &model.Channel{ @@ -811,7 +811,7 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) { DisplayName: "Public Channel", Type: model.CHANNEL_OPEN, } - channel, nErr := ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(channel, -1) require.Nil(t, nErr) // user1 posts in the public channel @@ -910,11 +910,11 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) { } user1, err = ss.User().Save(user1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, err) + require.Nil(t, nErr) // need a public channel channel := &model.Channel{ @@ -923,7 +923,7 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) { DisplayName: "Public Channel", Type: model.CHANNEL_OPEN, } - channel, nErr := ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(channel, -1) require.Nil(t, nErr) // user1 posts in the public channel @@ -995,11 +995,11 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) { } user1, err = ss.User().Save(user1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, err) + require.Nil(t, nErr) // need a public channel channel := &model.Channel{ @@ -1008,7 +1008,7 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) { DisplayName: "Public Channel", Type: model.CHANNEL_OPEN, } - channel, nErr := ss.Channel().Save(channel, -1) + channel, nErr = ss.Channel().Save(channel, -1) require.Nil(t, nErr) // user1 posts in the public channel diff --git a/store/storetest/group_store.go b/store/storetest/group_store.go index a27968bdb6..1872418e5b 100644 --- a/store/storetest/group_store.go +++ b/store/storetest/group_store.go @@ -747,8 +747,8 @@ func testGroupGetMemberUsersInTeam(t *testing.T, ss store.Store) { require.Equal(t, 0, len(groupMembers)) m1 := &model.TeamMember{TeamId: team.Id, UserId: user1.Id} - _, err = ss.Team().SaveMember(m1, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(m1, -1) + require.Nil(t, nErr) // returns single member in team groupMembers, err = ss.Group().GetMemberUsersInTeam(group.Id, team.Id) @@ -757,10 +757,10 @@ func testGroupGetMemberUsersInTeam(t *testing.T, ss store.Store) { m2 := &model.TeamMember{TeamId: team.Id, UserId: user2.Id} m3 := &model.TeamMember{TeamId: team.Id, UserId: user3.Id} - _, err = ss.Team().SaveMember(m2, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(m3, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(m2, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(m3, -1) + require.Nil(t, nErr) // returns all members when all members are in team groupMembers, err = ss.Group().GetMemberUsersInTeam(group.Id, team.Id) @@ -843,8 +843,8 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, ss store.Store) { require.Equal(t, 0, len(groupMembers)) m1 := &model.TeamMember{TeamId: team.Id, UserId: user1.Id} - _, err = ss.Team().SaveMember(m1, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(m1, -1) + require.Nil(t, nErr) // returns single member in team and not in channel groupMembers, err = ss.Group().GetMemberUsersNotInChannel(group.Id, channel.Id) @@ -853,10 +853,10 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, ss store.Store) { m2 := &model.TeamMember{TeamId: team.Id, UserId: user2.Id} m3 := &model.TeamMember{TeamId: team.Id, UserId: user3.Id} - _, err = ss.Team().SaveMember(m2, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(m3, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(m2, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(m3, -1) + require.Nil(t, nErr) // returns all members when all members are in team and not in channel groupMembers, err = ss.Group().GetMemberUsersNotInChannel(group.Id, channel.Id) @@ -1459,11 +1459,11 @@ func testTeamMembersToAdd(t *testing.T, ss store.Store) { require.Len(t, teamMembers, 1) // adding team membership stops returning result - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user.Id, }, 999) - require.Nil(t, err) + require.Nil(t, nErr) teamMembers, err = ss.Group().TeamMembersToAdd(0, nil) require.Nil(t, err) require.Empty(t, teamMembers) @@ -1934,18 +1934,18 @@ func testTeamMembersToRemoveSingleTeam(t *testing.T, ss store.Store) { require.Nil(t, err) for _, user := range []*model.User{user1, user2} { - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team1.Id, UserId: user.Id, }, 999) - require.Nil(t, err) + require.Nil(t, nErr) } - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team2.Id, UserId: user3.Id, }, 999) - require.Nil(t, err) + require.Nil(t, nErr) teamMembers, err := ss.Group().TeamMembersToRemove(nil) require.Nil(t, err) @@ -2230,11 +2230,11 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData } for _, item := range userIDTeamIDs { - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{ UserId: item[0], TeamId: item[1], }, 99) - require.Nil(t, err) + require.Nil(t, nErr) } // add users to channels @@ -3447,8 +3447,8 @@ func testTeamMembersMinusGroupMembers(t *testing.T, ss store.Store) { users = append(users, user) trueOrFalse := int(math.Mod(float64(i), 2)) == 0 - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user.Id, SchemeUser: trueOrFalse, SchemeAdmin: !trueOrFalse}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user.Id, SchemeUser: trueOrFalse, SchemeAdmin: !trueOrFalse}, 999) + require.Nil(t, nErr) } // Extra user outside of the group member users. @@ -3459,8 +3459,8 @@ func testTeamMembersMinusGroupMembers(t *testing.T, ss store.Store) { user, err = ss.User().Save(user) require.Nil(t, err) users = append(users, user) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user.Id, SchemeUser: true, SchemeAdmin: false}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user.Id, SchemeUser: true, SchemeAdmin: false}, 999) + require.Nil(t, nErr) for i := 0; i < numberOfGroups; i++ { group := &model.Group{ @@ -4204,12 +4204,12 @@ func groupTestpUpdateMembersRoleTeam(t *testing.T, ss store.Store) { require.Nil(t, err) for _, user := range []*model.User{user1, user2, user3} { - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user.Id}, 9999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user.Id}, 9999) + require.Nil(t, nErr) } - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user4.Id, SchemeGuest: true}, 9999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user4.Id, SchemeGuest: true}, 9999) + require.Nil(t, nErr) tests := []struct { testName string diff --git a/store/storetest/mocks/TeamStore.go b/store/storetest/mocks/TeamStore.go index aad111d9e6..5503d68af2 100644 --- a/store/storetest/mocks/TeamStore.go +++ b/store/storetest/mocks/TeamStore.go @@ -923,7 +923,7 @@ func (_m *TeamStore) Save(team *model.Team) (*model.Team, *model.AppError) { } // SaveMember provides a mock function with given fields: member, maxUsersPerTeam -func (_m *TeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, *model.AppError) { +func (_m *TeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { ret := _m.Called(member, maxUsersPerTeam) var r0 *model.TeamMember @@ -935,20 +935,18 @@ func (_m *TeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) ( } } - var r1 *model.AppError - if rf, ok := ret.Get(1).(func(*model.TeamMember, int) *model.AppError); ok { + var r1 error + if rf, ok := ret.Get(1).(func(*model.TeamMember, int) error); ok { r1 = rf(member, maxUsersPerTeam) } else { - if ret.Get(1) != nil { - r1 = ret.Get(1).(*model.AppError) - } + r1 = ret.Error(1) } return r0, r1 } // SaveMultipleMembers provides a mock function with given fields: members, maxUsersPerTeam -func (_m *TeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, *model.AppError) { +func (_m *TeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, error) { ret := _m.Called(members, maxUsersPerTeam) var r0 []*model.TeamMember @@ -960,13 +958,11 @@ func (_m *TeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPe } } - var r1 *model.AppError - if rf, ok := ret.Get(1).(func([]*model.TeamMember, int) *model.AppError); ok { + var r1 error + if rf, ok := ret.Get(1).(func([]*model.TeamMember, int) error); ok { r1 = rf(members, maxUsersPerTeam) } else { - if ret.Get(1) != nil { - r1 = ret.Get(1).(*model.AppError) - } + r1 = ret.Error(1) } return r0, r1 diff --git a/store/storetest/post_store.go b/store/storetest/post_store.go index 168decaa25..66c58577c0 100644 --- a/store/storetest/post_store.go +++ b/store/storetest/post_store.go @@ -2624,16 +2624,16 @@ func testPostStoreGetDirectPostParentsForExportAfter(t *testing.T, ss store.Stor u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + require.Nil(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -2652,7 +2652,7 @@ func testPostStoreGetDirectPostParentsForExportAfter(t *testing.T, ss store.Stor p1.UserId = u1.Id p1.Message = "zz" + model.NewId() + "AAAAAAAAAAA" p1.CreateAt = 1000 - p1, nErr := ss.Post().Save(p1) + p1, nErr = ss.Post().Save(p1) require.Nil(t, nErr) r1, err := ss.Post().GetDirectPostParentsForExportAfter(10000, strings.Repeat("0", 26)) @@ -2679,8 +2679,8 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, ss sto u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := &model.User{} u2.DeleteAt = 1 @@ -2688,8 +2688,8 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, ss sto u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + require.Nil(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -2704,7 +2704,7 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, ss sto ss.Channel().SaveDirectChannel(&o1, &m1, &m2) o1.DeleteAt = 1 - nErr := ss.Channel().SetDeleteAt(o1.Id, 1, 1) + nErr = ss.Channel().SetDeleteAt(o1.Id, 1, 1) assert.Nil(t, nErr) p1 := &model.Post{} @@ -2746,16 +2746,16 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, ss sto u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + require.Nil(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -2774,7 +2774,7 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, ss sto p1.UserId = u1.Id p1.Message = "zz" + model.NewId() + "AAAAAAAAAAA" p1.CreateAt = 1000 - p1, nErr := ss.Post().Save(p1) + p1, nErr = ss.Post().Save(p1) require.Nil(t, nErr) postIds = append(postIds, p1.Id) } diff --git a/store/storetest/team_store.go b/store/storetest/team_store.go index f1d38ed120..dc71095985 100644 --- a/store/storetest/team_store.go +++ b/store/storetest/team_store.go @@ -630,8 +630,8 @@ func testTeamStoreByUserId(t *testing.T, ss store.Store) { require.Nil(t, err) m1 := &model.TeamMember{TeamId: o1.Id, UserId: model.NewId()} - _, err = ss.Team().SaveMember(m1, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(m1, -1) + require.Nil(t, nErr) teams, err := ss.Team().GetTeamsByUserId(m1.UserId) require.Nil(t, err) @@ -1069,8 +1069,8 @@ func testGetMembers(t *testing.T, ss store.Store) { m5 := &model.TeamMember{TeamId: teamId1, UserId: "44444444444444444444444444"} m6 := &model.TeamMember{TeamId: teamId2, UserId: "00000000000000000000000000"} - _, err := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4, m5, m6}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4, m5, m6}, -1) + require.Nil(t, nErr) // Gets users ordered by UserId ms, err := ss.Team().GetMembers(teamId1, 0, 100, nil) @@ -1114,8 +1114,8 @@ func testGetMembers(t *testing.T, ss store.Store) { m5 := &model.TeamMember{TeamId: teamId1, UserId: u5.Id} m6 := &model.TeamMember{TeamId: teamId2, UserId: u6.Id} - _, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4, m5, m6}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4, m5, m6}, -1) + require.Nil(t, nErr) // Gets users ordered by UserName ms, err := ss.Team().GetMembers(teamId1, 0, 100, &model.TeamMembersGetOptions{Sort: model.USERNAME}) @@ -1166,18 +1166,18 @@ func testGetMembers(t *testing.T, ss store.Store) { m5 := &model.TeamMember{TeamId: teamId1, UserId: u5.Id} m6 := &model.TeamMember{TeamId: teamId2, UserId: u6.Id} - t1, err := ss.Team().SaveMember(m1, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(m2, -1) - require.Nil(t, err) - t3, err := ss.Team().SaveMember(m3, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(m4, -1) - require.Nil(t, err) - t5, err := ss.Team().SaveMember(m5, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(m6, -1) - require.Nil(t, err) + t1, nErr := ss.Team().SaveMember(m1, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(m2, -1) + require.Nil(t, nErr) + t3, nErr := ss.Team().SaveMember(m3, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(m4, -1) + require.Nil(t, nErr) + t5, nErr := ss.Team().SaveMember(m5, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(m6, -1) + require.Nil(t, nErr) // Gets users ordered by UserName ms, err := ss.Team().GetMembers(teamId1, 0, 100, &model.TeamMembersGetOptions{ExcludeDeletedUsers: true}) @@ -1195,8 +1195,8 @@ func testTeamMembers(t *testing.T, ss store.Store) { m2 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} m3 := &model.TeamMember{TeamId: teamId2, UserId: model.NewId()} - _, err := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3}, -1) + require.Nil(t, nErr) ms, err := ss.Team().GetMembers(teamId1, 0, 100, nil) require.Nil(t, err) @@ -1220,8 +1220,8 @@ func testTeamMembers(t *testing.T, ss store.Store) { require.Len(t, ms, 1) require.Equal(t, m2.UserId, ms[0].UserId) - _, err = ss.Team().SaveMember(m1, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(m1, -1) + require.Nil(t, nErr) err = ss.Team().RemoveAllMembersByTeam(teamId1) require.Nil(t, err) @@ -1233,8 +1233,8 @@ func testTeamMembers(t *testing.T, ss store.Store) { uid := model.NewId() m4 := &model.TeamMember{TeamId: teamId1, UserId: uid} m5 := &model.TeamMember{TeamId: teamId2, UserId: uid} - _, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{m4, m5}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMultipleMembers([]*model.TeamMember{m4, m5}, -1) + require.Nil(t, nErr) ms, err = ss.Team().GetTeamsForUser(uid) require.Nil(t, err) @@ -1256,38 +1256,38 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { t.Run("not valid team member", func(t *testing.T) { member := &model.TeamMember{TeamId: "wrong", UserId: u1.Id} - _, err = ss.Team().SaveMember(member, -1) - require.NotNil(t, err) - require.Equal(t, "model.team_member.is_valid.team_id.app_error", err.Id) + _, nErr := ss.Team().SaveMember(member, -1) + require.NotNil(t, nErr) + require.Equal(t, "TeamMember.IsValid: model.team_member.is_valid.team_id.app_error, ", nErr.Error()) }) t.Run("too many members", func(t *testing.T) { member := &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id} - _, err = ss.Team().SaveMember(member, 0) - require.NotNil(t, err) - require.Equal(t, "store.sql_user.save.max_accounts.app_error", err.Id) + _, nErr := ss.Team().SaveMember(member, 0) + require.NotNil(t, nErr) + require.Equal(t, "limit exceeded: what: TeamMember count: 1 metadata: team members limit exceeded", nErr.Error()) }) t.Run("too many members because previous existing members", func(t *testing.T) { teamID := model.NewId() m1 := &model.TeamMember{TeamId: teamID, UserId: u1.Id} - _, err = ss.Team().SaveMember(m1, 1) + _, nErr := ss.Team().SaveMember(m1, 1) m2 := &model.TeamMember{TeamId: teamID, UserId: u2.Id} - _, err = ss.Team().SaveMember(m2, 1) - require.NotNil(t, err) - require.Equal(t, "store.sql_user.save.max_accounts.app_error", err.Id) + _, nErr = ss.Team().SaveMember(m2, 1) + require.NotNil(t, nErr) + require.Equal(t, "limit exceeded: what: TeamMember count: 2 metadata: team members limit exceeded", nErr.Error()) }) t.Run("duplicated entries should fail", func(t *testing.T) { teamID1 := model.NewId() m1 := &model.TeamMember{TeamId: teamID1, UserId: u1.Id} - _, err = ss.Team().SaveMember(m1, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(m1, -1) + require.Nil(t, nErr) m2 := &model.TeamMember{TeamId: teamID1, UserId: u1.Id} - _, err = ss.Team().SaveMember(m2, -1) - require.NotNil(t, err) - require.Equal(t, "store.sql_team.save_member.exists.app_error", err.Id) + _, nErr = ss.Team().SaveMember(m2, -1) + require.NotNil(t, nErr) + require.IsType(t, &store.ErrConflict{}, nErr) }) t.Run("insert member correctly (in team without scheme)", func(t *testing.T) { @@ -1418,8 +1418,8 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { SchemeAdmin: tc.SchemeAdmin, ExplicitRoles: tc.ExplicitRoles, } - member, err = ss.Team().SaveMember(member, -1) - require.Nil(t, err) + member, nErr := ss.Team().SaveMember(member, -1) + require.Nil(t, nErr) defer ss.Team().RemoveMember(team.Id, u1.Id) assert.Equal(t, tc.ExpectedRoles, member.Roles) @@ -1569,8 +1569,8 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { SchemeAdmin: tc.SchemeAdmin, ExplicitRoles: tc.ExplicitRoles, } - member, err := ss.Team().SaveMember(member, -1) - require.Nil(t, err) + member, nErr := ss.Team().SaveMember(member, -1) + require.Nil(t, nErr) defer ss.Team().RemoveMember(team.Id, u1.Id) assert.Equal(t, tc.ExpectedRoles, member.Roles) @@ -1596,18 +1596,18 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { t.Run("any not valid team member", func(t *testing.T) { m1 := &model.TeamMember{TeamId: "wrong", UserId: u1.Id} m2 := &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id} - _, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, -1) - require.NotNil(t, err) - require.Equal(t, "model.team_member.is_valid.team_id.app_error", err.Id) + _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, -1) + require.NotNil(t, nErr) + require.Equal(t, "TeamMember.IsValid: model.team_member.is_valid.team_id.app_error, ", nErr.Error()) }) t.Run("too many members in one team", func(t *testing.T) { teamID := model.NewId() m1 := &model.TeamMember{TeamId: teamID, UserId: u1.Id} m2 := &model.TeamMember{TeamId: teamID, UserId: u2.Id} - _, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, 0) - require.NotNil(t, err) - require.Equal(t, "store.sql_user.save.max_accounts.app_error", err.Id) + _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, 0) + require.NotNil(t, nErr) + require.Equal(t, "limit exceeded: what: TeamMember count: 2 metadata: team members limit exceeded", nErr.Error()) }) t.Run("too many members in one team because previous existing members", func(t *testing.T) { @@ -1616,12 +1616,12 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { m2 := &model.TeamMember{TeamId: teamID, UserId: u2.Id} m3 := &model.TeamMember{TeamId: teamID, UserId: u3.Id} m4 := &model.TeamMember{TeamId: teamID, UserId: u4.Id} - _, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, 3) - require.Nil(t, err) + _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, 3) + require.Nil(t, nErr) - _, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{m3, m4}, 3) - require.NotNil(t, err) - require.Equal(t, "store.sql_user.save.max_accounts.app_error", err.Id) + _, nErr = ss.Team().SaveMultipleMembers([]*model.TeamMember{m3, m4}, 3) + require.NotNil(t, nErr) + require.Equal(t, "limit exceeded: what: TeamMember count: 4 metadata: team members limit exceeded", nErr.Error()) }) t.Run("too many members, but in different teams", func(t *testing.T) { @@ -1632,18 +1632,18 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { m3 := &model.TeamMember{TeamId: teamID1, UserId: u3.Id} m4 := &model.TeamMember{TeamId: teamID2, UserId: u1.Id} m5 := &model.TeamMember{TeamId: teamID2, UserId: u2.Id} - _, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4, m5}, 2) - require.NotNil(t, err) - require.Equal(t, "store.sql_user.save.max_accounts.app_error", err.Id) + _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4, m5}, 2) + require.NotNil(t, nErr) + require.Equal(t, "limit exceeded: what: TeamMember count: 3 metadata: team members limit exceeded", nErr.Error()) }) t.Run("duplicated entries should fail", func(t *testing.T) { teamID1 := model.NewId() m1 := &model.TeamMember{TeamId: teamID1, UserId: u1.Id} m2 := &model.TeamMember{TeamId: teamID1, UserId: u1.Id} - _, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, 10) - require.NotNil(t, err) - require.Equal(t, "store.sql_team.save_member.exists.app_error", err.Id) + _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, 10) + require.NotNil(t, nErr) + require.IsType(t, &store.ErrConflict{}, nErr) }) t.Run("insert members correctly (in team without scheme)", func(t *testing.T) { @@ -1783,8 +1783,8 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { ExplicitRoles: tc.ExplicitRoles, } var members []*model.TeamMember - members, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1) - require.Nil(t, err) + members, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1) + require.Nil(t, nErr) require.Len(t, members, 2) member = members[0] defer ss.Team().RemoveMember(team.Id, u1.Id) @@ -1945,8 +1945,8 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { SchemeAdmin: tc.SchemeAdmin, ExplicitRoles: tc.ExplicitRoles, } - members, err := ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1) - require.Nil(t, err) + members, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1) + require.Nil(t, nErr) require.Len(t, members, 2) member = members[0] defer ss.Team().RemoveMember(team.Id, u1.Id) @@ -1985,8 +1985,8 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) { require.Nil(t, err) member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id} - member, err = ss.Team().SaveMember(member, -1) - require.Nil(t, err) + member, nErr := ss.Team().SaveMember(member, -1) + require.Nil(t, nErr) testCases := []struct { Name string @@ -2136,8 +2136,8 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) { require.Nil(t, err) member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id} - member, err := ss.Team().SaveMember(member, -1) - require.Nil(t, err) + member, nErr = ss.Team().SaveMember(member, -1) + require.Nil(t, nErr) testCases := []struct { Name string @@ -2294,8 +2294,8 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) { member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id} otherMember := &model.TeamMember{TeamId: team.Id, UserId: u2.Id} var members []*model.TeamMember - members, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1) - require.Nil(t, err) + members, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1) + require.Nil(t, nErr) require.Len(t, members, 2) member = members[0] otherMember = members[1] @@ -2452,8 +2452,8 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) { member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id} otherMember := &model.TeamMember{TeamId: team.Id, UserId: u2.Id} - members, err := ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1) - require.Nil(t, err) + members, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1) + require.Nil(t, nErr) require.Len(t, members, 2) member = members[0] otherMember = members[1] @@ -2601,8 +2601,8 @@ func testTeamRemoveMember(t *testing.T, ss store.Store) { m2 := &model.TeamMember{TeamId: teamID, UserId: u2.Id} m3 := &model.TeamMember{TeamId: teamID, UserId: u3.Id} m4 := &model.TeamMember{TeamId: teamID, UserId: u4.Id} - _, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4}, -1) + require.Nil(t, nErr) t.Run("remove member from not existing team", func(t *testing.T) { err = ss.Team().RemoveMember("not-existing-team", u1.Id) @@ -2647,8 +2647,8 @@ func testTeamRemoveMembers(t *testing.T, ss store.Store) { m2 := &model.TeamMember{TeamId: teamID, UserId: u2.Id} m3 := &model.TeamMember{TeamId: teamID, UserId: u3.Id} m4 := &model.TeamMember{TeamId: teamID, UserId: u4.Id} - _, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4}, -1) + require.Nil(t, nErr) t.Run("remove members from not existing team", func(t *testing.T) { err = ss.Team().RemoveMembers("not-existing-team", []string{u1.Id, u2.Id, u3.Id, u4.Id}) @@ -2696,8 +2696,8 @@ func testTeamMembersWithPagination(t *testing.T, ss store.Store) { m2 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} m3 := &model.TeamMember{TeamId: teamId2, UserId: model.NewId()} - _, err := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3}, -1) + require.Nil(t, nErr) ms, errTeam := ss.Team().GetTeamsForUserWithPagination(m1.UserId, 0, 1) require.Nil(t, errTeam) @@ -2708,14 +2708,14 @@ func testTeamMembersWithPagination(t *testing.T, ss store.Store) { e := ss.Team().RemoveMember(teamId1, m1.UserId) require.Nil(t, e) - ms, err = ss.Team().GetMembers(teamId1, 0, 100, nil) + ms, err := ss.Team().GetMembers(teamId1, 0, 100, nil) require.Nil(t, err) require.Len(t, ms, 1) require.Equal(t, m2.UserId, ms[0].UserId) - _, err = ss.Team().SaveMember(m1, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(m1, -1) + require.Nil(t, nErr) err = ss.Team().RemoveAllMembersByTeam(teamId1) require.Nil(t, err) @@ -2723,8 +2723,8 @@ func testTeamMembersWithPagination(t *testing.T, ss store.Store) { uid := model.NewId() m4 := &model.TeamMember{TeamId: teamId1, UserId: uid} m5 := &model.TeamMember{TeamId: teamId2, UserId: uid} - _, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{m4, m5}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMultipleMembers([]*model.TeamMember{m4, m5}, -1) + require.Nil(t, nErr) result, err := ss.Team().GetTeamsForUserWithPagination(uid, 0, 1) require.Nil(t, err) @@ -2765,11 +2765,11 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { ss.User().PermanentDelete(userId) }(userIds[i]) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: userIds[i], }, maxUsersPerTeam) - require.Nil(t, err) + require.Nil(t, nErr) defer func(userId string) { ss.Team().RemoveMember(team.Id, userId) @@ -2790,11 +2790,11 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { ss.User().PermanentDelete(newUserId) }() - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: newUserId, }, maxUsersPerTeam) - require.NotNil(t, err, "shouldn't be able to save member when at maximum members per team") + require.NotNil(t, nErr, "shouldn't be able to save member when at maximum members per team") totalMemberCount, teamErr := ss.Team().GetTotalMemberCount(team.Id, nil) require.Nil(t, teamErr) @@ -2812,8 +2812,8 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { require.Nil(t, teamErr) require.Equal(t, maxUsersPerTeam-1, int(totalMemberCount), "should now only have 4 team members, had %v instead", totalMemberCount) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: newUserId}, maxUsersPerTeam) - require.Nil(t, err, "should've been able to save new member after deleting one") + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: newUserId}, maxUsersPerTeam) + require.Nil(t, nErr, "should've been able to save new member after deleting one") defer ss.Team().RemoveMember(team.Id, newUserId) @@ -2834,8 +2834,8 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { }) require.Nil(t, err) newUserId2 := user.Id - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: newUserId2}, maxUsersPerTeam) - require.Nil(t, err, "should've been able to save new member after deleting one") + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: newUserId2}, maxUsersPerTeam) + require.Nil(t, nErr, "should've been able to save new member after deleting one") defer ss.Team().RemoveMember(team.Id, newUserId2) } @@ -2844,11 +2844,11 @@ func testGetTeamMember(t *testing.T, ss store.Store) { teamId1 := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} - _, err := ss.Team().SaveMember(m1, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(m1, -1) + require.Nil(t, nErr) var rm1 *model.TeamMember - rm1, err = ss.Team().GetMember(m1.TeamId, m1.UserId) + rm1, err := ss.Team().GetMember(m1.TeamId, m1.UserId) require.Nil(t, err) require.Equal(t, rm1.TeamId, m1.TeamId, "bad team id") @@ -2868,7 +2868,7 @@ func testGetTeamMember(t *testing.T, ss store.Store) { Description: model.NewId(), Scope: model.SCHEME_SCOPE_TEAM, } - s2, nErr := ss.Scheme().Save(s2) + s2, nErr = ss.Scheme().Save(s2) require.Nil(t, nErr) t.Log(s2) @@ -2885,8 +2885,8 @@ func testGetTeamMember(t *testing.T, ss store.Store) { }() m2 := &model.TeamMember{TeamId: t2.Id, UserId: model.NewId(), SchemeUser: true} - _, err = ss.Team().SaveMember(m2, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(m2, -1) + require.Nil(t, nErr) m3, err := ss.Team().GetMember(m2.TeamId, m2.UserId) require.Nil(t, err) @@ -2895,8 +2895,8 @@ func testGetTeamMember(t *testing.T, ss store.Store) { assert.Equal(t, s2.DefaultTeamUserRole, m3.Roles) m4 := &model.TeamMember{TeamId: t2.Id, UserId: model.NewId(), SchemeGuest: true} - _, err = ss.Team().SaveMember(m4, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(m4, -1) + require.Nil(t, nErr) m5, err := ss.Team().GetMember(m4.TeamId, m4.UserId) require.Nil(t, err) @@ -2908,11 +2908,11 @@ func testGetTeamMembersByIds(t *testing.T, ss store.Store) { teamId1 := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} - _, err := ss.Team().SaveMember(m1, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(m1, -1) + require.Nil(t, nErr) var r []*model.TeamMember - r, err = ss.Team().GetMembersByIds(m1.TeamId, []string{m1.UserId}, nil) + r, err := ss.Team().GetMembersByIds(m1.TeamId, []string{m1.UserId}, nil) require.Nil(t, err) rm1 := r[0] @@ -2920,8 +2920,8 @@ func testGetTeamMembersByIds(t *testing.T, ss store.Store) { require.Equal(t, rm1.UserId, m1.UserId, "bad user id") m2 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} - _, err = ss.Team().SaveMember(m2, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(m2, -1) + require.Nil(t, nErr) rm, err := ss.Team().GetMembersByIds(m1.TeamId, []string{m1.UserId, m2.UserId, model.NewId()}, nil) require.Nil(t, err) @@ -2946,12 +2946,12 @@ func testTeamStoreMemberCount(t *testing.T, ss store.Store) { teamId1 := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: u1.Id} - _, err = ss.Team().SaveMember(m1, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(m1, -1) + require.Nil(t, nErr) m2 := &model.TeamMember{TeamId: teamId1, UserId: u2.Id} - _, err = ss.Team().SaveMember(m2, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(m2, -1) + require.Nil(t, nErr) var totalMemberCount int64 totalMemberCount, err = ss.Team().GetTotalMemberCount(teamId1, nil) @@ -2964,8 +2964,8 @@ func testTeamStoreMemberCount(t *testing.T, ss store.Store) { require.Equal(t, 1, int(result), "wrong count") m3 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} - _, err = ss.Team().SaveMember(m3, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(m3, -1) + require.Nil(t, nErr) totalMemberCount, err = ss.Team().GetTotalMemberCount(teamId1, nil) require.Nil(t, err) @@ -2983,13 +2983,13 @@ func testGetChannelUnreadsForAllTeams(t *testing.T, ss store.Store) { uid := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: uid} m2 := &model.TeamMember{TeamId: teamId2, UserId: uid} - _, err := ss.Team().SaveMember(m1, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(m2, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(m1, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(m2, -1) + require.Nil(t, nErr) c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100} - _, nErr := ss.Channel().Save(c1, -1) + _, nErr = ss.Channel().Save(c1, -1) require.Nil(t, nErr) c2 := &model.Channel{TeamId: m2.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100} @@ -2997,7 +2997,7 @@ func testGetChannelUnreadsForAllTeams(t *testing.T, ss store.Store) { require.Nil(t, nErr) cm1 := &model.ChannelMember{ChannelId: c1.Id, UserId: m1.UserId, NotifyProps: model.GetDefaultChannelNotifyProps(), MsgCount: 90} - _, err = ss.Channel().SaveMember(cm1) + _, err := ss.Channel().SaveMember(cm1) require.Nil(t, err) cm2 := &model.ChannelMember{ChannelId: c2.Id, UserId: m2.UserId, NotifyProps: model.GetDefaultChannelNotifyProps(), MsgCount: 90} _, err = ss.Channel().SaveMember(cm2) @@ -3039,11 +3039,11 @@ func testGetChannelUnreadsForTeam(t *testing.T, ss store.Store) { uid := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: uid} - _, err := ss.Team().SaveMember(m1, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(m1, -1) + require.Nil(t, nErr) c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100} - _, nErr := ss.Channel().Save(c1, -1) + _, nErr = ss.Channel().Save(c1, -1) require.Nil(t, nErr) c2 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100} @@ -3051,11 +3051,11 @@ func testGetChannelUnreadsForTeam(t *testing.T, ss store.Store) { require.Nil(t, nErr) cm1 := &model.ChannelMember{ChannelId: c1.Id, UserId: m1.UserId, NotifyProps: model.GetDefaultChannelNotifyProps(), MsgCount: 90} - _, err = ss.Channel().SaveMember(cm1) - require.Nil(t, err) + _, nErr = ss.Channel().SaveMember(cm1) + require.Nil(t, nErr) cm2 := &model.ChannelMember{ChannelId: c2.Id, UserId: m1.UserId, NotifyProps: model.GetDefaultChannelNotifyProps(), MsgCount: 90} - _, err = ss.Channel().SaveMember(cm2) - require.Nil(t, err) + _, nErr = ss.Channel().SaveMember(cm2) + require.Nil(t, nErr) ms, err := ss.Team().GetChannelUnreadsForTeam(m1.TeamId, m1.UserId) require.Nil(t, err) @@ -3188,8 +3188,8 @@ func testTeamStoreMigrateTeamMembers(t *testing.T, ss store.Store) { ExplicitRoles: "something_else", } - memberships, err := ss.Team().SaveMultipleMembers([]*model.TeamMember{tm1, tm2, tm3}, -1) - require.Nil(t, err) + memberships, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{tm1, tm2, tm3}, -1) + require.Nil(t, nErr) require.Len(t, memberships, 3) tm1 = memberships[0] tm2 = memberships[1] @@ -3297,8 +3297,8 @@ func testTeamStoreClearAllCustomRoleAssignments(t *testing.T, ss store.Store) { ExplicitRoles: "custom_only", } - _, err := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4}, -1) + require.Nil(t, nErr) require.Nil(t, (ss.Team().ClearAllCustomRoleAssignments())) @@ -3437,8 +3437,8 @@ func testTeamStoreGetTeamMembersForExport(t *testing.T, ss store.Store) { m1 := &model.TeamMember{TeamId: t1.Id, UserId: u1.Id} m2 := &model.TeamMember{TeamId: t1.Id, UserId: u2.Id} - _, err = ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, -1) + require.Nil(t, nErr) d1, err := ss.Team().GetTeamMembersForExport(u1.Id) assert.Nil(t, err) diff --git a/store/storetest/user_store.go b/store/storetest/user_store.go index af27aeadcf..802c398bef 100644 --- a/store/storetest/user_store.go +++ b/store/storetest/user_store.go @@ -101,8 +101,8 @@ func testUserStoreSave(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, maxUsersPerTeam) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, maxUsersPerTeam) + require.Nil(t, nErr) _, err = ss.User().Save(&u1) require.NotNil(t, err, "shouldn't be able to update user from save") @@ -133,8 +133,8 @@ func testUserStoreSave(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(u.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u.Id}, maxUsersPerTeam) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u.Id}, maxUsersPerTeam) + require.Nil(t, nErr) } u2.Id = "" @@ -145,8 +145,8 @@ func testUserStoreSave(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, maxUsersPerTeam) - require.NotNil(t, err, "should be the limit") + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, maxUsersPerTeam) + require.NotNil(t, nErr, "should be the limit") } func testUserStoreUpdate(t *testing.T, ss store.Store) { @@ -156,8 +156,8 @@ func testUserStoreUpdate(t *testing.T, ss store.Store) { _, err := ss.User().Save(u1) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := &model.User{ Email: MakeEmail(), @@ -166,8 +166,8 @@ func testUserStoreUpdate(t *testing.T, ss store.Store) { _, err = ss.User().Save(u2) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + require.Nil(t, nErr) _, err = ss.User().Update(u1, false) require.Nil(t, err) @@ -194,8 +194,8 @@ func testUserStoreUpdate(t *testing.T, ss store.Store) { _, err = ss.User().Save(u3) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u3.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u3.Id}, -1) + require.Nil(t, nErr) u3.Email = MakeEmail() userUpdate, err := ss.User().Update(u3, false) @@ -217,8 +217,8 @@ func testUserStoreUpdateUpdateAt(t *testing.T, ss store.Store) { _, err := ss.User().Save(u1) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) _, err = ss.User().UpdateUpdateAt(u1.Id) require.Nil(t, err) @@ -234,8 +234,8 @@ func testUserStoreUpdateFailedPasswordAttempts(t *testing.T, ss store.Store) { _, err := ss.User().Save(u1) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) err = ss.User().UpdateFailedPasswordAttempts(u1.Id, 3) require.Nil(t, err) @@ -269,8 +269,8 @@ func testUserStoreGet(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.Bot().PermanentDelete(u2.Id)) }() defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) t.Run("fetch empty id", func(t *testing.T) { _, err := ss.User().Get("") @@ -303,8 +303,8 @@ func testGetAllUsingAuthService(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -313,8 +313,8 @@ func testGetAllUsingAuthService(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -323,9 +323,9 @@ func testGetAllUsingAuthService(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -558,8 +558,8 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -567,15 +567,15 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -584,8 +584,8 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { u3.IsBot = true defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) u4, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -594,8 +594,8 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) + require.Nil(t, nErr) u5, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -604,8 +604,8 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u5.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u5.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u5.Id}, -1) + require.Nil(t, nErr) t.Run("get page 0, perPage 100", func(t *testing.T) { actual, err := ss.User().GetProfiles(&model.UserGetOptions{ @@ -654,8 +654,8 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { _, err := ss.User().Save(uNew) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(uNew.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: uNew.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: uNew.Id}, -1) + require.Nil(t, nErr) updatedEtag := ss.User().GetEtagForProfiles(teamId) require.NotEqual(t, etag, updatedEtag) @@ -727,8 +727,8 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -736,8 +736,8 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -745,9 +745,9 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -832,8 +832,8 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -841,8 +841,8 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -850,9 +850,9 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -941,8 +941,8 @@ func testUserStoreGetProfilesWithoutTeam(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -959,7 +959,7 @@ func testUserStoreGetProfilesWithoutTeam(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -1008,8 +1008,8 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1017,8 +1017,8 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1026,9 +1026,9 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -1136,8 +1136,8 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1145,8 +1145,8 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1154,9 +1154,9 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -1299,8 +1299,8 @@ func testUserStoreGetProfilesByIds(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1308,8 +1308,8 @@ func testUserStoreGetProfilesByIds(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1317,9 +1317,9 @@ func testUserStoreGetProfilesByIds(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -1508,8 +1508,8 @@ func testUserStoreGetProfilesByUsernames(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1517,8 +1517,8 @@ func testUserStoreGetProfilesByUsernames(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1526,9 +1526,9 @@ func testUserStoreGetProfilesByUsernames(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: team2Id, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: team2Id, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -1578,8 +1578,8 @@ func testUserStoreGetSystemAdminProfiles(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1587,8 +1587,8 @@ func testUserStoreGetSystemAdminProfiles(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1597,9 +1597,9 @@ func testUserStoreGetSystemAdminProfiles(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -1627,8 +1627,8 @@ func testUserStoreGetByEmail(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1636,8 +1636,8 @@ func testUserStoreGetByEmail(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1645,9 +1645,9 @@ func testUserStoreGetByEmail(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -1700,8 +1700,8 @@ func testUserStoreGetByAuthData(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1709,8 +1709,8 @@ func testUserStoreGetByAuthData(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1720,9 +1720,9 @@ func testUserStoreGetByAuthData(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -1773,8 +1773,8 @@ func testUserStoreGetByUsername(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1782,8 +1782,8 @@ func testUserStoreGetByUsername(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1791,9 +1791,9 @@ func testUserStoreGetByUsername(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -1847,8 +1847,8 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1858,8 +1858,8 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1869,9 +1869,9 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -1931,8 +1931,8 @@ func testUserStoreUpdatePassword(t *testing.T, ss store.Store) { _, err := ss.User().Save(u1) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) hashedPassword := model.HashPassword("newpwd") @@ -1950,8 +1950,8 @@ func testUserStoreDelete(t *testing.T, ss store.Store) { _, err := ss.User().Save(u1) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) err = ss.User().PermanentDelete(u1.Id) require.Nil(t, err) @@ -1965,8 +1965,8 @@ func testUserStoreUpdateAuthData(t *testing.T, ss store.Store) { _, err := ss.User().Save(u1) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) service := "someservice" authData := model.NewId() @@ -2002,8 +2002,8 @@ func testUserUnreadCount(t *testing.T, ss store.Store) { _, err := ss.User().Save(u1) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() @@ -2011,10 +2011,10 @@ func testUserUnreadCount(t *testing.T, ss store.Store) { _, err = ss.User().Save(u2) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) - _, nErr := ss.Channel().Save(&c1, -1) + _, nErr = ss.Channel().Save(&c1, -1) require.Nil(t, nErr, "couldn't save item") m1 := model.ChannelMember{} @@ -2128,8 +2128,8 @@ func testUserStoreGetRecentlyActiveUsersForTeam(t *testing.T, ss store.Store, s }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -2137,8 +2137,8 @@ func testUserStoreGetRecentlyActiveUsersForTeam(t *testing.T, ss store.Store, s }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -2146,9 +2146,9 @@ func testUserStoreGetRecentlyActiveUsersForTeam(t *testing.T, ss store.Store, s }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -2203,8 +2203,8 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -2212,8 +2212,8 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -2221,9 +2221,9 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -2238,8 +2238,8 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u4.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u4.Id}, -1) + require.Nil(t, nErr) t.Run("get team 1, offset 0, limit 100", func(t *testing.T) { result, err := ss.User().GetNewUsersForTeam(teamId, 0, 100, nil) @@ -2331,12 +2331,12 @@ func testUserStoreSearch(t *testing.T, ss store.Store) { u3.AuthData = nilAuthData t1id := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: t1id, UserId: u1.Id, SchemeAdmin: true, SchemeUser: true}, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: t1id, UserId: u2.Id, SchemeAdmin: true, SchemeUser: true}, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: t1id, UserId: u3.Id, SchemeAdmin: false, SchemeUser: false, SchemeGuest: true}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: t1id, UserId: u1.Id, SchemeAdmin: true, SchemeUser: true}, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1id, UserId: u2.Id, SchemeAdmin: true, SchemeUser: true}, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1id, UserId: u3.Id, SchemeAdmin: false, SchemeUser: false, SchemeGuest: true}, -1) + require.Nil(t, nErr) testCases := []struct { Description string @@ -2477,12 +2477,12 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() tid := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u1.Id}, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u2.Id}, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u1.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u2.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) + require.Nil(t, nErr) // The users returned from the database will have AuthData as an empty string. nilAuthData := new(string) @@ -2706,12 +2706,12 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() tid := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u1.Id}, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u2.Id}, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u1.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u2.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) + require.Nil(t, nErr) // The users returned from the database will have AuthData as an empty string. nilAuthData := new(string) @@ -2968,21 +2968,21 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(u6.Id)) }() teamId1 := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u1.Id}, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u2.Id}, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u3.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u1.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u2.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u3.Id}, -1) + require.Nil(t, nErr) // u4 is not in team 1 - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u5.Id}, -1) - require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u6.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u5.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u6.Id}, -1) + require.Nil(t, nErr) teamId2 := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u4.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u4.Id}, -1) + require.Nil(t, nErr) // The users returned from the database will have AuthData as an empty string. nilAuthData := new(string) @@ -3129,8 +3129,8 @@ func testUserStoreSearchWithoutTeam(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() tid := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) + require.Nil(t, nErr) // The users returned from the database will have AuthData as an empty string. nilAuthData := new(string) @@ -3346,8 +3346,8 @@ func testCount(t *testing.T, ss store.Store) { _, err := ss.User().Save(regularUser) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(regularUser.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: regularUser.Id, SchemeAdmin: false, SchemeUser: true}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: regularUser.Id, SchemeAdmin: false, SchemeUser: true}, -1) + require.Nil(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{UserId: regularUser.Id, ChannelId: channelId, SchemeAdmin: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) require.Nil(t, err) @@ -3357,8 +3357,8 @@ func testCount(t *testing.T, ss store.Store) { _, err = ss.User().Save(guestUser) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(guestUser.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: guestUser.Id, SchemeAdmin: false, SchemeUser: false, SchemeGuest: true}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: guestUser.Id, SchemeAdmin: false, SchemeUser: false, SchemeGuest: true}, -1) + require.Nil(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{UserId: guestUser.Id, ChannelId: channelId, SchemeAdmin: false, SchemeUser: false, SchemeGuest: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) require.Nil(t, err) @@ -3368,8 +3368,8 @@ func testCount(t *testing.T, ss store.Store) { _, err = ss.User().Save(teamAdmin) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(teamAdmin.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: teamAdmin.Id, SchemeAdmin: true, SchemeUser: true}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: teamAdmin.Id, SchemeAdmin: true, SchemeUser: true}, -1) + require.Nil(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{UserId: teamAdmin.Id, ChannelId: channelId, SchemeAdmin: true, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) require.Nil(t, err) @@ -3379,8 +3379,8 @@ func testCount(t *testing.T, ss store.Store) { _, err = ss.User().Save(sysAdmin) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(sysAdmin.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: sysAdmin.Id, SchemeAdmin: false, SchemeUser: true}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: sysAdmin.Id, SchemeAdmin: false, SchemeUser: true}, -1) + require.Nil(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{UserId: sysAdmin.Id, ChannelId: channelId, SchemeAdmin: true, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) require.Nil(t, err) @@ -3398,7 +3398,7 @@ func testCount(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(botUser.Id)) }() - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Bot().Save(&model.Bot{ UserId: botUser.Id, Username: botUser.Username, OwnerId: regularUser.Id, @@ -3811,8 +3811,8 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) // Ensure update at timestamp changes time.Sleep(time.Millisecond) @@ -3823,8 +3823,8 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u2.Id}, -1) + require.Nil(t, nErr) // Ensure update at timestamp changes time.Sleep(time.Millisecond) @@ -3835,7 +3835,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -3880,8 +3880,8 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { time.Sleep(time.Millisecond) // Add u2 to team 1 - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u2.UpdateAt, err = ss.User().UpdateUpdateAt(u2.Id) require.Nil(t, err) @@ -3936,8 +3936,8 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) + require.Nil(t, nErr) t.Run("etag for profiles not in team 1 after addition to team", func(t *testing.T) { etag4 := ss.User().GetEtagForProfilesNotInTeam(teamId) @@ -3945,8 +3945,8 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { }) // Add u3 to team 2 - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u3.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u3.Id}, -1) + require.Nil(t, nErr) u3.UpdateAt, err = ss.User().UpdateUpdateAt(u3.Id) require.Nil(t, err) @@ -4151,11 +4151,11 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) { CreateAt: model.GetMillis(), }) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{ UserId: u2.Id, TeamId: t1.Id, }, 100) - require.Nil(t, err) + require.Nil(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{ UserId: u2.Id, ChannelId: cPub1.Id, @@ -4178,12 +4178,12 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) { CreateAt: model.GetMillis(), }) require.Nil(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{ UserId: u3.Id, TeamId: t1.Id, DeleteAt: model.GetMillis(), }, 100) - require.Nil(t, err) + require.Nil(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{ UserId: u3.Id, ChannelId: cPub2.Id, @@ -4272,11 +4272,11 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) { userGroupA, userGroupB, userNoGroup := testUsers[0], testUsers[1], testUsers[2] // add non-group-member to the team (to prove that the query isn't just returning all members) - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: userNoGroup.Id, }, 999) - require.Nil(t, err) + require.Nil(t, nErr) // create groups var testGroups []*model.Group @@ -4344,11 +4344,11 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) { requireNUsers(2) // add team membership of allowed user - _, err = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: userGroupA.Id, }, 999) - require.Nil(t, err) + require.Nil(t, nErr) // ensure allowed member still returned by query requireNUsers(2) @@ -4499,8 +4499,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) + require.Nil(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -4545,8 +4545,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) + require.Nil(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -4611,8 +4611,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) + require.Nil(t, nErr) err = ss.User().PromoteGuestToUser(user.Id) require.Nil(t, err) @@ -4641,8 +4641,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) + require.Nil(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -4686,8 +4686,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) + require.Nil(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -4731,8 +4731,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user1.Id)) }() teamId1 := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: user1.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: user1.Id, SchemeGuest: true, SchemeUser: false}, 999) + require.Nil(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId1, @@ -4759,8 +4759,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user2.Id)) }() teamId2 := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: user2.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: user2.Id, SchemeGuest: true, SchemeUser: false}, 999) + require.Nil(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user2.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()}) require.Nil(t, err) @@ -4814,8 +4814,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) + require.Nil(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -4860,8 +4860,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) + require.Nil(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -4926,8 +4926,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) + require.Nil(t, nErr) err = ss.User().DemoteUserToGuest(user.Id) require.Nil(t, err) @@ -4956,8 +4956,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) + require.Nil(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -5001,8 +5001,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) + require.Nil(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -5046,8 +5046,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user1.Id)) }() teamId1 := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: user1.Id, SchemeGuest: false, SchemeUser: true}, 999) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: user1.Id, SchemeGuest: false, SchemeUser: true}, 999) + require.Nil(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId1, @@ -5074,8 +5074,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { defer func() { require.Nil(t, ss.User().PermanentDelete(user2.Id)) }() teamId2 := model.NewId() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: user2.Id, SchemeGuest: false, SchemeUser: true}, 999) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: user2.Id, SchemeGuest: false, SchemeUser: true}, 999) + require.Nil(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user2.Id, SchemeGuest: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) require.Nil(t, err) @@ -5196,8 +5196,8 @@ func testUserStoreResetLastPictureUpdate(t *testing.T, ss store.Store) { _, err := ss.User().Save(u1) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + require.Nil(t, nErr) err = ss.User().UpdateLastPictureUpdate(u1.Id) require.Nil(t, err) @@ -5232,8 +5232,8 @@ func testGetKnownUsers(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, err) + _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + require.Nil(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -5241,8 +5241,8 @@ func testGetKnownUsers(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + require.Nil(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -5250,9 +5250,9 @@ func testGetKnownUsers(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, err) - _, nErr := ss.Bot().Save(&model.Bot{ + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + require.Nil(t, nErr) + _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, @@ -5268,8 +5268,8 @@ func testGetKnownUsers(t *testing.T, ss store.Store) { }) require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() - _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) - require.Nil(t, err) + _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) + require.Nil(t, nErr) ch1 := &model.Channel{ TeamId: teamId, diff --git a/store/timerlayer/timerlayer.go b/store/timerlayer/timerlayer.go index 008818319b..c894a8c37e 100644 --- a/store/timerlayer/timerlayer.go +++ b/store/timerlayer/timerlayer.go @@ -6490,7 +6490,7 @@ func (s *TimerLayerTeamStore) Save(team *model.Team) (*model.Team, *model.AppErr return result, err } -func (s *TimerLayerTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, *model.AppError) { +func (s *TimerLayerTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { start := timemodule.Now() result, err := s.TeamStore.SaveMember(member, maxUsersPerTeam) @@ -6506,7 +6506,7 @@ func (s *TimerLayerTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTe return result, err } -func (s *TimerLayerTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, *model.AppError) { +func (s *TimerLayerTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, error) { start := timemodule.Now() result, err := s.TeamStore.SaveMultipleMembers(members, maxUsersPerTeam)