From fd6192473b3c2a91d1520e366d931063e359a67d Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 20 Oct 2017 17:34:07 -0700 Subject: refactor max users per team (#7691) --- store/storetest/channel_store.go | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'store/storetest/channel_store.go') diff --git a/store/storetest/channel_store.go b/store/storetest/channel_store.go index fe6700266..76ef21552 100644 --- a/store/storetest/channel_store.go +++ b/store/storetest/channel_store.go @@ -92,13 +92,13 @@ func testChannelStoreSaveDirectChannel(t *testing.T, ss store.Store) { u1.Email = model.NewId() u1.Nickname = model.NewId() store.Must(ss.User().Save(u1)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1)) u2 := &model.User{} u2.Email = model.NewId() u2.Nickname = model.NewId() store.Must(ss.User().Save(u2)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1)) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -153,13 +153,13 @@ func testChannelStoreCreateDirectChannel(t *testing.T, ss store.Store) { u1.Email = model.NewId() u1.Nickname = model.NewId() store.Must(ss.User().Save(u1)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1)) u2 := &model.User{} u2.Email = model.NewId() u2.Nickname = model.NewId() store.Must(ss.User().Save(u2)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1)) res := <-ss.Channel().CreateDirectChannel(u1.Id, u2.Id) if res.Err != nil { @@ -218,8 +218,8 @@ func testGetChannelUnread(t *testing.T, ss store.Store) { uid := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: uid} m2 := &model.TeamMember{TeamId: teamId2, UserId: uid} - store.Must(ss.Team().SaveMember(m1)) - store.Must(ss.Team().SaveMember(m2)) + store.Must(ss.Team().SaveMember(m1, -1)) + store.Must(ss.Team().SaveMember(m2, -1)) notifyPropsModel := model.GetDefaultChannelNotifyProps() // Setup Channel 1 @@ -307,13 +307,13 @@ func testChannelStoreGet(t *testing.T, ss store.Store) { u1.Email = model.NewId() u1.Nickname = model.NewId() store.Must(ss.User().Save(u1)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1)) u2 := model.User{} u2.Email = model.NewId() u2.Nickname = model.NewId() store.Must(ss.User().Save(&u2)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1)) o2 := model.Channel{} o2.TeamId = model.NewId() @@ -652,13 +652,13 @@ func testChannelMemberStore(t *testing.T, ss store.Store) { u1.Email = model.NewId() u1.Nickname = model.NewId() store.Must(ss.User().Save(&u1)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1)) u2 := model.User{} u2.Email = model.NewId() u2.Nickname = model.NewId() store.Must(ss.User().Save(&u2)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1)) o1 := model.ChannelMember{} o1.ChannelId = c1.Id @@ -747,13 +747,13 @@ func testChannelDeleteMemberStore(t *testing.T, ss store.Store) { u1.Email = model.NewId() u1.Nickname = model.NewId() store.Must(ss.User().Save(&u1)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1)) u2 := model.User{} u2.Email = model.NewId() u2.Nickname = model.NewId() store.Must(ss.User().Save(&u2)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1)) o1 := model.ChannelMember{} o1.ChannelId = c1.Id @@ -1494,7 +1494,7 @@ func testGetMemberCount(t *testing.T, ss store.Store) { DeleteAt: 0, } store.Must(ss.User().Save(u1)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1)) m1 := model.ChannelMember{ ChannelId: c1.Id, @@ -1514,7 +1514,7 @@ func testGetMemberCount(t *testing.T, ss store.Store) { DeleteAt: 0, } store.Must(ss.User().Save(&u2)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1)) m2 := model.ChannelMember{ ChannelId: c1.Id, @@ -1535,7 +1535,7 @@ func testGetMemberCount(t *testing.T, ss store.Store) { DeleteAt: 0, } store.Must(ss.User().Save(&u3)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1)) m3 := model.ChannelMember{ ChannelId: c2.Id, @@ -1556,7 +1556,7 @@ func testGetMemberCount(t *testing.T, ss store.Store) { DeleteAt: 10000, } store.Must(ss.User().Save(u4)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1)) m4 := model.ChannelMember{ ChannelId: c1.Id, @@ -1596,7 +1596,7 @@ func testUpdateExtrasByUser(t *testing.T, ss store.Store) { DeleteAt: 0, } store.Must(ss.User().Save(u1)) - store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) + store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1)) m1 := model.ChannelMember{ ChannelId: c1.Id, -- cgit v1.2.3-1-g7c22