mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Migration of TeamStore Part 1 (#15246)

Просмотр исходного кода 
Automatic Merge
Этот коммит содержится в:
Rodrigo Villablanca
2020-09-03 00:29:57 -04:00
коммит произвёл GitHub
родитель 953899ad95
Коммит 54f86e7fb1
29 изменённых файлов: 1131 добавлений и 616 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

56
store/storetest/channel_store.go
Просмотреть файл

@@ -925,8 +925,8 @@ func testChannelSaveMember(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr := ss.Team().Save(team)
require.Nil(t, nErr)
channel := &model.Channel{
DisplayName: "DisplayName",
@@ -934,7 +934,7 @@ func testChannelSaveMember(t *testing.T, ss store.Store) {
Type: model.CHANNEL_OPEN,
TeamId: team.Id,
}
channel, nErr := ss.Channel().Save(channel, -1)
channel, nErr = ss.Channel().Save(channel, -1)
require.Nil(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
@@ -1086,8 +1086,8 @@ func testChannelSaveMember(t *testing.T, ss store.Store) {
SchemeId: &ts.Id,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr = ss.Team().Save(team)
require.Nil(t, nErr)
channel := &model.Channel{
DisplayName: "DisplayName",
@@ -1246,8 +1246,8 @@ func testChannelSaveMember(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr = ss.Team().Save(team)
require.Nil(t, nErr)
channel, nErr := ss.Channel().Save(&model.Channel{
DisplayName: "DisplayName",
@@ -1422,8 +1422,8 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr := ss.Team().Save(team)
require.Nil(t, nErr)
channel := &model.Channel{
DisplayName: "DisplayName",
@@ -1431,7 +1431,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) {
Type: model.CHANNEL_OPEN,
TeamId: team.Id,
}
channel, nErr := ss.Channel().Save(channel, -1)
channel, nErr = ss.Channel().Save(channel, -1)
require.Nil(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
@@ -1597,8 +1597,8 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) {
SchemeId: &ts.Id,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr = ss.Team().Save(team)
require.Nil(t, nErr)
channel := &model.Channel{
DisplayName: "DisplayName",
@@ -1771,8 +1771,8 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr = ss.Team().Save(team)
require.Nil(t, nErr)
channel, nErr := ss.Channel().Save(&model.Channel{
DisplayName: "DisplayName",
@@ -1948,8 +1948,8 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr := ss.Team().Save(team)
require.Nil(t, nErr)
channel := &model.Channel{
DisplayName: "DisplayName",
@@ -1957,7 +1957,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) {
Type: model.CHANNEL_OPEN,
TeamId: team.Id,
}
channel, nErr := ss.Channel().Save(channel, -1)
channel, nErr = ss.Channel().Save(channel, -1)
require.Nil(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
@@ -2111,8 +2111,8 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) {
SchemeId: &ts.Id,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr = ss.Team().Save(team)
require.Nil(t, nErr)
channel := &model.Channel{
DisplayName: "DisplayName",
@@ -2273,8 +2273,8 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr = ss.Team().Save(team)
require.Nil(t, nErr)
channel, nErr := ss.Channel().Save(&model.Channel{
DisplayName: "DisplayName",
@@ -2451,8 +2451,8 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr := ss.Team().Save(team)
require.Nil(t, nErr)
channel := &model.Channel{
DisplayName: "DisplayName",
@@ -2460,7 +2460,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) {
Type: model.CHANNEL_OPEN,
TeamId: team.Id,
}
channel, nErr := ss.Channel().Save(channel, -1)
channel, nErr = ss.Channel().Save(channel, -1)
require.Nil(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
@@ -2621,8 +2621,8 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) {
SchemeId: &ts.Id,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr = ss.Team().Save(team)
require.Nil(t, nErr)
channel := &model.Channel{
DisplayName: "DisplayName",
@@ -2790,8 +2790,8 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr = ss.Team().Save(team)
require.Nil(t, nErr)
channel, nErr := ss.Channel().Save(&model.Channel{
DisplayName: "DisplayName",

6
store/storetest/compliance_store.go
Просмотреть файл

@@ -31,13 +31,13 @@ func cleanupStoreState(t *testing.T, ss store.Store) {
allChannels, nErr := ss.Channel().GetAllChannels(0, 100000, store.ChannelSearchOpts{IncludeDeleted: true})
require.Nilf(t, nErr, "error cleaning all test channels: %v", nErr)
for _, channel := range *allChannels {
nErr := ss.Channel().PermanentDelete(channel.Id)
nErr = ss.Channel().PermanentDelete(channel.Id)
require.Nil(t, nErr, "failed cleaning up test channel %s", channel.Id)
}
//remove existing teams
allTeams, err := ss.Team().GetAll()
require.Nilf(t, err, "error cleaning all test teams: %v", err)
allTeams, nErr := ss.Team().GetAll()
require.Nilf(t, nErr, "error cleaning all test teams: %v", nErr)
for _, team := range allTeams {
err := ss.Team().PermanentDelete(team.Id)
require.Nil(t, err, "failed cleaning up test team %s", team.Id)

70
store/storetest/group_store.go
Просмотреть файл

@@ -1071,8 +1071,8 @@ func testCreateGroupSyncable(t *testing.T, ss store.Store) {
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
}
team, err := ss.Team().Save(t1)
require.Nil(t, err)
team, nErr := ss.Team().Save(t1)
require.Nil(t, nErr)
// New GroupSyncable, happy path
gt1 := model.NewGroupTeam(group.Id, team.Id, false)
@@ -1108,8 +1108,8 @@ func testGetGroupSyncable(t *testing.T, ss store.Store) {
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
}
team, err := ss.Team().Save(t1)
require.Nil(t, err)
team, nErr := ss.Team().Save(t1)
require.Nil(t, nErr)
// Create GroupSyncable
gt1 := model.NewGroupTeam(group.Id, team.Id, false)
@@ -1157,8 +1157,8 @@ func testGetAllGroupSyncablesByGroup(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
}
var team *model.Team
team, err = ss.Team().Save(t1)
require.Nil(t, err)
team, nErr := ss.Team().Save(t1)
require.Nil(t, nErr)
// create groupteam
var groupTeam *model.GroupSyncable
@@ -1208,8 +1208,8 @@ func testUpdateGroupSyncable(t *testing.T, ss store.Store) {
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
}
team, err := ss.Team().Save(t1)
require.Nil(t, err)
team, nErr := ss.Team().Save(t1)
require.Nil(t, nErr)
// New GroupSyncable, happy path
gt1 := model.NewGroupTeam(group.Id, team.Id, false)
@@ -1274,8 +1274,8 @@ func testDeleteGroupSyncable(t *testing.T, ss store.Store) {
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
}
team, err := ss.Team().Save(t1)
require.Nil(t, err)
team, nErr := ss.Team().Save(t1)
require.Nil(t, nErr)
// Create GroupSyncable
gt1 := model.NewGroupTeam(group.Id, team.Id, false)
@@ -1339,8 +1339,8 @@ func testTeamMembersToAdd(t *testing.T, ss store.Store) {
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr := ss.Team().Save(team)
require.Nil(t, nErr)
// Create GroupTeam
syncable, err := ss.Group().CreateGroupSyncable(model.NewGroupTeam(group.Id, team.Id, true))
@@ -1416,16 +1416,16 @@ func testTeamMembersToAdd(t *testing.T, ss store.Store) {
// No result if Team deleted
team.DeleteAt = model.GetMillis()
team, err = ss.Team().Update(team)
require.Nil(t, err)
team, nErr = ss.Team().Update(team)
require.Nil(t, nErr)
teamMembers, err = ss.Group().TeamMembersToAdd(0, nil)
require.Nil(t, err)
require.Empty(t, teamMembers)
// reset state of team and verify
team.DeleteAt = 0
team, err = ss.Team().Update(team)
require.Nil(t, err)
team, nErr = ss.Team().Update(team)
require.Nil(t, nErr)
teamMembers, err = ss.Group().TeamMembersToAdd(0, nil)
require.Nil(t, err)
require.Len(t, teamMembers, 1)
@@ -1459,7 +1459,7 @@ func testTeamMembersToAdd(t *testing.T, ss store.Store) {
require.Len(t, teamMembers, 1)
// adding team membership stops returning result
_, nErr := ss.Team().SaveMember(&model.TeamMember{
_, nErr = ss.Team().SaveMember(&model.TeamMember{
TeamId: team.Id,
UserId: user.Id,
}, 999)
@@ -1524,8 +1524,8 @@ func testTeamMembersToAddSingleTeam(t *testing.T, ss store.Store) {
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
}
team1, err = ss.Team().Save(team1)
require.Nil(t, err)
team1, nErr := ss.Team().Save(team1)
require.Nil(t, nErr)
team2 := &model.Team{
DisplayName: "Name",
@@ -1537,8 +1537,8 @@ func testTeamMembersToAddSingleTeam(t *testing.T, ss store.Store) {
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
}
team2, err = ss.Team().Save(team2)
require.Nil(t, err)
team2, nErr = ss.Team().Save(team2)
require.Nil(t, nErr)
_, err = ss.Group().CreateGroupSyncable(model.NewGroupTeam(group1.Id, team1.Id, true))
require.Nil(t, err)
@@ -1916,8 +1916,8 @@ func testTeamMembersToRemoveSingleTeam(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
GroupConstrained: model.NewBool(true),
}
team1, err = ss.Team().Save(team1)
require.Nil(t, err)
team1, nErr := ss.Team().Save(team1)
require.Nil(t, nErr)
team2 := &model.Team{
DisplayName: "Name",
@@ -1930,18 +1930,18 @@ func testTeamMembersToRemoveSingleTeam(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
GroupConstrained: model.NewBool(true),
}
team2, err = ss.Team().Save(team2)
require.Nil(t, err)
team2, nErr = ss.Team().Save(team2)
require.Nil(t, nErr)
for _, user := range []*model.User{user1, user2} {
_, nErr := ss.Team().SaveMember(&model.TeamMember{
_, nErr = ss.Team().SaveMember(&model.TeamMember{
TeamId: team1.Id,
UserId: user.Id,
}, 999)
require.Nil(t, nErr)
}
_, nErr := ss.Team().SaveMember(&model.TeamMember{
_, nErr = ss.Team().SaveMember(&model.TeamMember{
TeamId: team2.Id,
UserId: user3.Id,
}, 999)
@@ -2189,8 +2189,8 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData
Type: model.TEAM_INVITE,
GroupConstrained: model.NewBool(true),
}
teamConstrained, err = ss.Team().Save(teamConstrained)
require.Nil(t, err)
teamConstrained, nErr = ss.Team().Save(teamConstrained)
require.Nil(t, nErr)
teamUnconstrained := &model.Team{
DisplayName: "Name",
@@ -2202,8 +2202,8 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_INVITE,
}
teamUnconstrained, err = ss.Team().Save(teamUnconstrained)
require.Nil(t, err)
teamUnconstrained, nErr = ss.Team().Save(teamUnconstrained)
require.Nil(t, nErr)
// create groupteams
_, err = ss.Group().CreateGroupSyncable(model.NewGroupTeam(group.Id, teamConstrained.Id, true))
@@ -3900,8 +3900,8 @@ func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, ss store.Store)
Name: "zz" + model.NewId(),
Type: model.CHANNEL_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr := ss.Team().Save(team)
require.Nil(t, nErr)
_, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{
AutoAdd: true,
@@ -4003,8 +4003,8 @@ func groupTestPermittedSyncableAdminsTeam(t *testing.T, ss store.Store) {
Name: "zz" + model.NewId(),
Type: model.CHANNEL_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr := ss.Team().Save(team)
require.Nil(t, nErr)
_, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{
AutoAdd: true,

220
store/storetest/mocks/TeamStore.go
Просмотреть файл

@@ -38,7 +38,7 @@ func (_m *TeamStore) AnalyticsGetTeamCountForScheme(schemeId string) (int64, *mo
}
// AnalyticsPrivateTeamCount provides a mock function with given fields:
func (_m *TeamStore) AnalyticsPrivateTeamCount() (int64, *model.AppError) {
func (_m *TeamStore) AnalyticsPrivateTeamCount() (int64, error) {
ret := _m.Called()
var r0 int64
@@ -48,20 +48,18 @@ func (_m *TeamStore) AnalyticsPrivateTeamCount() (int64, *model.AppError) {
r0 = ret.Get(0).(int64)
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func() error); ok {
r1 = rf()
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// AnalyticsPublicTeamCount provides a mock function with given fields:
func (_m *TeamStore) AnalyticsPublicTeamCount() (int64, *model.AppError) {
func (_m *TeamStore) AnalyticsPublicTeamCount() (int64, error) {
ret := _m.Called()
var r0 int64
@@ -71,20 +69,18 @@ func (_m *TeamStore) AnalyticsPublicTeamCount() (int64, *model.AppError) {
r0 = ret.Get(0).(int64)
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func() error); ok {
r1 = rf()
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// AnalyticsTeamCount provides a mock function with given fields: includeDeleted
func (_m *TeamStore) AnalyticsTeamCount(includeDeleted bool) (int64, *model.AppError) {
func (_m *TeamStore) AnalyticsTeamCount(includeDeleted bool) (int64, error) {
ret := _m.Called(includeDeleted)
var r0 int64
@@ -94,13 +90,11 @@ func (_m *TeamStore) AnalyticsTeamCount(includeDeleted bool) (int64, *model.AppE
r0 = ret.Get(0).(int64)
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(bool) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(bool) error); ok {
r1 = rf(includeDeleted)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -128,7 +122,7 @@ func (_m *TeamStore) ClearCaches() {
}
// Get provides a mock function with given fields: id
func (_m *TeamStore) Get(id string) (*model.Team, *model.AppError) {
func (_m *TeamStore) Get(id string) (*model.Team, error) {
ret := _m.Called(id)
var r0 *model.Team
@@ -140,13 +134,11 @@ func (_m *TeamStore) Get(id string) (*model.Team, *model.AppError) {
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(id)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -176,7 +168,7 @@ func (_m *TeamStore) GetActiveMemberCount(teamId string, restrictions *model.Vie
}
// GetAll provides a mock function with given fields:
func (_m *TeamStore) GetAll() ([]*model.Team, *model.AppError) {
func (_m *TeamStore) GetAll() ([]*model.Team, error) {
ret := _m.Called()
var r0 []*model.Team
@@ -188,13 +180,11 @@ func (_m *TeamStore) GetAll() ([]*model.Team, *model.AppError) {
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func() error); ok {
r1 = rf()
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -226,7 +216,7 @@ func (_m *TeamStore) GetAllForExportAfter(limit int, afterId string) ([]*model.T
}
// GetAllPage provides a mock function with given fields: offset, limit
func (_m *TeamStore) GetAllPage(offset int, limit int) ([]*model.Team, *model.AppError) {
func (_m *TeamStore) GetAllPage(offset int, limit int) ([]*model.Team, error) {
ret := _m.Called(offset, limit)
var r0 []*model.Team
@@ -238,20 +228,18 @@ func (_m *TeamStore) GetAllPage(offset int, limit int) ([]*model.Team, *model.Ap
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(int, int) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(int, int) error); ok {
r1 = rf(offset, limit)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetAllPrivateTeamListing provides a mock function with given fields:
func (_m *TeamStore) GetAllPrivateTeamListing() ([]*model.Team, *model.AppError) {
func (_m *TeamStore) GetAllPrivateTeamListing() ([]*model.Team, error) {
ret := _m.Called()
var r0 []*model.Team
@@ -263,20 +251,18 @@ func (_m *TeamStore) GetAllPrivateTeamListing() ([]*model.Team, *model.AppError)
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func() error); ok {
r1 = rf()
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetAllPrivateTeamPageListing provides a mock function with given fields: offset, limit
func (_m *TeamStore) GetAllPrivateTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError) {
func (_m *TeamStore) GetAllPrivateTeamPageListing(offset int, limit int) ([]*model.Team, error) {
ret := _m.Called(offset, limit)
var r0 []*model.Team
@@ -288,20 +274,18 @@ func (_m *TeamStore) GetAllPrivateTeamPageListing(offset int, limit int) ([]*mod
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(int, int) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(int, int) error); ok {
r1 = rf(offset, limit)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetAllPublicTeamPageListing provides a mock function with given fields: offset, limit
func (_m *TeamStore) GetAllPublicTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError) {
func (_m *TeamStore) GetAllPublicTeamPageListing(offset int, limit int) ([]*model.Team, error) {
ret := _m.Called(offset, limit)
var r0 []*model.Team
@@ -313,20 +297,18 @@ func (_m *TeamStore) GetAllPublicTeamPageListing(offset int, limit int) ([]*mode
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(int, int) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(int, int) error); ok {
r1 = rf(offset, limit)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetAllTeamListing provides a mock function with given fields:
func (_m *TeamStore) GetAllTeamListing() ([]*model.Team, *model.AppError) {
func (_m *TeamStore) GetAllTeamListing() ([]*model.Team, error) {
ret := _m.Called()
var r0 []*model.Team
@@ -338,20 +320,18 @@ func (_m *TeamStore) GetAllTeamListing() ([]*model.Team, *model.AppError) {
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func() error); ok {
r1 = rf()
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetAllTeamPageListing provides a mock function with given fields: offset, limit
func (_m *TeamStore) GetAllTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError) {
func (_m *TeamStore) GetAllTeamPageListing(offset int, limit int) ([]*model.Team, error) {
ret := _m.Called(offset, limit)
var r0 []*model.Team
@@ -363,20 +343,18 @@ func (_m *TeamStore) GetAllTeamPageListing(offset int, limit int) ([]*model.Team
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(int, int) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(int, int) error); ok {
r1 = rf(offset, limit)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetByInviteId provides a mock function with given fields: inviteId
func (_m *TeamStore) GetByInviteId(inviteId string) (*model.Team, *model.AppError) {
func (_m *TeamStore) GetByInviteId(inviteId string) (*model.Team, error) {
ret := _m.Called(inviteId)
var r0 *model.Team
@@ -388,20 +366,18 @@ func (_m *TeamStore) GetByInviteId(inviteId string) (*model.Team, *model.AppErro
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(inviteId)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetByName provides a mock function with given fields: name
func (_m *TeamStore) GetByName(name string) (*model.Team, *model.AppError) {
func (_m *TeamStore) GetByName(name string) (*model.Team, error) {
ret := _m.Called(name)
var r0 *model.Team
@@ -413,20 +389,18 @@ func (_m *TeamStore) GetByName(name string) (*model.Team, *model.AppError) {
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(name)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetByNames provides a mock function with given fields: name
func (_m *TeamStore) GetByNames(name []string) ([]*model.Team, *model.AppError) {
func (_m *TeamStore) GetByNames(name []string) ([]*model.Team, error) {
ret := _m.Called(name)
var r0 []*model.Team
@@ -438,13 +412,11 @@ func (_m *TeamStore) GetByNames(name []string) ([]*model.Team, *model.AppError)
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func([]string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func([]string) error); ok {
r1 = rf(name)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -626,7 +598,7 @@ func (_m *TeamStore) GetTeamsByScheme(schemeId string, offset int, limit int) ([
}
// GetTeamsByUserId provides a mock function with given fields: userId
func (_m *TeamStore) GetTeamsByUserId(userId string) ([]*model.Team, *model.AppError) {
func (_m *TeamStore) GetTeamsByUserId(userId string) ([]*model.Team, error) {
ret := _m.Called(userId)
var r0 []*model.Team
@@ -638,13 +610,11 @@ func (_m *TeamStore) GetTeamsByUserId(userId string) ([]*model.Team, *model.AppE
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(userId)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -802,16 +772,14 @@ func (_m *TeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) (m
}
// PermanentDelete provides a mock function with given fields: teamId
func (_m *TeamStore) PermanentDelete(teamId string) *model.AppError {
func (_m *TeamStore) PermanentDelete(teamId string) error {
ret := _m.Called(teamId)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(teamId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
@@ -898,7 +866,7 @@ func (_m *TeamStore) ResetAllTeamSchemes() *model.AppError {
}
// Save provides a mock function with given fields: team
func (_m *TeamStore) Save(team *model.Team) (*model.Team, *model.AppError) {
func (_m *TeamStore) Save(team *model.Team) (*model.Team, error) {
ret := _m.Called(team)
var r0 *model.Team
@@ -910,13 +878,11 @@ func (_m *TeamStore) Save(team *model.Team) (*model.Team, *model.AppError) {
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(*model.Team) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(*model.Team) error); ok {
r1 = rf(team)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -969,7 +935,7 @@ func (_m *TeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPe
}
// SearchAll provides a mock function with given fields: term, opts
func (_m *TeamStore) SearchAll(term string, opts *model.TeamSearch) ([]*model.Team, *model.AppError) {
func (_m *TeamStore) SearchAll(term string, opts *model.TeamSearch) ([]*model.Team, error) {
ret := _m.Called(term, opts)
var r0 []*model.Team
@@ -981,20 +947,18 @@ func (_m *TeamStore) SearchAll(term string, opts *model.TeamSearch) ([]*model.Te
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, *model.TeamSearch) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, *model.TeamSearch) error); ok {
r1 = rf(term, opts)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// SearchAllPaged provides a mock function with given fields: term, opts
func (_m *TeamStore) SearchAllPaged(term string, opts *model.TeamSearch) ([]*model.Team, int64, *model.AppError) {
func (_m *TeamStore) SearchAllPaged(term string, opts *model.TeamSearch) ([]*model.Team, int64, error) {
ret := _m.Called(term, opts)
var r0 []*model.Team
@@ -1013,20 +977,18 @@ func (_m *TeamStore) SearchAllPaged(term string, opts *model.TeamSearch) ([]*mod
r1 = ret.Get(1).(int64)
}
var r2 *model.AppError
if rf, ok := ret.Get(2).(func(string, *model.TeamSearch) *model.AppError); ok {
var r2 error
if rf, ok := ret.Get(2).(func(string, *model.TeamSearch) error); ok {
r2 = rf(term, opts)
} else {
if ret.Get(2) != nil {
r2 = ret.Get(2).(*model.AppError)
}
r2 = ret.Error(2)
}
return r0, r1, r2
}
// SearchOpen provides a mock function with given fields: term
func (_m *TeamStore) SearchOpen(term string) ([]*model.Team, *model.AppError) {
func (_m *TeamStore) SearchOpen(term string) ([]*model.Team, error) {
ret := _m.Called(term)
var r0 []*model.Team
@@ -1038,20 +1000,18 @@ func (_m *TeamStore) SearchOpen(term string) ([]*model.Team, *model.AppError) {
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(term)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// SearchPrivate provides a mock function with given fields: term
func (_m *TeamStore) SearchPrivate(term string) ([]*model.Team, *model.AppError) {
func (_m *TeamStore) SearchPrivate(term string) ([]*model.Team, error) {
ret := _m.Called(term)
var r0 []*model.Team
@@ -1063,20 +1023,18 @@ func (_m *TeamStore) SearchPrivate(term string) ([]*model.Team, *model.AppError)
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(term)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// Update provides a mock function with given fields: team
func (_m *TeamStore) Update(team *model.Team) (*model.Team, *model.AppError) {
func (_m *TeamStore) Update(team *model.Team) (*model.Team, error) {
ret := _m.Called(team)
var r0 *model.Team
@@ -1088,13 +1046,11 @@ func (_m *TeamStore) Update(team *model.Team) (*model.Team, *model.AppError) {
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(*model.Team) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(*model.Team) error); ok {
r1 = rf(team)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1

36
store/storetest/team_store.go
Просмотреть файл

@@ -1298,8 +1298,8 @@ func testTeamSaveMember(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr := ss.Team().Save(team)
require.Nil(t, nErr)
testCases := []struct {
Name string
@@ -1449,8 +1449,8 @@ func testTeamSaveMember(t *testing.T, ss store.Store) {
SchemeId: &ts.Id,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr = ss.Team().Save(team)
require.Nil(t, nErr)
testCases := []struct {
Name string
@@ -1654,8 +1654,8 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr := ss.Team().Save(team)
require.Nil(t, nErr)
testCases := []struct {
Name string
@@ -1817,8 +1817,8 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) {
SchemeId: &ts.Id,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr = ss.Team().Save(team)
require.Nil(t, nErr)
testCases := []struct {
Name string
@@ -1981,11 +1981,11 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr := ss.Team().Save(team)
require.Nil(t, nErr)
member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id}
member, nErr := ss.Team().SaveMember(member, -1)
member, nErr = ss.Team().SaveMember(member, -1)
require.Nil(t, nErr)
testCases := []struct {
@@ -2132,8 +2132,8 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) {
SchemeId: &ts.Id,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr = ss.Team().Save(team)
require.Nil(t, nErr)
member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id}
member, nErr = ss.Team().SaveMember(member, -1)
@@ -2288,13 +2288,13 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) {
Type: model.TEAM_OPEN,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr := ss.Team().Save(team)
require.Nil(t, nErr)
member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id}
otherMember := &model.TeamMember{TeamId: team.Id, UserId: u2.Id}
var members []*model.TeamMember
members, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1)
members, nErr = ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1)
require.Nil(t, nErr)
require.Len(t, members, 2)
member = members[0]
@@ -2872,13 +2872,13 @@ func testGetTeamMember(t *testing.T, ss store.Store) {
require.Nil(t, nErr)
t.Log(s2)
t2, err := ss.Team().Save(&model.Team{
t2, nErr := ss.Team().Save(&model.Team{
DisplayName: "DisplayName",
Name: "z-z-z" + model.NewId() + "b",
Type: model.TEAM_OPEN,
SchemeId: &s2.Id,
})
require.Nil(t, err)
require.Nil(t, nErr)
defer func() {
ss.Team().PermanentDelete(t2.Id)