IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Migrate Emoji.GetList to Sync by default (#11314)

Browse Source
This commit is contained in:
Shobhit Gupta
2019-06-24 10:25:29 -07:00
committed by Jesús Espino
parent 453f28c05d
commit a4262373e5
5 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/emoji.go
View File

@@ -79,11 +79,7 @@ func (a *App) CreateEmoji(sessionUserId string, emoji *model.Emoji, multiPartIma
}
func (a *App) GetEmojiList(page, perPage int, sort string) ([]*model.Emoji, *model.AppError) {
result := <-a.Srv.Store.Emoji().GetList(page*perPage, perPage, sort)
if result.Err != nil {
return nil, result.Err
}
return result.Data.([]*model.Emoji), nil
return a.Srv.Store.Emoji().GetList(page*perPage, perPage, sort)
}
func (a *App) UploadEmojiImage(id string, imageData *multipart.FileHeader) *model.AppError {

25
store/sqlstore/emoji_store.go
View File

@@ -144,24 +144,21 @@ func (es SqlEmojiStore) GetMultipleByName(names []string) store.StoreChannel {
})
}
func (es SqlEmojiStore) GetList(offset, limit int, sort string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
var emoji []*model.Emoji
func (es SqlEmojiStore) GetList(offset, limit int, sort string) ([]*model.Emoji, *model.AppError) {
var emoji []*model.Emoji
query := "SELECT * FROM Emoji WHERE DeleteAt = 0"
query := "SELECT * FROM Emoji WHERE DeleteAt = 0"
if sort == model.EMOJI_SORT_BY_NAME {
query += " ORDER BY Name"
}
if sort == model.EMOJI_SORT_BY_NAME {
query += " ORDER BY Name"
}
query += " LIMIT :Limit OFFSET :Offset"
query += " LIMIT :Limit OFFSET :Offset"
if _, err := es.GetReplica().Select(&emoji, query, map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil {
result.Err = model.NewAppError("SqlEmojiStore.GetList", "store.sql_emoji.get_all.app_error", nil, err.Error(), http.StatusInternalServerError)
} else {
result.Data = emoji
}
})
if _, err := es.GetReplica().Select(&emoji, query, map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil {
return nil, model.NewAppError("SqlEmojiStore.GetList", "store.sql_emoji.get_all.app_error", nil, err.Error(), http.StatusInternalServerError)
}
return emoji, nil
}
func (es SqlEmojiStore) Delete(id string, time int64) *model.AppError {

2
store/store.go
View File

@@ -460,7 +460,7 @@ type EmojiStore interface {
Get(id string, allowFromCache bool) (*model.Emoji, *model.AppError)
GetByName(name string) (*model.Emoji, *model.AppError)
GetMultipleByName(names []string) StoreChannel
GetList(offset, limit int, sort string) StoreChannel
GetList(offset, limit int, sort string) ([]*model.Emoji, *model.AppError)
Delete(id string, time int64) *model.AppError
Search(name string, prefixOnly bool, limit int) ([]*model.Emoji, *model.AppError)
}

16
store/storetest/emoji_store.go
View File

@@ -229,13 +229,13 @@ func testEmojiGetList(t *testing.T, ss store.Store) {
}
}()
if result := <-ss.Emoji().GetList(0, 100, ""); result.Err != nil {
t.Fatal(result.Err)
if result, err := ss.Emoji().GetList(0, 100, ""); err != nil {
t.Fatal(err)
} else {
for _, emoji := range emojis {
found := false
for _, savedEmoji := range result.Data.([]*model.Emoji) {
for _, savedEmoji := range result {
if emoji.Id == savedEmoji.Id {
found = true
break
@@ -248,17 +248,15 @@ func testEmojiGetList(t *testing.T, ss store.Store) {
}
}
result := <-ss.Emoji().GetList(0, 3, model.EMOJI_SORT_BY_NAME)
assert.Nil(t, result.Err)
remojis := result.Data.([]*model.Emoji)
remojis, err := ss.Emoji().GetList(0, 3, model.EMOJI_SORT_BY_NAME)
assert.Nil(t, err)
assert.Equal(t, 3, len(remojis))
assert.Equal(t, emojis[0].Name, remojis[0].Name)
assert.Equal(t, emojis[1].Name, remojis[1].Name)
assert.Equal(t, emojis[2].Name, remojis[2].Name)
result = <-ss.Emoji().GetList(1, 2, model.EMOJI_SORT_BY_NAME)
assert.Nil(t, result.Err)
remojis = result.Data.([]*model.Emoji)
remojis, err = ss.Emoji().GetList(1, 2, model.EMOJI_SORT_BY_NAME)
assert.Nil(t, err)
assert.Equal(t, 2, len(remojis))
assert.Equal(t, emojis[1].Name, remojis[0].Name)
assert.Equal(t, emojis[2].Name, remojis[1].Name)

19
store/storetest/mocks/EmojiStore.go
View File

@@ -80,19 +80,28 @@ func (_m *EmojiStore) GetByName(name string) (*model.Emoji, *model.AppError) {
}
// GetList provides a mock function with given fields: offset, limit, sort
func (_m *EmojiStore) GetList(offset int, limit int, sort string) store.StoreChannel {
func (_m *EmojiStore) GetList(offset int, limit int, sort string) ([]*model.Emoji, *model.AppError) {
ret := _m.Called(offset, limit, sort)
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func(int, int, string) store.StoreChannel); ok {
var r0 []*model.Emoji
if rf, ok := ret.Get(0).(func(int, int, string) []*model.Emoji); ok {
r0 = rf(offset, limit, sort)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
r0 = ret.Get(0).([]*model.Emoji)
}
}
return r0
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(int, int, string) *model.AppError); ok {
r1 = rf(offset, limit, sort)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
}
return r0, r1
}
// GetMultipleByName provides a mock function with given fields: names