Changeset 9714

Timestamp:

04/07/2015 01:18:51 AM (12 years ago)

Author:

r-a-y

Message:

Messages: Bust recipient cache when a message thread is marked as read or unread.

See r9482, which introduces message recipient caching.

Fixes #6220.

Location:

trunk

Files:

• src/bp-messages/classes/class-bp_messages-thread.php (modified) (2 diffs)
• tests/phpunit/testcases/messages/class.bp-messages-thread.php (modified) (1 diff)

trunk/src/bp-messages/classes/class-bp_messages-thread.php

@@ -509 +509 @@
                 $wpdb->query($sql);
 
+                wp_cache_delete( 'thread_recipients_' . $thread_id, 'bp_messages' );
                 wp_cache_delete( bp_loggedin_user_id(), 'bp_messages_unread_count' );
         }
@@ -526 +527 @@
                 $wpdb->query($sql);
 
+                wp_cache_delete( 'thread_recipients_' . $thread_id, 'bp_messages' );
                 wp_cache_delete( bp_loggedin_user_id(), 'bp_messages_unread_count' );
         }

trunk/tests/phpunit/testcases/messages/class.bp-messages-thread.php

@@ -217 +217 @@
                 $this->assertFalse( wp_cache_get( 'thread_recipients_' . $t1, 'bp_messages' ) );
         }
+
+        /**
+         * @group get_recipients
+         * @group cache
+         */
+        public function test_get_recipients_cache_should_be_busted_when_thread_is_read() {
+                global $wpdb;
+
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+
+                $t1 = $this->factory->message->create( array(
+                        'sender_id' => $u1,
+                        'recipients' => array( $u2 ),
+                        'subject' => 'Foo',
+                ) );
+
+                $thread = new BP_Messages_Thread( $t1 );
+                $recipients = $thread->get_recipients();
+
+                // Verify that the cache is populated.
+                $num_queries = $wpdb->num_queries;
+                $recipients_cached = $thread->get_recipients();
+                $this->assertEquals( $num_queries, $wpdb->num_queries );
+
+                // Mark thread as read
+                $current_user = get_current_user_id();
+                $this->set_current_user( $u2 );
+                messages_mark_thread_read( $t1 );
+
+                // Cache should be empty.
+                $this->assertFalse( wp_cache_get( 'thread_recipients_' . $t1, 'bp_messages' ) );
+
+                $this->set_current_user( $current_user );
+        }
+
+        /**
+         * @group get_recipients
+         * @group cache
+         */
+        public function test_get_recipients_cache_should_be_busted_when_thread_is_unread() {
+                global $wpdb;
+
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+
+                $t1 = $this->factory->message->create( array(
+                        'sender_id' => $u1,
+                        'recipients' => array( $u2 ),
+                        'subject' => 'Foo',
+                ) );
+
+                $thread = new BP_Messages_Thread( $t1 );
+                $recipients = $thread->get_recipients();
+
+                // Verify that the cache is populated.
+                $num_queries = $wpdb->num_queries;
+                $recipients_cached = $thread->get_recipients();
+                $this->assertEquals( $num_queries, $wpdb->num_queries );
+
+                // Mark thread as unread
+                $current_user = get_current_user_id();
+                $this->set_current_user( $u2 );
+                messages_mark_thread_unread( $t1 );
+
+                // Cache should be empty.
+                $this->assertFalse( wp_cache_get( 'thread_recipients_' . $t1, 'bp_messages' ) );
+
+                $this->set_current_user( $current_user );
+        }
 }