Revert "Mm 30807 granular data retention scaffold (#16891)" (#17437)

This reverts commit 3ea75332e7.

einterfaces/data_retention.go

@@ -8,19 +8,5 @@ import (
 )
 
 type DataRetentionInterface interface {
-	GetGlobalPolicy() (*model.GlobalRetentionPolicy, *model.AppError)
-	GetPolicies(offset, limit int) (*model.RetentionPolicyWithTeamAndChannelCountsList, *model.AppError)
-	GetPoliciesCount() (int64, *model.AppError)
-	GetPolicy(policyID string) (*model.RetentionPolicyWithTeamAndChannelCounts, *model.AppError)
-	CreatePolicy(policy *model.RetentionPolicyWithTeamAndChannelIDs) (*model.RetentionPolicyWithTeamAndChannelCounts, *model.AppError)
-	PatchPolicy(patch *model.RetentionPolicyWithTeamAndChannelIDs) (*model.RetentionPolicyWithTeamAndChannelCounts, *model.AppError)
-	DeletePolicy(policyID string) *model.AppError
-	GetTeamsForPolicy(policyID string, offset, limit int) (*model.TeamsWithCount, *model.AppError)
-	AddTeamsToPolicy(policyID string, teamIDs []string) *model.AppError
-	RemoveTeamsFromPolicy(policyID string, teamIDs []string) *model.AppError
-	GetChannelsForPolicy(policyID string, offset, limit int) (*model.ChannelsWithCount, *model.AppError)
-	AddChannelsToPolicy(policyID string, channelIDs []string) *model.AppError
-	RemoveChannelsFromPolicy(policyID string, channelIDs []string) *model.AppError
-	GetTeamPoliciesForUser(userID string, offset, limit int) (*model.RetentionPolicyForTeamList, *model.AppError)
-	GetChannelPoliciesForUser(userID string, offset, limit int) (*model.RetentionPolicyForChannelList, *model.AppError)
+	GetPolicy() (*model.DataRetentionPolicy, *model.AppError)
 }

einterfaces/mocks/DataRetentionInterface.go

@@ -14,139 +14,16 @@ type DataRetentionInterface struct {
 	mock.Mock
 }
 
-// AddChannelsToPolicy provides a mock function with given fields: policyID, channelIDs
-func (_m *DataRetentionInterface) AddChannelsToPolicy(policyID string, channelIDs []string) *model.AppError {
-	ret := _m.Called(policyID, channelIDs)
-
-	var r0 *model.AppError
-	if rf, ok := ret.Get(0).(func(string, []string) *model.AppError); ok {
-		r0 = rf(policyID, channelIDs)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.AppError)
-		}
-	}
-
-	return r0
-}
-
-// AddTeamsToPolicy provides a mock function with given fields: policyID, teamIDs
-func (_m *DataRetentionInterface) AddTeamsToPolicy(policyID string, teamIDs []string) *model.AppError {
-	ret := _m.Called(policyID, teamIDs)
-
-	var r0 *model.AppError
-	if rf, ok := ret.Get(0).(func(string, []string) *model.AppError); ok {
-		r0 = rf(policyID, teamIDs)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.AppError)
-		}
-	}
-
-	return r0
-}
-
-// CreatePolicy provides a mock function with given fields: policy
-func (_m *DataRetentionInterface) CreatePolicy(policy *model.RetentionPolicyWithTeamAndChannelIDs) (*model.RetentionPolicyWithTeamAndChannelCounts, *model.AppError) {
-	ret := _m.Called(policy)
-
-	var r0 *model.RetentionPolicyWithTeamAndChannelCounts
-	if rf, ok := ret.Get(0).(func(*model.RetentionPolicyWithTeamAndChannelIDs) *model.RetentionPolicyWithTeamAndChannelCounts); ok {
-		r0 = rf(policy)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.RetentionPolicyWithTeamAndChannelCounts)
-		}
-	}
-
-	var r1 *model.AppError
-	if rf, ok := ret.Get(1).(func(*model.RetentionPolicyWithTeamAndChannelIDs) *model.AppError); ok {
-		r1 = rf(policy)
-	} else {
-		if ret.Get(1) != nil {
-			r1 = ret.Get(1).(*model.AppError)
-		}
-	}
-
-	return r0, r1
-}
-
-// DeletePolicy provides a mock function with given fields: policyID
-func (_m *DataRetentionInterface) DeletePolicy(policyID string) *model.AppError {
-	ret := _m.Called(policyID)
-
-	var r0 *model.AppError
-	if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
-		r0 = rf(policyID)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.AppError)
-		}
-	}
-
-	return r0
-}
-
-// GetChannelPoliciesForUser provides a mock function with given fields: userID, offset, limit
-func (_m *DataRetentionInterface) GetChannelPoliciesForUser(userID string, offset int, limit int) (*model.RetentionPolicyForChannelList, *model.AppError) {
-	ret := _m.Called(userID, offset, limit)
-
-	var r0 *model.RetentionPolicyForChannelList
-	if rf, ok := ret.Get(0).(func(string, int, int) *model.RetentionPolicyForChannelList); ok {
-		r0 = rf(userID, offset, limit)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.RetentionPolicyForChannelList)
-		}
-	}
-
-	var r1 *model.AppError
-	if rf, ok := ret.Get(1).(func(string, int, int) *model.AppError); ok {
-		r1 = rf(userID, offset, limit)
-	} else {
-		if ret.Get(1) != nil {
-			r1 = ret.Get(1).(*model.AppError)
-		}
-	}
-
-	return r0, r1
-}
-
-// GetChannelsForPolicy provides a mock function with given fields: policyID, offset, limit
-func (_m *DataRetentionInterface) GetChannelsForPolicy(policyID string, offset int, limit int) (*model.ChannelsWithCount, *model.AppError) {
-	ret := _m.Called(policyID, offset, limit)
-
-	var r0 *model.ChannelsWithCount
-	if rf, ok := ret.Get(0).(func(string, int, int) *model.ChannelsWithCount); ok {
-		r0 = rf(policyID, offset, limit)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.ChannelsWithCount)
-		}
-	}
-
-	var r1 *model.AppError
-	if rf, ok := ret.Get(1).(func(string, int, int) *model.AppError); ok {
-		r1 = rf(policyID, offset, limit)
-	} else {
-		if ret.Get(1) != nil {
-			r1 = ret.Get(1).(*model.AppError)
-		}
-	}
-
-	return r0, r1
-}
-
-// GetGlobalPolicy provides a mock function with given fields:
-func (_m *DataRetentionInterface) GetGlobalPolicy() (*model.GlobalRetentionPolicy, *model.AppError) {
+// GetPolicy provides a mock function with given fields:
+func (_m *DataRetentionInterface) GetPolicy() (*model.DataRetentionPolicy, *model.AppError) {
 	ret := _m.Called()
 
-	var r0 *model.GlobalRetentionPolicy
-	if rf, ok := ret.Get(0).(func() *model.GlobalRetentionPolicy); ok {
+	var r0 *model.DataRetentionPolicy
+	if rf, ok := ret.Get(0).(func() *model.DataRetentionPolicy); ok {
 		r0 = rf()
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.GlobalRetentionPolicy)
+			r0 = ret.Get(0).(*model.DataRetentionPolicy)
 		}
 	}
 
@@ -161,183 +38,3 @@ func (_m *DataRetentionInterface) GetGlobalPolicy() (*model.GlobalRetentionPolic
 
 	return r0, r1
 }
-
-// GetPolicies provides a mock function with given fields: offset, limit
-func (_m *DataRetentionInterface) GetPolicies(offset int, limit int) (*model.RetentionPolicyWithTeamAndChannelCountsList, *model.AppError) {
-	ret := _m.Called(offset, limit)
-
-	var r0 *model.RetentionPolicyWithTeamAndChannelCountsList
-	if rf, ok := ret.Get(0).(func(int, int) *model.RetentionPolicyWithTeamAndChannelCountsList); ok {
-		r0 = rf(offset, limit)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.RetentionPolicyWithTeamAndChannelCountsList)
-		}
-	}
-
-	var r1 *model.AppError
-	if rf, ok := ret.Get(1).(func(int, int) *model.AppError); ok {
-		r1 = rf(offset, limit)
-	} else {
-		if ret.Get(1) != nil {
-			r1 = ret.Get(1).(*model.AppError)
-		}
-	}
-
-	return r0, r1
-}
-
-// GetPoliciesCount provides a mock function with given fields:
-func (_m *DataRetentionInterface) GetPoliciesCount() (int64, *model.AppError) {
-	ret := _m.Called()
-
-	var r0 int64
-	if rf, ok := ret.Get(0).(func() int64); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Get(0).(int64)
-	}
-
-	var r1 *model.AppError
-	if rf, ok := ret.Get(1).(func() *model.AppError); ok {
-		r1 = rf()
-	} else {
-		if ret.Get(1) != nil {
-			r1 = ret.Get(1).(*model.AppError)
-		}
-	}
-
-	return r0, r1
-}
-
-// GetPolicy provides a mock function with given fields: policyID
-func (_m *DataRetentionInterface) GetPolicy(policyID string) (*model.RetentionPolicyWithTeamAndChannelCounts, *model.AppError) {
-	ret := _m.Called(policyID)
-
-	var r0 *model.RetentionPolicyWithTeamAndChannelCounts
-	if rf, ok := ret.Get(0).(func(string) *model.RetentionPolicyWithTeamAndChannelCounts); ok {
-		r0 = rf(policyID)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.RetentionPolicyWithTeamAndChannelCounts)
-		}
-	}
-
-	var r1 *model.AppError
-	if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
-		r1 = rf(policyID)
-	} else {
-		if ret.Get(1) != nil {
-			r1 = ret.Get(1).(*model.AppError)
-		}
-	}
-
-	return r0, r1
-}
-
-// GetTeamPoliciesForUser provides a mock function with given fields: userID, offset, limit
-func (_m *DataRetentionInterface) GetTeamPoliciesForUser(userID string, offset int, limit int) (*model.RetentionPolicyForTeamList, *model.AppError) {
-	ret := _m.Called(userID, offset, limit)
-
-	var r0 *model.RetentionPolicyForTeamList
-	if rf, ok := ret.Get(0).(func(string, int, int) *model.RetentionPolicyForTeamList); ok {
-		r0 = rf(userID, offset, limit)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.RetentionPolicyForTeamList)
-		}
-	}
-
-	var r1 *model.AppError
-	if rf, ok := ret.Get(1).(func(string, int, int) *model.AppError); ok {
-		r1 = rf(userID, offset, limit)
-	} else {
-		if ret.Get(1) != nil {
-			r1 = ret.Get(1).(*model.AppError)
-		}
-	}
-
-	return r0, r1
-}
-
-// GetTeamsForPolicy provides a mock function with given fields: policyID, offset, limit
-func (_m *DataRetentionInterface) GetTeamsForPolicy(policyID string, offset int, limit int) (*model.TeamsWithCount, *model.AppError) {
-	ret := _m.Called(policyID, offset, limit)
-
-	var r0 *model.TeamsWithCount
-	if rf, ok := ret.Get(0).(func(string, int, int) *model.TeamsWithCount); ok {
-		r0 = rf(policyID, offset, limit)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.TeamsWithCount)
-		}
-	}
-
-	var r1 *model.AppError
-	if rf, ok := ret.Get(1).(func(string, int, int) *model.AppError); ok {
-		r1 = rf(policyID, offset, limit)
-	} else {
-		if ret.Get(1) != nil {
-			r1 = ret.Get(1).(*model.AppError)
-		}
-	}
-
-	return r0, r1
-}
-
-// PatchPolicy provides a mock function with given fields: patch
-func (_m *DataRetentionInterface) PatchPolicy(patch *model.RetentionPolicyWithTeamAndChannelIDs) (*model.RetentionPolicyWithTeamAndChannelCounts, *model.AppError) {
-	ret := _m.Called(patch)
-
-	var r0 *model.RetentionPolicyWithTeamAndChannelCounts
-	if rf, ok := ret.Get(0).(func(*model.RetentionPolicyWithTeamAndChannelIDs) *model.RetentionPolicyWithTeamAndChannelCounts); ok {
-		r0 = rf(patch)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.RetentionPolicyWithTeamAndChannelCounts)
-		}
-	}
-
-	var r1 *model.AppError
-	if rf, ok := ret.Get(1).(func(*model.RetentionPolicyWithTeamAndChannelIDs) *model.AppError); ok {
-		r1 = rf(patch)
-	} else {
-		if ret.Get(1) != nil {
-			r1 = ret.Get(1).(*model.AppError)
-		}
-	}
-
-	return r0, r1
-}
-
-// RemoveChannelsFromPolicy provides a mock function with given fields: policyID, channelIDs
-func (_m *DataRetentionInterface) RemoveChannelsFromPolicy(policyID string, channelIDs []string) *model.AppError {
-	ret := _m.Called(policyID, channelIDs)
-
-	var r0 *model.AppError
-	if rf, ok := ret.Get(0).(func(string, []string) *model.AppError); ok {
-		r0 = rf(policyID, channelIDs)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.AppError)
-		}
-	}
-
-	return r0
-}
-
-// RemoveTeamsFromPolicy provides a mock function with given fields: policyID, teamIDs
-func (_m *DataRetentionInterface) RemoveTeamsFromPolicy(policyID string, teamIDs []string) *model.AppError {
-	ret := _m.Called(policyID, teamIDs)
-
-	var r0 *model.AppError
-	if rf, ok := ret.Get(0).(func(string, []string) *model.AppError); ok {
-		r0 = rf(policyID, teamIDs)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.AppError)
-		}
-	}
-
-	return r0
-}