From 5f4199db4f18bf773810a3335bbedd24ccdf1020 Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Fri, 29 Oct 2021 14:54:11 +0530 Subject: [PATCH] Revert "Optimize TotalUnreadMentions (#18789)" (#18889) This reverts commit ec56cac42da7c647c8b35714092f52a10c0bef0a. --- store/sqlstore/thread_store.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/store/sqlstore/thread_store.go b/store/sqlstore/thread_store.go index a12854e31c..9592a1eee9 100644 --- a/store/sqlstore/thread_store.go +++ b/store/sqlstore/thread_store.go @@ -200,12 +200,12 @@ func (s *SqlThreadStore) GetThreadsForUser(userId, teamId string, opts model.Get }() go func() { mentionsQuery, mentionsQueryArgs, _ := s.getQueryBuilder(). - Select("COALESCE(SUM(ThreadMemberships.UnreadMentions), 0)"). - From("ThreadMemberships, Posts, Channels"). - Where("Posts.Id = ThreadMemberships.PostId"). - Where("Posts.ChannelId = Channels.Id"). + Select("COALESCE(SUM(ThreadMemberships.UnreadMentions),0)"). + From("ThreadMemberships"). + LeftJoin("Threads ON Threads.PostId = ThreadMemberships.PostId"). + LeftJoin("Posts ON Posts.Id = ThreadMemberships.PostId"). + LeftJoin("Channels ON Threads.ChannelId = Channels.Id"). Where(fetchConditions).ToSql() - totalUnreadMentions, err := s.GetMaster().SelectInt(mentionsQuery, mentionsQueryArgs...) totalUnreadMentionsChan <- store.StoreResult{Data: totalUnreadMentions, NErr: err} close(totalUnreadMentionsChan)