diff options
author | George Goldberg <george@gberg.me> | 2017-01-26 02:14:12 +0000 |
---|---|---|
committer | enahum <nahumhbl@gmail.com> | 2017-01-25 23:14:12 -0300 |
commit | f7476b2fb6a01d50868a128c1d1f77c14691482d (patch) | |
tree | 211398e395f42f60f866b791cc005eb1dcc2959d /store | |
parent | 57d9d0ad1ee3e841640d74fcb122516bce8efd9a (diff) | |
download | chat-f7476b2fb6a01d50868a128c1d1f77c14691482d.tar.gz chat-f7476b2fb6a01d50868a128c1d1f77c14691482d.tar.bz2 chat-f7476b2fb6a01d50868a128c1d1f77c14691482d.zip |
PLT-4378 Slack import when channel name is deleted (#4649)
This fixes the issue where the channel fails to Import from Slack if
there is already a channel with the same name on Mattermost that has
been deleted.
Diffstat (limited to 'store')
-rw-r--r-- | store/sql_channel_store.go | 25 | ||||
-rw-r--r-- | store/sql_channel_store_test.go | 33 | ||||
-rw-r--r-- | store/store.go | 1 |
3 files changed, 58 insertions, 1 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 6ac69df5a..e3df07f74 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -579,6 +579,31 @@ func (s SqlChannelStore) getByName(teamId string, name string, includeDeleted bo return storeChannel } +func (s SqlChannelStore) GetDeletedByName(teamId string, name string) StoreChannel { + storeChannel := make(StoreChannel, 1) + + go func() { + result := StoreResult{} + + channel := model.Channel{} + + if err := s.GetReplica().SelectOne(&channel, "SELECT * FROM Channels WHERE (TeamId = :TeamId OR TeamId = '') AND Name = :Name AND DeleteAt != 0", map[string]interface{}{"TeamId": teamId, "Name": name}); err != nil { + if err == sql.ErrNoRows { + result.Err = model.NewLocAppError("SqlChannelStore.GetDeletedByName", "store.sql_channel.get_deleted_by_name.missing.app_error", nil, "teamId="+teamId+", "+"name="+name+", "+err.Error()) + } else { + result.Err = model.NewLocAppError("SqlChannelStore.GetDeletedByName", "store.sql_channel.get_deleted_by_name.existing.app_error", nil, "teamId="+teamId+", "+"name="+name+", "+err.Error()) + } + } else { + result.Data = &channel + } + + storeChannel <- result + close(storeChannel) + }() + + return storeChannel +} + func (s SqlChannelStore) SaveMember(member *model.ChannelMember) StoreChannel { storeChannel := make(StoreChannel, 1) diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go index 38446bf94..5202a7c29 100644 --- a/store/sql_channel_store_test.go +++ b/store/sql_channel_store_test.go @@ -352,7 +352,8 @@ func TestChannelStoreGetByName(t *testing.T) { o1.Type = model.CHANNEL_OPEN Must(store.Channel().Save(&o1)) - if r1 := <-store.Channel().GetByName(o1.TeamId, o1.Name); r1.Err != nil { + r1 := <-store.Channel().GetByName(o1.TeamId, o1.Name) + if r1.Err != nil { t.Fatal(r1.Err) } else { if r1.Data.(*model.Channel).ToJson() != o1.ToJson() { @@ -363,6 +364,36 @@ func TestChannelStoreGetByName(t *testing.T) { if err := (<-store.Channel().GetByName(o1.TeamId, "")).Err; err == nil { t.Fatal("Missing id should have failed") } + + Must(store.Channel().Delete(r1.Data.(*model.Channel).Id, model.GetMillis())) + + if err := (<-store.Channel().GetByName(o1.TeamId, "")).Err; err == nil { + t.Fatal("Deleted channel should not be returned by GetByName()") + } +} + +func TestChannelStoreGetDeletedByName(t *testing.T) { + Setup() + + o1 := model.Channel{} + o1.TeamId = model.NewId() + o1.DisplayName = "Name" + o1.Name = "a" + model.NewId() + "b" + o1.Type = model.CHANNEL_OPEN + o1.DeleteAt = model.GetMillis() + Must(store.Channel().Save(&o1)) + + if r1 := <-store.Channel().GetDeletedByName(o1.TeamId, o1.Name); r1.Err != nil { + t.Fatal(r1.Err) + } else { + if r1.Data.(*model.Channel).ToJson() != o1.ToJson() { + t.Fatal("invalid returned channel") + } + } + + if err := (<-store.Channel().GetDeletedByName(o1.TeamId, "")).Err; err == nil { + t.Fatal("Missing id should have failed") + } } func TestChannelMemberStore(t *testing.T) { diff --git a/store/store.go b/store/store.go index 48819e2d7..cd918c033 100644 --- a/store/store.go +++ b/store/store.go @@ -93,6 +93,7 @@ type ChannelStore interface { PermanentDeleteByTeam(teamId string) StoreChannel GetByName(team_id string, name string) StoreChannel GetByNameIncludeDeleted(team_id string, name string) StoreChannel + GetDeletedByName(team_id string, name string) StoreChannel GetChannels(teamId string, userId string) StoreChannel GetMoreChannels(teamId string, userId string, offset int, limit int) StoreChannel GetChannelCounts(teamId string, userId string) StoreChannel |