Changeset 5916

Timestamp:

08/15/2015 08:59:51 AM (10 years ago)

Author:

netweb

Message:

Tools: Include pending replies in the count when running the "Count pending, spammed, & trashed replies in each topic" repair tool

This changeset ensures that pending replies are included in the topic meta _bbp_reply_count_hidden count after running the repair tool bbp_admin_repair_topic_hidden_reply_count(), includes unit tests.

Props netweb. Fixes #2849

Location:

trunk

Files:

• src/includes/admin/tools.php (modified) (3 diffs)
• tests/phpunit/testcases/admin/tools.php (modified) (1 diff)

trunk/src/includes/admin/tools.php

@@ -1063 +1063 @@
  * @uses bbp_get_trash_status_id() To get the trash status id
  * @uses bbp_get_spam_status_id() To get the spam status id
+ * @uses bbp_get_pending_status_id() To get the pending status id
  * @return array An array of the status code and the message
  */
@@ -1069 +1070 @@
     // Define variables
     $bbp_db    = bbp_db();
-    $statement = __( 'Counting the number of spammed and trashed replies in each topic… %s', 'bbpress' );
+    $statement = __( 'Counting the number of pending, spammed, and trashed replies in each topic… %s', 'bbpress' );
     $result    = __( 'Failed!', 'bbpress' );
 
@@ -1081 +1082 @@
     $tps = bbp_get_trash_status_id();
     $sps = bbp_get_spam_status_id();
-
-    $sql = "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`) (SELECT `post_parent`, '_bbp_reply_count_hidden', COUNT(`post_status`) as `meta_value` FROM `{$bbp_db->posts}` WHERE `post_type` = '{$rpt}' AND `post_status` IN ( '{$tps}', '{$sps}' ) GROUP BY `post_parent`);";
+    $pps = bbp_get_pending_status_id();
+
+    $sql = "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`) (SELECT `post_parent`, '_bbp_reply_count_hidden', COUNT(`post_status`) as `meta_value` FROM `{$bbp_db->posts}` WHERE `post_type` = '{$rpt}' AND `post_status` IN ( '{$tps}', '{$sps}', '{$pps}' ) GROUP BY `post_parent`);";
     if ( is_wp_error( $bbp_db->query( $sql ) ) ) {
         return array( 2, sprintf( $statement, $result ) );

trunk/tests/phpunit/testcases/admin/tools.php

@@ -167 +167 @@
     /**
      * @covers ::bbp_admin_repair_topic_hidden_reply_count
-     * @todo   Implement test_bbp_admin_repair_topic_hidden_reply_count().
      */
     public function test_bbp_admin_repair_topic_hidden_reply_count() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+
+        $f = $this->factory->forum->create();
+
+        $t = $this->factory->topic->create( array(
+            'post_parent' => $f,
+            'topic_meta' => array(
+                'forum_id' => $f,
+            ),
+        ) );
+
+        $r = $this->factory->reply->create( array(
+            'post_parent' => $t,
+            'reply_meta' => array(
+                'forum_id' => $f,
+                'topic_id' => $t,
+            ),
+        ) );
+
+        $count = bbp_get_topic_reply_count( $t, true );
+        $this->assertSame( 1, $count );
+
+        $r = $this->factory->reply->create_many( 3, array(
+            'post_parent' => $t,
+            'reply_meta' => array(
+                'forum_id' => $f,
+                'topic_id' => $t,
+            ),
+        ) );
+
+        bbp_spam_reply( $r[0] );
+        bbp_unapprove_reply( $r[2] );
+
+        $count = bbp_get_topic_reply_count_hidden( $t, true );
+        $this->assertSame( 2, $count );
+
+        // Delete the topic _bbp_reply_count_hidden meta key.
+        $this->assertTrue( delete_post_meta_by_key( '_bbp_reply_count_hidden' ) );
+
+        $count = bbp_get_topic_reply_count_hidden( $t, true );
+        $this->assertSame( 0, $count );
+
+        // Repair the topic hidden reply count meta.
+        bbp_admin_repair_topic_hidden_reply_count();
+
+        bbp_clean_post_cache( $t );
+
+        $count = bbp_get_topic_reply_count_hidden( $t, true );
+        $this->assertSame( 2, $count );
     }