From 2f54dd5e3d22e88ef18c3767ffbc1ef5eb0e04f8 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 21 Oct 2019 21:05:25 +0300
Subject: [PATCH] FIX: Load user model when some attributes are missing.

Follow-up to 3ad07aacfaab57aa458b43c3896ccb805bb26722.
---
 app/models/notification.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index 4f300f81380..0d2a232b619 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -218,8 +218,12 @@ class Notification < ActiveRecord::Base
 
   def refresh_notification_count
     begin
-      user.notifications.reset
-      user.publish_notifications_state
+      if user.has_attribute?(:seen_notification_id)
+        user.notifications.reset
+        user.publish_notifications_state
+      else
+        User.find_by(id: user.id).publish_notifications_state
+      end
     rescue ActiveRecord::RecordNotFound
       # happens when we delete a user
     end