[MM-63772] Add LDAP setting to re-add removed members (#30787)

server/channels/store/storetest/group_store.go

@@ -2087,7 +2087,7 @@ func testTeamMembersToAdd(t *testing.T, rctx request.CTX, ss store.Store) {
 	require.NoError(t, err)
 	require.Empty(t, teamMembers)
 
-	// If includeRemovedMembers is set to true, removed members should be added back in
+	// If reAddRemovedMembers is set to true, removed members should be added back in
 	teamMembers, err = ss.Group().TeamMembersToAdd(0, nil, true)
 	require.NoError(t, err)
 	require.Len(t, teamMembers, 1)
@@ -2352,7 +2352,7 @@ func testChannelMembersToAdd(t *testing.T, rctx request.CTX, ss store.Store) {
 	require.NoError(t, err)
 	require.Len(t, channelMembers, 1)
 
-	// If includeRemovedMembers is set to true, removed members should be added back in
+	// If reAddRemovedMembers is set to true, removed members should be added back in
 	nErr = ss.ChannelMemberHistory().LogLeaveEvent(user.Id, channel.Id, model.GetMillis())
 	require.NoError(t, nErr)
 	channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil, true)

server/channels/store/storetest/mocks/GroupStore.go

@@ -74,9 +74,9 @@ func (_m *GroupStore) ChannelMembersMinusGroupMembers(channelID string, groupIDs
 	return r0, r1
 }
 
-// ChannelMembersToAdd provides a mock function with given fields: since, channelID, includeRemovedMembers
-func (_m *GroupStore) ChannelMembersToAdd(since int64, channelID *string, includeRemovedMembers bool) ([]*model.UserChannelIDPair, error) {
-	ret := _m.Called(since, channelID, includeRemovedMembers)
+// ChannelMembersToAdd provides a mock function with given fields: since, channelID, reAddRemovedMembers
+func (_m *GroupStore) ChannelMembersToAdd(since int64, channelID *string, reAddRemovedMembers bool) ([]*model.UserChannelIDPair, error) {
+	ret := _m.Called(since, channelID, reAddRemovedMembers)
 
 	if len(ret) == 0 {
 		panic("no return value specified for ChannelMembersToAdd")
@@ -85,10 +85,10 @@ func (_m *GroupStore) ChannelMembersToAdd(since int64, channelID *string, includ
 	var r0 []*model.UserChannelIDPair
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, *string, bool) ([]*model.UserChannelIDPair, error)); ok {
-		return rf(since, channelID, includeRemovedMembers)
+		return rf(since, channelID, reAddRemovedMembers)
 	}
 	if rf, ok := ret.Get(0).(func(int64, *string, bool) []*model.UserChannelIDPair); ok {
-		r0 = rf(since, channelID, includeRemovedMembers)
+		r0 = rf(since, channelID, reAddRemovedMembers)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).([]*model.UserChannelIDPair)
@@ -96,7 +96,7 @@ func (_m *GroupStore) ChannelMembersToAdd(since int64, channelID *string, includ
 	}
 
 	if rf, ok := ret.Get(1).(func(int64, *string, bool) error); ok {
-		r1 = rf(since, channelID, includeRemovedMembers)
+		r1 = rf(since, channelID, reAddRemovedMembers)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -1414,9 +1414,9 @@ func (_m *GroupStore) TeamMembersMinusGroupMembers(teamID string, groupIDs []str
 	return r0, r1
 }
 
-// TeamMembersToAdd provides a mock function with given fields: since, teamID, includeRemovedMembers
-func (_m *GroupStore) TeamMembersToAdd(since int64, teamID *string, includeRemovedMembers bool) ([]*model.UserTeamIDPair, error) {
-	ret := _m.Called(since, teamID, includeRemovedMembers)
+// TeamMembersToAdd provides a mock function with given fields: since, teamID, reAddRemovedMembers
+func (_m *GroupStore) TeamMembersToAdd(since int64, teamID *string, reAddRemovedMembers bool) ([]*model.UserTeamIDPair, error) {
+	ret := _m.Called(since, teamID, reAddRemovedMembers)
 
 	if len(ret) == 0 {
 		panic("no return value specified for TeamMembersToAdd")
@@ -1425,10 +1425,10 @@ func (_m *GroupStore) TeamMembersToAdd(since int64, teamID *string, includeRemov
 	var r0 []*model.UserTeamIDPair
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, *string, bool) ([]*model.UserTeamIDPair, error)); ok {
-		return rf(since, teamID, includeRemovedMembers)
+		return rf(since, teamID, reAddRemovedMembers)
 	}
 	if rf, ok := ret.Get(0).(func(int64, *string, bool) []*model.UserTeamIDPair); ok {
-		r0 = rf(since, teamID, includeRemovedMembers)
+		r0 = rf(since, teamID, reAddRemovedMembers)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).([]*model.UserTeamIDPair)
@@ -1436,7 +1436,7 @@ func (_m *GroupStore) TeamMembersToAdd(since int64, teamID *string, includeRemov
 	}
 
 	if rf, ok := ret.Get(1).(func(int64, *string, bool) error); ok {
-		r1 = rf(since, teamID, includeRemovedMembers)
+		r1 = rf(since, teamID, reAddRemovedMembers)
 	} else {
 		r1 = ret.Error(1)
 	}