Changeset 11851

Timestamp:

02/08/2018 03:20:59 PM (7 years ago)

Author:

boonebgorges

Message:

Notifications: User count query should be separately fetched and cached.

Previously, notification counts were calculated by fetching the entire
notification objects.

Props m_uysl.
See #7130.

Location:

trunk

Files:

• src/bp-notifications/bp-notifications-cache.php (modified) (1 diff)
• src/bp-notifications/bp-notifications-functions.php (modified) (1 diff)
• tests/phpunit/testcases/notifications/functions.php (modified) (4 diffs)

trunk/src/bp-notifications/bp-notifications-cache.php

@@ -44 +44 @@
 function bp_notifications_clear_all_for_user_cache( $user_id = 0 ) {
     wp_cache_delete( 'all_for_user_' . $user_id, 'bp_notifications' );
+    wp_cache_delete( $user_id, 'bp_notifications_unread_count' );
 }
 

trunk/src/bp-notifications/bp-notifications-functions.php

@@ -608 +608 @@
  */
 function bp_notifications_get_unread_notification_count( $user_id = 0 ) {
-    $notifications = bp_notifications_get_all_notifications_for_user( $user_id );
-    $count         = ! empty( $notifications ) ? count( $notifications ) : 0;
+    if ( empty( $user_id ) ) {
+        $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
+    }
+
+    $count = wp_cache_get( $user_id, 'bp_notifications_unread_count' );
+    if ( false === $count ) {
+        $count = BP_Notifications_Notification::get_total_count( array(
+            'user_id' => $user_id,
+            'is_new'  => true,
+        ) );
+        wp_cache_set( $user_id, $count, 'bp_notifications_unread_count' );
+    }
 
     /**

trunk/tests/phpunit/testcases/notifications/functions.php

@@ -36 +36 @@
 
         $this->assertFalse( wp_cache_get( 'all_for_user_' . $u, 'bp_notifications' ) );
+        $this->assertFalse( wp_cache_get( $u, 'bp_notifications_unread_count' ) );
     }
 
@@ -62 +63 @@
 
         $this->assertFalse( wp_cache_get( 'all_for_user_' . $u, 'bp_notifications' ) );
+        $this->assertFalse( wp_cache_get( $u, 'bp_notifications_unread_count' ) );
     }
 
@@ -92 +94 @@
 
         $this->assertFalse( wp_cache_get( 'all_for_user_' . $u, 'bp_notifications' ) );
+        $this->assertFalse( wp_cache_get( $u, 'bp_notifications_unread_count' ) );
     }
 
@@ -122 +125 @@
 
         $this->assertFalse( wp_cache_get( 'all_for_user_' . $u, 'bp_notifications' ) );
+        $this->assertFalse( wp_cache_get( $u, 'bp_notifications_unread_count' ) );
     }