From 2bea17251ef90ab62381ebecaa97fc41c2c94f99 Mon Sep 17 00:00:00 2001 From: enahum Date: Tue, 7 Mar 2017 13:54:25 -0300 Subject: [PATCH] Fix badge count for push notifications (#5672) --- store/sql_user_store.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/store/sql_user_store.go b/store/sql_user_store.go index 838c2a80dd..23b0c36967 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -1179,7 +1179,13 @@ func (us SqlUserStore) GetUnreadCount(userId string) StoreChannel { go func() { result := StoreResult{} - if count, err := us.GetReplica().SelectInt("SELECT SUM(CASE WHEN c.Type = 'D' THEN (c.TotalMsgCount - cm.MsgCount) ELSE cm.MentionCount END) FROM Channels c INNER JOIN ChannelMembers cm ON cm.ChannelId = c.Id AND cm.UserId = :UserId", map[string]interface{}{"UserId": userId}); err != nil { + if count, err := us.GetReplica().SelectInt(` + SELECT SUM(CASE WHEN c.Type = 'D' THEN (c.TotalMsgCount - cm.MsgCount) ELSE cm.MentionCount END) + FROM Channels c + INNER JOIN ChannelMembers cm + ON cm.ChannelId = c.Id + AND cm.UserId = :UserId + AND c.DeleteAt = 0`, map[string]interface{}{"UserId": userId}); err != nil { result.Err = model.NewLocAppError("SqlUserStore.GetMentionCount", "store.sql_user.get_unread_count.app_error", nil, err.Error()) } else { result.Data = count