new notification count caching

Author: imorland

framework/core/src/Api/Controller/ListNotificationsController.php

@@ -64,6 +64,9 @@ protected function data(ServerRequestInterface $request, Document $document)
 
         $actor->markNotificationsAsRead()->save();
 
+        // Invalidate new notification count cache since read_notifications_at changed
+        resolve('cache.store')->forget("user.{$actor->id}.new_notification_count");
+
         $limit = $this->extractLimit($request);
         $offset = $this->extractOffset($request);
         $include = $this->extractInclude($request);

framework/core/src/Notification/Command/ReadAllNotificationsHandler.php

@@ -48,8 +48,10 @@ public function handle(ReadAllNotifications $command)
 
         $this->notifications->markAllAsRead($actor);
 
-        // Invalidate notification count cache
-        resolve('cache.store')->forget("user.{$actor->id}.unread_notification_count");
+        // Invalidate notification count caches
+        $cache = resolve('cache.store');
+        $cache->forget("user.{$actor->id}.unread_notification_count");
+        $cache->forget("user.{$actor->id}.new_notification_count");
 
         $this->events->dispatch(new ReadAll($actor, Carbon::now()));
     }

framework/core/src/Notification/Command/ReadNotificationHandler.php

@@ -51,8 +51,10 @@ public function handle(ReadNotification $command)
 
         $notification->read_at = Carbon::now();
 
-        // Invalidate notification count cache
-        resolve('cache.store')->forget("user.{$actor->id}.unread_notification_count");
+        // Invalidate notification count caches
+        $cache = resolve('cache.store');
+        $cache->forget("user.{$actor->id}.unread_notification_count");
+        $cache->forget("user.{$actor->id}.new_notification_count");
 
         $this->events->dispatch(new Read($actor, $notification, Carbon::now()));
 

framework/core/src/Notification/Notification.php

@@ -234,10 +234,11 @@ public static function notify(array $recipients, BlueprintInterface $blueprint)
             }, $recipients)
         );
 
-        // Invalidate notification count cache for all recipients
+        // Invalidate notification count caches for all recipients
         $cache = resolve('cache.store');
         foreach ($recipients as $user) {
             $cache->forget("user.{$user->id}.unread_notification_count");
+            $cache->forget("user.{$user->id}.new_notification_count");
         }
     }
 

framework/core/src/User/User.php

@@ -472,9 +472,15 @@ protected function getUnreadNotifications()
      */
     public function getNewNotificationCount()
     {
-        return $this->unreadNotifications()
-            ->where('created_at', '>', $this->read_notifications_at ?? 0)
-            ->count();
+        // Cache notification count for 5 minutes to avoid expensive query on every page load
+        // Cache is actively invalidated when notifications change or user views notifications
+        $cacheKey = "user.{$this->id}.new_notification_count";
+
+        return resolve('cache.store')->remember($cacheKey, 300, function () {
+            return $this->unreadNotifications()
+                ->where('created_at', '>', $this->read_notifications_at ?? 0)
+                ->count();
+        });
     }
 
     /**