From 3ad07aacfaab57aa458b43c3896ccb805bb26722 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 21 Oct 2019 20:25:46 +0300
Subject: [PATCH] FIX: Reload only notifications when refreshing notification
 count (#8221)

Previously, we used to reload the whole User instance which discarded
any changes made (for example setting 'unstage' to false).
---
 app/models/notification.rb |  3 ++-
 spec/models/user_spec.rb   | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index 6a4413e7f5b..4f300f81380 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -218,7 +218,8 @@ class Notification < ActiveRecord::Base
 
   def refresh_notification_count
     begin
-      user.reload.publish_notifications_state
+      user.notifications.reset
+      user.publish_notifications_state
     rescue ActiveRecord::RecordNotFound
       # happens when we delete a user
     end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 29dcad458ba..8055ad48a0e 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1821,7 +1821,7 @@ describe User do
     let!(:staged_user) { Fabricate(:staged, email: 'staged@account.com', active: true, username: 'staged1', name: 'Stage Name') }
     let(:params) { { email: 'staged@account.com', active: true, username: 'unstaged1', name: 'Foo Bar' } }
 
-    it "correctyl unstages a user" do
+    it "correctly unstages a user" do
       user = User.unstage(params)
 
       expect(user.id).to eq(staged_user.id)
@@ -1829,6 +1829,7 @@ describe User do
       expect(user.name).to eq('Foo Bar')
       expect(user.active).to eq(false)
       expect(user.email).to eq('staged@account.com')
+      expect(user.staged).to eq(false)
     end
 
     it "returns nil when the user cannot be unstaged" do
@@ -1838,13 +1839,14 @@ describe User do
     end
 
     it "removes all previous notifications during unstaging" do
-      Fabricate(:notification, user: user)
-      Fabricate(:private_message_notification, user: user)
-      user.reload
+      Fabricate(:notification, user: staged_user)
+      Fabricate(:private_message_notification, user: staged_user)
+      staged_user.reload
 
-      expect(user.total_unread_notifications).to eq(2)
+      expect(staged_user.total_unread_notifications).to eq(2)
       user = User.unstage(params)
       expect(user.total_unread_notifications).to eq(0)
+      expect(user.staged).to eq(false)
     end
 
     it "triggers an event" do