diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-06-28 23:06:45 -0400 |
|---|---|---|
| committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-06-29 11:06:45 +0800 |
| commit | 520cedea16c3a4c71c2d11ede89c6a50a81ff8db (patch) | |
| tree | be9ed4563b6a249d7f0ac4df632162b5d90b887f | |
| parent | 9e600fcdccabfc55b85c026eda5eedab5bc91152 (diff) | |
| download | chat-520cedea16c3a4c71c2d11ede89c6a50a81ff8db.tar.gz chat-520cedea16c3a4c71c2d11ede89c6a50a81ff8db.tar.bz2 chat-520cedea16c3a4c71c2d11ede89c6a50a81ff8db.zip | |
PLT-6909 Remove deleted emojis from cache (#6757)
* PLT-6909 Remove deleted emojis from cache
* Fixed unit tests
| -rw-r--r-- | api4/emoji_test.go | 8 | ||||
| -rw-r--r-- | store/sql_emoji_store.go | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/api4/emoji_test.go b/api4/emoji_test.go index 84d808e6d..dcd6dddb7 100644 --- a/api4/emoji_test.go +++ b/api4/emoji_test.go @@ -251,11 +251,11 @@ func TestDeleteEmoji(t *testing.T) { // Try to delete just deleted emoji _, resp = Client.DeleteEmoji(newEmoji.Id) - CheckInternalErrorStatus(t, resp) + CheckNotFoundStatus(t, resp) //Try to delete non-existing emoji _, resp = Client.DeleteEmoji(model.NewId()) - CheckInternalErrorStatus(t, resp) + CheckNotFoundStatus(t, resp) //Try to delete without Id _, resp = Client.DeleteEmoji("") @@ -297,7 +297,7 @@ func TestGetEmoji(t *testing.T) { } _, resp = Client.GetEmoji(model.NewId()) - CheckInternalErrorStatus(t, resp) + CheckNotFoundStatus(t, resp) } func TestGetEmojiImage(t *testing.T) { @@ -413,7 +413,7 @@ func TestGetEmojiImage(t *testing.T) { CheckNotFoundStatus(t, resp) _, resp = Client.GetEmojiImage(model.NewId()) - CheckInternalErrorStatus(t, resp) + CheckNotFoundStatus(t, resp) _, resp = Client.GetEmojiImage("") CheckBadRequestStatus(t, resp) diff --git a/store/sql_emoji_store.go b/store/sql_emoji_store.go index a51020bba..2a8ea080e 100644 --- a/store/sql_emoji_store.go +++ b/store/sql_emoji_store.go @@ -4,6 +4,8 @@ package store import ( + "net/http" + "github.com/mattermost/platform/einterfaces" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" @@ -104,7 +106,7 @@ func (es SqlEmojiStore) Get(id string, allowFromCache bool) StoreChannel { WHERE Id = :Id AND DeleteAt = 0`, map[string]interface{}{"Id": id}); err != nil { - result.Err = model.NewLocAppError("SqlEmojiStore.Get", "store.sql_emoji.get.app_error", nil, "id="+id+", "+err.Error()) + result.Err = model.NewAppError("SqlEmojiStore.Get", "store.sql_emoji.get.app_error", nil, "id="+id+", "+err.Error(), http.StatusNotFound) } else { result.Data = emoji @@ -195,6 +197,8 @@ func (es SqlEmojiStore) Delete(id string, time int64) StoreChannel { result.Err = model.NewLocAppError("SqlEmojiStore.Delete", "store.sql_emoji.delete.no_results", nil, "id="+id+", err="+err.Error()) } + emojiCache.Remove(id) + storeChannel <- result close(storeChannel) }() |