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

TeamStore migration part 2 (#15396)

Просмотр исходного кода 
* Migration completed

* Fix tests

* Reduce to one line

* Fix: change to plain error

* Fix imports

* Trigger CI

* Fix i18

* Fix merge with master

* Trigger CI
Этот коммит содержится в:
Rodrigo Villablanca
2020-09-16 21:54:39 -03:00
коммит произвёл GitHub
родитель b329635b23
Коммит 1d4a7c0552
17 изменённых файлов: 609 добавлений и 369 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@@ -141,7 +141,7 @@ func (_m *TeamStore) Get(id string) (*model.Team, error) {
}
// GetActiveMemberCount provides a mock function with given fields: teamId, restrictions
func (_m *TeamStore) GetActiveMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, *model.AppError) {
func (_m *TeamStore) GetActiveMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, error) {
ret := _m.Called(teamId, restrictions)
var r0 int64
@@ -151,13 +151,11 @@ func (_m *TeamStore) GetActiveMemberCount(teamId string, restrictions *model.Vie
r0 = ret.Get(0).(int64)
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, *model.ViewUsersRestrictions) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, *model.ViewUsersRestrictions) error); ok {
r1 = rf(teamId, restrictions)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -417,7 +415,7 @@ func (_m *TeamStore) GetByNames(name []string) ([]*model.Team, error) {
}
// GetChannelUnreadsForAllTeams provides a mock function with given fields: excludeTeamId, userId
func (_m *TeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, userId string) ([]*model.ChannelUnread, *model.AppError) {
func (_m *TeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, userId string) ([]*model.ChannelUnread, error) {
ret := _m.Called(excludeTeamId, userId)
var r0 []*model.ChannelUnread
@@ -429,20 +427,18 @@ func (_m *TeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, userId s
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, string) error); ok {
r1 = rf(excludeTeamId, userId)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetChannelUnreadsForTeam provides a mock function with given fields: teamId, userId
func (_m *TeamStore) GetChannelUnreadsForTeam(teamId string, userId string) ([]*model.ChannelUnread, *model.AppError) {
func (_m *TeamStore) GetChannelUnreadsForTeam(teamId string, userId string) ([]*model.ChannelUnread, error) {
ret := _m.Called(teamId, userId)
var r0 []*model.ChannelUnread
@@ -454,20 +450,18 @@ func (_m *TeamStore) GetChannelUnreadsForTeam(teamId string, userId string) ([]*
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, string) error); ok {
r1 = rf(teamId, userId)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetMember provides a mock function with given fields: teamId, userId
func (_m *TeamStore) GetMember(teamId string, userId string) (*model.TeamMember, *model.AppError) {
func (_m *TeamStore) GetMember(teamId string, userId string) (*model.TeamMember, error) {
ret := _m.Called(teamId, userId)
var r0 *model.TeamMember
@@ -479,20 +473,18 @@ func (_m *TeamStore) GetMember(teamId string, userId string) (*model.TeamMember,
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, string) error); ok {
r1 = rf(teamId, userId)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetMembers provides a mock function with given fields: teamId, offset, limit, teamMembersGetOptions
func (_m *TeamStore) GetMembers(teamId string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, *model.AppError) {
func (_m *TeamStore) GetMembers(teamId string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, error) {
ret := _m.Called(teamId, offset, limit, teamMembersGetOptions)
var r0 []*model.TeamMember
@@ -504,20 +496,18 @@ func (_m *TeamStore) GetMembers(teamId string, offset int, limit int, teamMember
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, int, int, *model.TeamMembersGetOptions) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, int, int, *model.TeamMembersGetOptions) error); ok {
r1 = rf(teamId, offset, limit, teamMembersGetOptions)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetMembersByIds provides a mock function with given fields: teamId, userIds, restrictions
func (_m *TeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) {
func (_m *TeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error) {
ret := _m.Called(teamId, userIds, restrictions)
var r0 []*model.TeamMember
@@ -529,13 +519,11 @@ func (_m *TeamStore) GetMembersByIds(teamId string, userIds []string, restrictio
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, []string, *model.ViewUsersRestrictions) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, []string, *model.ViewUsersRestrictions) error); ok {
r1 = rf(teamId, userIds, restrictions)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -611,7 +599,7 @@ func (_m *TeamStore) GetTeamsByUserId(userId string) ([]*model.Team, error) {
}
// GetTeamsForUser provides a mock function with given fields: userId
func (_m *TeamStore) GetTeamsForUser(userId string) ([]*model.TeamMember, *model.AppError) {
func (_m *TeamStore) GetTeamsForUser(userId string) ([]*model.TeamMember, error) {
ret := _m.Called(userId)
var r0 []*model.TeamMember
@@ -623,20 +611,18 @@ func (_m *TeamStore) GetTeamsForUser(userId string) ([]*model.TeamMember, *model
}
}
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
}
// GetTeamsForUserWithPagination provides a mock function with given fields: userId, page, perPage
func (_m *TeamStore) GetTeamsForUserWithPagination(userId string, page int, perPage int) ([]*model.TeamMember, *model.AppError) {
func (_m *TeamStore) GetTeamsForUserWithPagination(userId string, page int, perPage int) ([]*model.TeamMember, error) {
ret := _m.Called(userId, page, perPage)
var r0 []*model.TeamMember
@@ -648,20 +634,18 @@ func (_m *TeamStore) GetTeamsForUserWithPagination(userId string, page int, perP
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, int, int) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, int, int) error); ok {
r1 = rf(userId, page, perPage)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetTotalMemberCount provides a mock function with given fields: teamId, restrictions
func (_m *TeamStore) GetTotalMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, *model.AppError) {
func (_m *TeamStore) GetTotalMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, error) {
ret := _m.Called(teamId, restrictions)
var r0 int64
@@ -671,13 +655,11 @@ func (_m *TeamStore) GetTotalMemberCount(teamId string, restrictions *model.View
r0 = ret.Get(0).(int64)
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, *model.ViewUsersRestrictions) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, *model.ViewUsersRestrictions) error); ok {
r1 = rf(teamId, restrictions)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -770,16 +752,14 @@ func (_m *TeamStore) PermanentDelete(teamId string) error {
}
// RemoveAllMembersByTeam provides a mock function with given fields: teamId
func (_m *TeamStore) RemoveAllMembersByTeam(teamId string) *model.AppError {
func (_m *TeamStore) RemoveAllMembersByTeam(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
@@ -800,32 +780,28 @@ func (_m *TeamStore) RemoveAllMembersByUser(userId string) error {
}
// RemoveMember provides a mock function with given fields: teamId, userId
func (_m *TeamStore) RemoveMember(teamId string, userId string) *model.AppError {
func (_m *TeamStore) RemoveMember(teamId string, userId string) error {
ret := _m.Called(teamId, userId)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string, string) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(string, string) error); ok {
r0 = rf(teamId, userId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// RemoveMembers provides a mock function with given fields: teamId, userIds
func (_m *TeamStore) RemoveMembers(teamId string, userIds []string) *model.AppError {
func (_m *TeamStore) RemoveMembers(teamId string, userIds []string) error {
ret := _m.Called(teamId, userIds)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string, []string) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(string, []string) error); ok {
r0 = rf(teamId, userIds)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
@@ -1051,7 +1027,7 @@ func (_m *TeamStore) UpdateLastTeamIconUpdate(teamId string, curTime int64) erro
}
// UpdateMember provides a mock function with given fields: member
func (_m *TeamStore) UpdateMember(member *model.TeamMember) (*model.TeamMember, *model.AppError) {
func (_m *TeamStore) UpdateMember(member *model.TeamMember) (*model.TeamMember, error) {
ret := _m.Called(member)
var r0 *model.TeamMember
@@ -1063,13 +1039,11 @@ func (_m *TeamStore) UpdateMember(member *model.TeamMember) (*model.TeamMember,
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(*model.TeamMember) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(*model.TeamMember) error); ok {
r1 = rf(member)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -1090,7 +1064,7 @@ func (_m *TeamStore) UpdateMembersRole(teamID string, userIDs []string) error {
}
// UpdateMultipleMembers provides a mock function with given fields: members
func (_m *TeamStore) UpdateMultipleMembers(members []*model.TeamMember) ([]*model.TeamMember, *model.AppError) {
func (_m *TeamStore) UpdateMultipleMembers(members []*model.TeamMember) ([]*model.TeamMember, error) {
ret := _m.Called(members)
var r0 []*model.TeamMember
@@ -1102,13 +1076,11 @@ func (_m *TeamStore) UpdateMultipleMembers(members []*model.TeamMember) ([]*mode
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func([]*model.TeamMember) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func([]*model.TeamMember) error); ok {
r1 = rf(members)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1

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

@@ -4,6 +4,7 @@
package storetest
import (
"errors"
"strings"
"testing"
"time"
@@ -1118,8 +1119,8 @@ func testGetMembers(t *testing.T, ss store.Store) {
require.Nil(t, nErr)
// Gets users ordered by UserName
ms, err := ss.Team().GetMembers(teamId1, 0, 100, &model.TeamMembersGetOptions{Sort: model.USERNAME})
require.Nil(t, err)
ms, nErr := ss.Team().GetMembers(teamId1, 0, 100, &model.TeamMembersGetOptions{Sort: model.USERNAME})
require.Nil(t, nErr)
assert.Len(t, ms, 5)
assert.Equal(t, u1.Id, ms[0].UserId)
assert.Equal(t, u3.Id, ms[1].UserId)
@@ -1128,8 +1129,8 @@ func testGetMembers(t *testing.T, ss store.Store) {
assert.Equal(t, u4.Id, ms[4].UserId)
// Gets users ordered by UserName and excludes deleted members
ms, err = ss.Team().GetMembers(teamId1, 0, 100, &model.TeamMembersGetOptions{Sort: model.USERNAME, ExcludeDeletedUsers: true})
require.Nil(t, err)
ms, nErr = ss.Team().GetMembers(teamId1, 0, 100, &model.TeamMembersGetOptions{Sort: model.USERNAME, ExcludeDeletedUsers: true})
require.Nil(t, nErr)
assert.Len(t, ms, 2)
assert.Equal(t, u2.Id, ms[0].UserId)
assert.Equal(t, u4.Id, ms[1].UserId)
@@ -1180,8 +1181,8 @@ func testGetMembers(t *testing.T, ss store.Store) {
require.Nil(t, nErr)
// Gets users ordered by UserName
ms, err := ss.Team().GetMembers(teamId1, 0, 100, &model.TeamMembersGetOptions{ExcludeDeletedUsers: true})
require.Nil(t, err)
ms, nErr := ss.Team().GetMembers(teamId1, 0, 100, &model.TeamMembersGetOptions{ExcludeDeletedUsers: true})
require.Nil(t, nErr)
assert.Len(t, ms, 3)
require.ElementsMatch(t, ms, [3]*model.TeamMember{t1, t3, t5})
})
@@ -1968,9 +1969,11 @@ func testTeamUpdateMember(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().UpdateMember(member)
require.NotNil(t, err)
require.Equal(t, "model.team_member.is_valid.team_id.app_error", err.Id)
_, nErr := ss.Team().UpdateMember(member)
require.NotNil(t, nErr)
var appErr *model.AppError
require.True(t, errors.As(nErr, &appErr))
require.Equal(t, "model.team_member.is_valid.team_id.app_error", appErr.Id)
})
t.Run("insert member correctly (in team without scheme)", func(t *testing.T) {
@@ -2102,8 +2105,8 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) {
member.SchemeAdmin = tc.SchemeAdmin
member.ExplicitRoles = tc.ExplicitRoles
member, err = ss.Team().UpdateMember(member)
require.Nil(t, err)
member, nErr = ss.Team().UpdateMember(member)
require.Nil(t, nErr)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
@@ -2253,8 +2256,8 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) {
member.SchemeAdmin = tc.SchemeAdmin
member.ExplicitRoles = tc.ExplicitRoles
member, err = ss.Team().UpdateMember(member)
require.Nil(t, err)
member, nErr = ss.Team().UpdateMember(member)
require.Nil(t, nErr)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
@@ -2275,9 +2278,11 @@ func testTeamUpdateMultipleMembers(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().UpdateMultipleMembers([]*model.TeamMember{m1, m2})
require.NotNil(t, err)
require.Equal(t, "model.team_member.is_valid.team_id.app_error", err.Id)
_, nErr := ss.Team().UpdateMultipleMembers([]*model.TeamMember{m1, m2})
require.NotNil(t, nErr)
var appErr *model.AppError
require.True(t, errors.As(nErr, &appErr))
require.Equal(t, "model.team_member.is_valid.team_id.app_error", appErr.Id)
})
t.Run("update members correctly (in team without scheme)", func(t *testing.T) {
@@ -2415,8 +2420,8 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) {
member.ExplicitRoles = tc.ExplicitRoles
var members []*model.TeamMember
members, err = ss.Team().UpdateMultipleMembers([]*model.TeamMember{member, otherMember})
require.Nil(t, err)
members, nErr = ss.Team().UpdateMultipleMembers([]*model.TeamMember{member, otherMember})
require.Nil(t, nErr)
require.Len(t, members, 2)
member = members[0]
@@ -2605,30 +2610,30 @@ func testTeamRemoveMember(t *testing.T, ss store.Store) {
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)
require.Nil(t, err)
nErr = ss.Team().RemoveMember("not-existing-team", u1.Id)
require.Nil(t, nErr)
var membersOtherTeam []*model.TeamMember
membersOtherTeam, err = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, err)
membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, nErr)
require.Len(t, membersOtherTeam, 4)
})
t.Run("remove not existing member from an existing team", func(t *testing.T) {
err = ss.Team().RemoveMember(teamID, model.NewId())
require.Nil(t, err)
nErr = ss.Team().RemoveMember(teamID, model.NewId())
require.Nil(t, nErr)
var membersOtherTeam []*model.TeamMember
membersOtherTeam, err = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, err)
membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, nErr)
require.Len(t, membersOtherTeam, 4)
})
t.Run("remove existing member from an existing team", func(t *testing.T) {
err = ss.Team().RemoveMember(teamID, u1.Id)
require.Nil(t, err)
nErr = ss.Team().RemoveMember(teamID, u1.Id)
require.Nil(t, nErr)
defer ss.Team().SaveMember(m1, -1)
var membersOtherTeam []*model.TeamMember
membersOtherTeam, err = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, err)
membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, nErr)
require.Len(t, membersOtherTeam, 3)
})
}
@@ -2651,39 +2656,39 @@ func testTeamRemoveMembers(t *testing.T, ss store.Store) {
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})
require.Nil(t, err)
nErr = ss.Team().RemoveMembers("not-existing-team", []string{u1.Id, u2.Id, u3.Id, u4.Id})
require.Nil(t, nErr)
var membersOtherTeam []*model.TeamMember
membersOtherTeam, err = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, err)
membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, nErr)
require.Len(t, membersOtherTeam, 4)
})
t.Run("remove not existing members from an existing team", func(t *testing.T) {
err = ss.Team().RemoveMembers(teamID, []string{model.NewId(), model.NewId()})
require.Nil(t, err)
nErr = ss.Team().RemoveMembers(teamID, []string{model.NewId(), model.NewId()})
require.Nil(t, nErr)
var membersOtherTeam []*model.TeamMember
membersOtherTeam, err = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, err)
membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, nErr)
require.Len(t, membersOtherTeam, 4)
})
t.Run("remove not existing and not existing members from an existing team", func(t *testing.T) {
err = ss.Team().RemoveMembers(teamID, []string{u1.Id, u2.Id, model.NewId(), model.NewId()})
require.Nil(t, err)
nErr = ss.Team().RemoveMembers(teamID, []string{u1.Id, u2.Id, model.NewId(), model.NewId()})
require.Nil(t, nErr)
defer ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, -1)
var membersOtherTeam []*model.TeamMember
membersOtherTeam, err = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, err)
membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, nErr)
require.Len(t, membersOtherTeam, 2)
})
t.Run("remove existing members from an existing team", func(t *testing.T) {
err = ss.Team().RemoveMembers(teamID, []string{u1.Id, u2.Id, u3.Id})
require.Nil(t, err)
nErr = ss.Team().RemoveMembers(teamID, []string{u1.Id, u2.Id, u3.Id})
require.Nil(t, nErr)
defer ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3}, -1)
var membersOtherTeam []*model.TeamMember
membersOtherTeam, err = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, err)
membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil)
require.Nil(t, nErr)
require.Len(t, membersOtherTeam, 1)
})
}
@@ -2954,25 +2959,25 @@ func testTeamStoreMemberCount(t *testing.T, ss store.Store) {
require.Nil(t, nErr)
var totalMemberCount int64
totalMemberCount, err = ss.Team().GetTotalMemberCount(teamId1, nil)
require.Nil(t, err)
totalMemberCount, nErr = ss.Team().GetTotalMemberCount(teamId1, nil)
require.Nil(t, nErr)
require.Equal(t, int(totalMemberCount), 2, "wrong count")
var result int64
result, err = ss.Team().GetActiveMemberCount(teamId1, nil)
require.Nil(t, err)
result, nErr = ss.Team().GetActiveMemberCount(teamId1, nil)
require.Nil(t, nErr)
require.Equal(t, 1, int(result), "wrong count")
m3 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()}
_, nErr = ss.Team().SaveMember(m3, -1)
require.Nil(t, nErr)
totalMemberCount, err = ss.Team().GetTotalMemberCount(teamId1, nil)
require.Nil(t, err)
totalMemberCount, nErr = ss.Team().GetTotalMemberCount(teamId1, nil)
require.Nil(t, nErr)
require.Equal(t, 2, int(totalMemberCount), "wrong count")
result, err = ss.Team().GetActiveMemberCount(teamId1, nil)
require.Nil(t, err)
result, nErr = ss.Team().GetActiveMemberCount(teamId1, nil)
require.Nil(t, nErr)
require.Equal(t, 1, int(result), "wrong count")
}
@@ -3003,8 +3008,8 @@ func testGetChannelUnreadsForAllTeams(t *testing.T, ss store.Store) {
_, err = ss.Channel().SaveMember(cm2)
require.Nil(t, err)
ms1, err := ss.Team().GetChannelUnreadsForAllTeams("", uid)
require.Nil(t, err)
ms1, nErr := ss.Team().GetChannelUnreadsForAllTeams("", uid)
require.Nil(t, nErr)
membersMap := make(map[string]bool)
for i := range ms1 {
id := ms1[i].TeamId
@@ -3016,8 +3021,8 @@ func testGetChannelUnreadsForAllTeams(t *testing.T, ss store.Store) {
require.Equal(t, 10, int(ms1[0].MsgCount), "subtraction failed")
ms2, err := ss.Team().GetChannelUnreadsForAllTeams(teamId1, uid)
require.Nil(t, err)
ms2, nErr := ss.Team().GetChannelUnreadsForAllTeams(teamId1, uid)
require.Nil(t, nErr)
membersMap = make(map[string]bool)
for i := range ms2 {
id := ms2[i].TeamId

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

@@ -4641,8 +4641,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
require.Equal(t, "system_user", updatedUser.Roles)
require.True(t, user.UpdateAt < updatedUser.UpdateAt)
updatedTeamMember, err := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, err)
updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, nErr)
require.False(t, updatedTeamMember.SchemeGuest)
require.True(t, updatedTeamMember.SchemeUser)
@@ -4686,8 +4686,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, "system_user system_admin", updatedUser.Roles)
updatedTeamMember, err := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, err)
updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, nErr)
require.False(t, updatedTeamMember.SchemeGuest)
require.True(t, updatedTeamMember.SchemeUser)
@@ -4742,8 +4742,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, "system_user", updatedUser.Roles)
updatedTeamMember, err := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, err)
updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, nErr)
require.False(t, updatedTeamMember.SchemeGuest)
require.True(t, updatedTeamMember.SchemeUser)
})
@@ -4782,8 +4782,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, "system_user", updatedUser.Roles)
updatedTeamMember, err := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, err)
updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, nErr)
require.False(t, updatedTeamMember.SchemeGuest)
require.True(t, updatedTeamMember.SchemeUser)
@@ -4827,8 +4827,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, "system_user custom_role", updatedUser.Roles)
updatedTeamMember, err := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, err)
updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, nErr)
require.False(t, updatedTeamMember.SchemeGuest)
require.True(t, updatedTeamMember.SchemeUser)
@@ -4893,8 +4893,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, "system_user", updatedUser.Roles)
updatedTeamMember, err := ss.Team().GetMember(teamId1, user1.Id)
require.Nil(t, err)
updatedTeamMember, nErr := ss.Team().GetMember(teamId1, user1.Id)
require.Nil(t, nErr)
require.False(t, updatedTeamMember.SchemeGuest)
require.True(t, updatedTeamMember.SchemeUser)
@@ -4907,8 +4907,8 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, "system_guest", notUpdatedUser.Roles)
notUpdatedTeamMember, err := ss.Team().GetMember(teamId2, user2.Id)
require.Nil(t, err)
notUpdatedTeamMember, nErr := ss.Team().GetMember(teamId2, user2.Id)
require.Nil(t, nErr)
require.True(t, notUpdatedTeamMember.SchemeGuest)
require.False(t, notUpdatedTeamMember.SchemeUser)
@@ -4956,8 +4956,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
require.Equal(t, "system_guest", updatedUser.Roles)
require.True(t, user.UpdateAt < updatedUser.UpdateAt)
updatedTeamMember, err := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, err)
updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, nErr)
require.True(t, updatedTeamMember.SchemeGuest)
require.False(t, updatedTeamMember.SchemeUser)
@@ -5001,8 +5001,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, "system_guest", updatedUser.Roles)
updatedTeamMember, err := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, err)
updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, nErr)
require.True(t, updatedTeamMember.SchemeGuest)
require.False(t, updatedTeamMember.SchemeUser)
@@ -5057,8 +5057,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, "system_guest", updatedUser.Roles)
updatedTeamMember, err := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, err)
updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, nErr)
require.True(t, updatedTeamMember.SchemeGuest)
require.False(t, updatedTeamMember.SchemeUser)
})
@@ -5097,8 +5097,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, "system_guest", updatedUser.Roles)
updatedTeamMember, err := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, err)
updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, nErr)
require.True(t, updatedTeamMember.SchemeGuest)
require.False(t, updatedTeamMember.SchemeUser)
@@ -5142,8 +5142,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, "system_guest custom_role", updatedUser.Roles)
updatedTeamMember, err := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, err)
updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id)
require.Nil(t, nErr)
require.True(t, updatedTeamMember.SchemeGuest)
require.False(t, updatedTeamMember.SchemeUser)
@@ -5208,8 +5208,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, "system_guest", updatedUser.Roles)
updatedTeamMember, err := ss.Team().GetMember(teamId1, user1.Id)
require.Nil(t, err)
updatedTeamMember, nErr := ss.Team().GetMember(teamId1, user1.Id)
require.Nil(t, nErr)
require.True(t, updatedTeamMember.SchemeGuest)
require.False(t, updatedTeamMember.SchemeUser)
@@ -5222,8 +5222,8 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Equal(t, "system_user", notUpdatedUser.Roles)
notUpdatedTeamMember, err := ss.Team().GetMember(teamId2, user2.Id)
require.Nil(t, err)
notUpdatedTeamMember, nErr := ss.Team().GetMember(teamId2, user2.Id)
require.Nil(t, nErr)
require.False(t, notUpdatedTeamMember.SchemeGuest)
require.True(t, notUpdatedTeamMember.SchemeUser)