Changeset 10788

Timestamp:

05/19/2016 05:43:23 PM (9 years ago)

Author:

r-a-y

Message:

Notifications: Make notification meta great again.

This commit fixes this for the betterment of notifications everywhere.

Fixes #7067.

Location:

trunk

Files:

• src/bp-notifications/bp-notifications-functions.php (modified) (4 diffs)
• src/bp-notifications/classes/class-bp-notifications-component.php (modified) (2 diffs)
• tests/phpunit/testcases/notifications/functions.php (modified) (1 diff)

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

@@ -702 +702 @@
     add_filter( 'query', 'bp_filter_metaid_column_name' );
     foreach ( $keys as $key ) {
-        $retval = delete_metadata( 'notifications', $notification_id, $key, $meta_value, $delete_all );
+        $retval = delete_metadata( 'notification', $notification_id, $key, $meta_value, $delete_all );
     }
     remove_filter( 'query', 'bp_filter_metaid_column_name' );
@@ -727 +727 @@
 function bp_notifications_get_meta( $notification_id = 0, $meta_key = '', $single = true ) {
     add_filter( 'query', 'bp_filter_metaid_column_name' );
-    $retval = get_metadata( 'notifications', $notification_id, $meta_key, $single );
+    $retval = get_metadata( 'notification', $notification_id, $meta_key, $single );
     remove_filter( 'query', 'bp_filter_metaid_column_name' );
 
@@ -762 +762 @@
 function bp_notifications_update_meta( $notification_id, $meta_key, $meta_value, $prev_value = '' ) {
     add_filter( 'query', 'bp_filter_metaid_column_name' );
-    $retval = update_metadata( 'notifications', $notification_id, $meta_key, $meta_value, $prev_value );
+    $retval = update_metadata( 'notification', $notification_id, $meta_key, $meta_value, $prev_value );
     remove_filter( 'query', 'bp_filter_metaid_column_name' );
 
@@ -783 +783 @@
 function bp_notifications_add_meta( $notification_id, $meta_key, $meta_value, $unique = false ) {
     add_filter( 'query', 'bp_filter_metaid_column_name' );
-    $retval = add_metadata( 'notifications', $notification_id, $meta_key, $meta_value, $unique );
+    $retval = add_metadata( 'notification', $notification_id, $meta_key, $meta_value, $unique );
     remove_filter( 'query', 'bp_filter_metaid_column_name' );
 

trunk/src/bp-notifications/classes/class-bp-notifications-component.php

@@ -83 +83 @@
         );
 
+        // Metadata tables for notifications component.
+        $meta_tables = array(
+            'notification' => $bp->table_prefix . 'bp_notifications_meta',
+        );
+
         // All globals for the notifications component.
         // Note that global_tables is included in this array.
@@ -90 +95 @@
             'search_string' => __( 'Search Notifications...', 'buddypress' ),
             'global_tables' => $global_tables,
+            'meta_tables'   => $meta_tables
         );
 

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

@@ -122 +122 @@
 
         $this->assertFalse( wp_cache_get( 'all_for_user_' . $u, 'bp_notifications' ) );
+    }
+
+    /**
+     * @group bp_notifications_update_meta_cache
+     */
+    public function test_bp_notifications_update_meta_cache() {
+        $u = $this->factory->user->create();
+
+        $n1 = $this->factory->notification->create( array(
+            'component_name' => 'messages',
+            'user_id'        => $u
+        ) );
+
+        $n2 = $this->factory->notification->create( array(
+            'component_name' => 'groups',
+            'user_id'        => $u
+        ) );
+
+        // Add cache for each notification.
+        bp_notifications_update_meta( $n1, 'meta', 'data' );
+        bp_notifications_update_meta( $n1, 'data', 'meta' );
+        bp_notifications_update_meta( $n2, 'meta', 'human' );
+
+        // Prime cache.
+        bp_notifications_get_meta( $n1, 'meta' );
+
+        // Ensure an empty cache for second notification.
+        wp_cache_delete( $n2, 'notification_meta' );
+
+        // Update notification meta cache.
+        bp_notifications_update_meta_cache( array( $n1, $n2 ) );
+
+        $expected = array(
+            $n1 => array(
+                'meta' => array(
+                    'data',
+                ),
+                'data' => array(
+                    'meta',
+                ),
+            ),
+            $n2 => array(
+                'meta' => array(
+                    'human',
+                ),
+            ),
+        );
+
+        $found = array(
+            $n1 => wp_cache_get( $n1, 'notification_meta' ),
+            $n2 => wp_cache_get( $n2, 'notification_meta' ),
+        );
+
+        $this->assertEquals( $expected, $found );
     }