Ticket #7501: 7501.1.diff

src/bp-groups/bp-groups-functions.php

@@ -717 +717 @@
                 'group_type__not_in' => '',             // Array or comma-separated list of group types that will be excluded from results.
                 'meta_query'         => false,          // Filter by groupmeta. See WP_Meta_Query for syntax.
                 'show_hidden'        => false,          // Show hidden groups to non-admins.
+                'status'             => array(),        // Array or comma-separated list of group statuses to limit results to.
                 'per_page'           => 20,             // The number of results to return per page.
                 'page'               => 1,              // The page to return if limiting per page.
                 'update_meta_cache'  => true,           // Pre-fetch groupmeta for queried groups.
@@ -739 +740 @@
                 'group_type__not_in' => $r['group_type__not_in'],
                 'meta_query'         => $r['meta_query'],
                 'show_hidden'        => $r['show_hidden'],
+                'status'             => $r['status'],
                 'per_page'           => $r['per_page'],
                 'page'               => $r['page'],
                 'update_meta_cache'  => $r['update_meta_cache'],

src/bp-groups/classes/class-bp-groups-group.php

@@ -919 +919 @@
          *     @type bool         $update_admin_cache Whether to pre-fetch administrator IDs for the returned
          *                                            groups. Default: false.
          *     @type bool         $show_hidden        Whether to include hidden groups in results. Default: false.
+         *     @type array|string $status             Optional. Array or comma-separated list of group statuses to limit
+         *                                            results to. If specified, $show_hidden is ignored.
+         *                                            Default: empty array.
          * }
          * @return array {
          *     @type array $groups Array of group objects returned by the
@@ -969 +972 @@
                         'update_admin_cache' => false,
                         'exclude'            => false,
                         'show_hidden'        => false,
+                        'status'             => array()
                 );
 
                 $r = wp_parse_args( $args, $defaults );
@@ -989 +993 @@
 
                 $where_conditions = array();
 
-                if ( empty( $r['show_hidden'] ) ) {
+
+                if ( ! empty( $r['status'] ) ) {
+                        if ( ! is_array( $r['status'] ) ) {
+                                $r['status'] = preg_split( '/[\s,]+/', $r['status'] );
+                        }
+                        $r['status'] = array_map( 'sanitize_title', $r['status'] );
+                        $status_in = "'" . implode( "','", $r['status'] ) . "'";
+                        $where_conditions['status'] = "g.status IN ({$status_in})";
+                } elseif ( empty( $r['show_hidden'] ) ) {
                         $where_conditions['hidden'] = "g.status != 'hidden'";
                 }
 

tests/phpunit/testcases/groups/class-bp-groups-group.php

@@ -2116 +2116 @@
                 $this->assertEqualSets( array( $g1, $g3 ), $found );
         }
 
+        /**
+         * @group get_by_status
+         */
+        public function test_get_by_status() {
+                $g1 = $this->factory->group->create(array(
+                        'status'      => 'private'
+                ) );
+                $g2 = $this->factory->group->create( array(
+                        'status'      => 'public'
+                ) );
+                $g3 = $this->factory->group->create( array(
+                        'status'      => 'hidden'
+                ) );
+
+                $groups = BP_Groups_Group::get( array(
+                        'status' => array( 'private', 'hidden' ),
+                ) );
+
+                $found = wp_list_pluck( $groups['groups'], 'id' );
+                $this->assertEqualSets( array( $g1, $g3 ), $found );
+        }
+
+        /**
+         * @group get_by_status
+         */
+        public function test_get_by_status_accept_string() {
+                $g1 = $this->factory->group->create(array(
+                        'status'      => 'private'
+                ) );
+                $g2 = $this->factory->group->create( array(
+                        'status'      => 'public'
+                ) );
+                $g3 = $this->factory->group->create( array(
+                        'status'      => 'hidden'
+                ) );
+
+                $groups = BP_Groups_Group::get( array(
+                        'status' => 'public',
+                ) );
+
+                $found = wp_list_pluck( $groups['groups'], 'id' );
+                $this->assertEqualSets( array( $g2 ), $found );
+        }
+
+        /**
+         * @group get_by_status
+         */
+        public function test_get_by_status_accept_comma_separated_string() {
+                $g1 = $this->factory->group->create(array(
+                        'status'      => 'private'
+                ) );
+                $g2 = $this->factory->group->create( array(
+                        'status'      => 'public'
+                ) );
+                $g3 = $this->factory->group->create( array(
+                        'status'      => 'hidden'
+                ) );
+
+                $groups = BP_Groups_Group::get( array(
+                        'status' => 'private, hidden',
+                ) );
+
+                $found = wp_list_pluck( $groups['groups'], 'id' );
+                $this->assertEqualSets( array( $g1, $g3 ), $found );
+        }
+
+        /**
+         * @group get_by_status
+         */
+        public function test_get_by_status_accept_space_separated_string() {
+                $g1 = $this->factory->group->create(array(
+                        'status'      => 'private'
+                ) );
+                $g2 = $this->factory->group->create( array(
+                        'status'      => 'public'
+                ) );
+                $g3 = $this->factory->group->create( array(
+                        'status'      => 'hidden'
+                ) );
+
+                $groups = BP_Groups_Group::get( array(
+                        'status' => 'public private',
+                ) );
+
+                $found = wp_list_pluck( $groups['groups'], 'id' );
+                $this->assertEqualSets( array( $g1, $g2 ), $found );
+        }
+
+
 }
 
 /**