diff options
author | Robin Naundorf <r.naundorf@fh-muenster.de> | 2017-05-09 14:52:46 +0200 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-05-09 07:52:46 -0500 |
commit | 5efcd2d9d3fb91ae7475918b807b7947b533da9b (patch) | |
tree | 7f1c0bfe5ca751b27b6a520f63cd20e280377d85 /store | |
parent | 530814b8c9b1b47dd6eb05e70548c61d75da9a23 (diff) | |
download | chat-5efcd2d9d3fb91ae7475918b807b7947b533da9b.tar.gz chat-5efcd2d9d3fb91ae7475918b807b7947b533da9b.tar.bz2 chat-5efcd2d9d3fb91ae7475918b807b7947b533da9b.zip |
Add API Endpoint for deleted Channels (#5889)
Diffstat (limited to 'store')
-rw-r--r-- | store/sql_channel_store.go | 25 | ||||
-rw-r--r-- | store/sql_channel_store_test.go | 82 | ||||
-rw-r--r-- | store/store.go | 1 |
3 files changed, 108 insertions, 0 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 881f1cc61..f3619c03a 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -812,6 +812,31 @@ func (s SqlChannelStore) GetDeletedByName(teamId string, name string) StoreChann return storeChannel } +func (s SqlChannelStore) GetDeleted(teamId string, offset int, limit int) StoreChannel { + storeChannel := make(StoreChannel, 1) + + go func() { + result := StoreResult{} + + channels := &model.ChannelList{} + + if _, err := s.GetReplica().Select(channels, "SELECT * FROM Channels WHERE (TeamId = :TeamId OR TeamId = '') AND DeleteAt != 0 ORDER BY DisplayName LIMIT :Limit OFFSET :Offset", map[string]interface{}{"TeamId": teamId, "Limit": limit, "Offset": offset}); err != nil { + if err == sql.ErrNoRows { + result.Err = model.NewLocAppError("SqlChannelStore.GetDeleted", "store.sql_channel.get_deleted.missing.app_error", nil, "teamId="+teamId+", "+err.Error()) + } else { + result.Err = model.NewLocAppError("SqlChannelStore.GetDeleted", "store.sql_channel.get_deleted.existing.app_error", nil, "teamId="+teamId+", "+err.Error()) + } + } else { + result.Data = channels + } + + 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 ce3a9a12f..55a263037 100644 --- a/store/sql_channel_store_test.go +++ b/store/sql_channel_store_test.go @@ -512,6 +512,88 @@ func TestChannelStoreGetDeletedByName(t *testing.T) { } } +func TestChannelStoreGetDeleted(t *testing.T) { + Setup() + + o1 := model.Channel{} + o1.TeamId = model.NewId() + o1.DisplayName = "Channel1" + o1.Name = "a" + model.NewId() + "b" + o1.Type = model.CHANNEL_OPEN + o1.DeleteAt = model.GetMillis() + Must(store.Channel().Save(&o1)) + + cresult := <-store.Channel().GetDeleted(o1.TeamId, 0, 100) + if cresult.Err != nil { + t.Fatal(cresult.Err) + } + list := cresult.Data.(*model.ChannelList) + + if len(*list) != 1 { + t.Fatal("wrong list") + } + + if (*list)[0].Name != o1.Name { + t.Fatal("missing channel") + } + + o2 := model.Channel{} + o2.TeamId = o1.TeamId + o2.DisplayName = "Channel2" + o2.Name = "a" + model.NewId() + "b" + o2.Type = model.CHANNEL_OPEN + Must(store.Channel().Save(&o2)) + + cresult = <-store.Channel().GetDeleted(o1.TeamId, 0, 100) + if cresult.Err != nil { + t.Fatal(cresult.Err) + } + list = cresult.Data.(*model.ChannelList) + + if len(*list) != 1 { + t.Fatal("wrong list") + } + + o3 := model.Channel{} + o3.TeamId = o1.TeamId + o3.DisplayName = "Channel3" + o3.Name = "a" + model.NewId() + "b" + o3.Type = model.CHANNEL_OPEN + o3.DeleteAt = model.GetMillis() + Must(store.Channel().Save(&o3)) + + cresult = <-store.Channel().GetDeleted(o1.TeamId, 0, 100) + if cresult.Err != nil { + t.Fatal(cresult.Err) + } + list = cresult.Data.(*model.ChannelList) + + if len(*list) != 2 { + t.Fatal("wrong list length") + } + + cresult = <-store.Channel().GetDeleted(o1.TeamId, 0, 1) + if cresult.Err != nil { + t.Fatal(cresult.Err) + } + list = cresult.Data.(*model.ChannelList) + + if len(*list) != 1 { + t.Fatal("wrong list length") + } + + cresult = <-store.Channel().GetDeleted(o1.TeamId, 1, 1) + if cresult.Err != nil { + t.Fatal(cresult.Err) + } + list = cresult.Data.(*model.ChannelList) + + if len(*list) != 1 { + t.Fatal("wrong list length") + } + +} + func TestChannelMemberStore(t *testing.T) { Setup() diff --git a/store/store.go b/store/store.go index 78dc4308b..bb1b8f197 100644 --- a/store/store.go +++ b/store/store.go @@ -103,6 +103,7 @@ type ChannelStore interface { GetByName(team_id string, name string, allowFromCache bool) StoreChannel GetByNameIncludeDeleted(team_id string, name string, allowFromCache bool) StoreChannel GetDeletedByName(team_id string, name string) StoreChannel + GetDeleted(team_id string, offset int, limit int) StoreChannel GetChannels(teamId string, userId string) StoreChannel GetMoreChannels(teamId string, userId string, offset int, limit int) StoreChannel GetPublicChannelsForTeam(teamId string, offset int, limit int) StoreChannel |