From 520cedea16c3a4c71c2d11ede89c6a50a81ff8db Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Wed, 28 Jun 2017 23:06:45 -0400 Subject: PLT-6909 Remove deleted emojis from cache (#6757) * PLT-6909 Remove deleted emojis from cache * Fixed unit tests --- store/sql_emoji_store.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'store') 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) }() -- cgit v1.2.3-1-g7c22