Migrate store methods to use request.Context instead of context.Context (#24836)

server/channels/app/teams/teams.go

@@ -4,10 +4,9 @@
 package teams
 
 import (
-	"context"
-
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/public/shared/request"
 )
 
 func (ts *TeamService) CreateTeam(team *model.Team) (*model.Team, error) {
@@ -130,7 +129,7 @@ func (ts *TeamService) PatchTeam(teamID string, patch *model.TeamPatch) (*model.
 // 1. a pointer to the team member, if successful
 // 2. a boolean: true if the user has a non-deleted team member for that team already, otherwise false.
 // 3. a pointer to an AppError if something went wrong.
-func (ts *TeamService) JoinUserToTeam(team *model.Team, user *model.User) (*model.TeamMember, bool, error) {
+func (ts *TeamService) JoinUserToTeam(c request.CTX, team *model.Team, user *model.User) (*model.TeamMember, bool, error) {
 	if !ts.IsTeamEmailAllowed(user, team) {
 		return nil, false, AcceptedDomainError
 	}
@@ -155,7 +154,7 @@ func (ts *TeamService) JoinUserToTeam(team *model.Team, user *model.User) (*mode
 		tm.SchemeAdmin = true
 	}
 
-	rtm, err := ts.store.GetMember(context.Background(), team.Id, user.Id)
+	rtm, err := ts.store.GetMember(c, team.Id, user.Id)
 	if err != nil {
 		// Membership appears to be missing. Lets try to add.
 		tmr, nErr := ts.store.SaveMember(tm, *ts.config().TeamSettings.MaxUsersPerTeam)
@@ -221,8 +220,8 @@ func (ts *TeamService) RemoveTeamMember(teamMember *model.TeamMember) error {
 }
 
 // GetMember return the team member from the team.
-func (ts *TeamService) GetMember(teamID string, userID string) (*model.TeamMember, error) {
-	member, err := ts.store.GetMember(context.Background(), teamID, userID)
+func (ts *TeamService) GetMember(c request.CTX, teamID string, userID string) (*model.TeamMember, error) {
+	member, err := ts.store.GetMember(c, teamID, userID)
 	if err != nil {
 		return nil, err
 	}

server/channels/app/teams/teams_test.go

@@ -59,7 +59,7 @@ func TestJoinUserToTeam(t *testing.T) {
 		ruser := th.CreateUser(&user)
 		defer th.DeleteUser(&user)
 
-		_, alreadyAdded, err := th.service.JoinUserToTeam(team, ruser)
+		_, alreadyAdded, err := th.service.JoinUserToTeam(th.Context, team, ruser)
 		require.False(t, alreadyAdded, "Should return already added equal to false")
 		require.NoError(t, err)
 	})
@@ -69,10 +69,10 @@ func TestJoinUserToTeam(t *testing.T) {
 		ruser := th.CreateUser(&user)
 		defer th.DeleteUser(&user)
 
-		_, _, err := th.service.JoinUserToTeam(team, ruser)
+		_, _, err := th.service.JoinUserToTeam(th.Context, team, ruser)
 		require.NoError(t, err)
 
-		_, alreadyAdded, err := th.service.JoinUserToTeam(team, ruser)
+		_, alreadyAdded, err := th.service.JoinUserToTeam(th.Context, team, ruser)
 		require.True(t, alreadyAdded, "Should return already added")
 		require.NoError(t, err)
 	})
@@ -82,12 +82,12 @@ func TestJoinUserToTeam(t *testing.T) {
 		ruser := th.CreateUser(&user)
 		defer th.DeleteUser(&user)
 
-		member, _, err := th.service.JoinUserToTeam(team, ruser)
+		member, _, err := th.service.JoinUserToTeam(th.Context, team, ruser)
 		require.NoError(t, err)
 		err = th.service.RemoveTeamMember(member)
 		require.NoError(t, err)
 
-		_, alreadyAdded, err := th.service.JoinUserToTeam(team, ruser)
+		_, alreadyAdded, err := th.service.JoinUserToTeam(th.Context, team, ruser)
 		require.False(t, alreadyAdded, "Should return already added equal to false")
 		require.NoError(t, err)
 	})
@@ -101,10 +101,10 @@ func TestJoinUserToTeam(t *testing.T) {
 		defer th.DeleteUser(&user1)
 		defer th.DeleteUser(&user2)
 
-		_, _, err := th.service.JoinUserToTeam(team, ruser1)
+		_, _, err := th.service.JoinUserToTeam(th.Context, team, ruser1)
 		require.NoError(t, err)
 
-		_, _, err = th.service.JoinUserToTeam(team, ruser2)
+		_, _, err = th.service.JoinUserToTeam(th.Context, team, ruser2)
 		require.Error(t, err, "Should fail")
 	})
 
@@ -118,14 +118,14 @@ func TestJoinUserToTeam(t *testing.T) {
 		defer th.DeleteUser(&user1)
 		defer th.DeleteUser(&user2)
 
-		member, _, err := th.service.JoinUserToTeam(team, ruser1)
+		member, _, err := th.service.JoinUserToTeam(th.Context, team, ruser1)
 		require.NoError(t, err)
 		err = th.service.RemoveTeamMember(member)
 		require.NoError(t, err)
-		_, _, err = th.service.JoinUserToTeam(team, ruser2)
+		_, _, err = th.service.JoinUserToTeam(th.Context, team, ruser2)
 		require.NoError(t, err)
 
-		_, _, err = th.service.JoinUserToTeam(team, ruser1)
+		_, _, err = th.service.JoinUserToTeam(th.Context, team, ruser1)
 		require.Error(t, err, "Should fail")
 	})
 }