diff options
author | Alexander Smaga <smagaan@gmail.com> | 2016-10-17 15:12:56 +0300 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-10-17 08:12:56 -0400 |
commit | e7b25f4cd8b7d87b99153fd4a901d3f9f92d7b0d (patch) | |
tree | 9dfad731f8a4320e72e287732b50f46946ce76fe /store | |
parent | b1e2b23b882ec062cfd7209abeed417eb07e121e (diff) | |
download | chat-e7b25f4cd8b7d87b99153fd4a901d3f9f92d7b0d.tar.gz chat-e7b25f4cd8b7d87b99153fd4a901d3f9f92d7b0d.tar.bz2 chat-e7b25f4cd8b7d87b99153fd4a901d3f9f92d7b0d.zip |
GH-4187 Create direct channel during incoming webhook if not exists (#4206)
Diffstat (limited to 'store')
-rw-r--r-- | store/sql_channel_store.go | 23 | ||||
-rw-r--r-- | store/sql_channel_store_test.go | 27 | ||||
-rw-r--r-- | store/store.go | 1 |
3 files changed, 51 insertions, 0 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 07c037075..eb150a63c 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -83,6 +83,29 @@ func (s SqlChannelStore) Save(channel *model.Channel) StoreChannel { return storeChannel } +func (s SqlChannelStore) CreateDirectChannel(userId string, otherUserId string) StoreChannel { + channel := new(model.Channel) + + channel.DisplayName = "" + channel.Name = model.GetDMNameFromIds(otherUserId, userId) + + channel.Header = "" + channel.Type = model.CHANNEL_DIRECT + + cm1 := &model.ChannelMember{ + UserId: userId, + NotifyProps: model.GetDefaultChannelNotifyProps(), + Roles: model.ROLE_CHANNEL_USER.Id, + } + cm2 := &model.ChannelMember{ + UserId: otherUserId, + NotifyProps: model.GetDefaultChannelNotifyProps(), + Roles: model.ROLE_CHANNEL_USER.Id, + } + + return s.SaveDirectChannel(channel, cm1, cm2) +} + func (s SqlChannelStore) SaveDirectChannel(directchannel *model.Channel, member1 *model.ChannelMember, member2 *model.ChannelMember) StoreChannel { storeChannel := make(StoreChannel, 1) diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go index 0bd059e5f..19db3d003 100644 --- a/store/sql_channel_store_test.go +++ b/store/sql_channel_store_test.go @@ -94,7 +94,34 @@ func TestChannelStoreSaveDirectChannel(t *testing.T) { if err := (<-store.Channel().SaveDirectChannel(&o1, &m1, &m2)).Err; err == nil { t.Fatal("Should not be able to save non-direct channel") } +} + +func TestChannelStoreCreateDirectChannel(t *testing.T) { + Setup() + u1 := &model.User{} + u1.Email = model.NewId() + u1.Nickname = model.NewId() + Must(store.User().Save(u1)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id})) + + u2 := &model.User{} + u2.Email = model.NewId() + u2.Nickname = model.NewId() + Must(store.User().Save(u2)) + Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id})) + + res := <-store.Channel().CreateDirectChannel(u1.Id, u2.Id) + if res.Err != nil { + t.Fatal("couldn't create direct channel", res.Err) + } + + c1 := res.Data.(*model.Channel) + + members := (<-store.Channel().GetMembers(c1.Id)).Data.([]model.ChannelMember) + if len(members) != 2 { + t.Fatal("should have saved 2 members") + } } func TestChannelStoreUpdate(t *testing.T) { diff --git a/store/store.go b/store/store.go index c01b6d8bc..7474d3afb 100644 --- a/store/store.go +++ b/store/store.go @@ -75,6 +75,7 @@ type TeamStore interface { type ChannelStore interface { Save(channel *model.Channel) StoreChannel + CreateDirectChannel(userId string, otherUserId string) StoreChannel SaveDirectChannel(channel *model.Channel, member1 *model.ChannelMember, member2 *model.ChannelMember) StoreChannel Update(channel *model.Channel) StoreChannel Get(id string) StoreChannel |