Changeset 12430

Timestamp:

08/12/2019 08:43:10 PM (6 years ago)

Author:

dcavins

Message:

Update BP_Groups_Group for Invitation API compatibility.

• Update logic in BP_Groups_Group to avoid direct table lookups and instead use request and invitation functions to fetch and delete invitations.

See #6210.

Location:

trunk

Files:

• src/bp-groups/classes/class-bp-groups-group.php (modified) (3 diffs)
• tests/phpunit/testcases/groups/class-bp-groups-group.php (modified) (4 diffs)

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

@@ -772 +772 @@
      */
     public static function get_invites( $user_id, $group_id, $sent = null ) {
-        global $wpdb;
-
-        $bp  = buddypress();
-        $sql = $wpdb->prepare( "SELECT user_id FROM {$bp->groups->table_name_members} WHERE group_id = %d and is_confirmed = 0 AND inviter_id = %d", $group_id, $user_id );
-
-        // Query for a specific invite sent status.
-        if ( ! is_null( $sent ) ) {
-            $sql .= $wpdb->prepare( ' AND invite_sent = %d', $sent );
-        }
-
-        return $wpdb->get_col( $sql );
+        if ( 0 === $sent ) {
+            $sent_arg = 'draft';
+        } else if ( 1 === $sent ) {
+            $sent_arg = 'sent';
+        } else {
+            $sent_arg = 'all';
+        }
+
+        return groups_get_invites( array(
+            'item_id'     => $group_id,
+            'inviter_id'  => $user_id,
+            'invite_sent' => $sent_arg,
+            'fields'      => 'user_ids',
+        ) );
     }
 
@@ -960 +963 @@
      */
     public static function get_membership_requests( $group_id, $limit = null, $page = null ) {
-        global $wpdb;
-
-        if ( !empty( $limit ) && !empty( $page ) ) {
-            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-        }
-
-        $bp = buddypress();
-
-        $paged_requests = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 0 AND inviter_id = 0{$pag_sql}", $group_id ) );
-        $total_requests = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 0 AND inviter_id = 0", $group_id ) );
-
-        return array( 'requests' => $paged_requests, 'total' => $total_requests );
+        $args = array(
+            'item_id' => $group_id
+        );
+        if ( $limit ) {
+            $args['per_page'] = $limit;
+        }
+        if ( $page ) {
+            $args['page'] = $page;
+        }
+
+        $requests = groups_get_requests( $args );
+        $total    = count( groups_get_membership_requested_user_ids( $group_id ) );
+
+        return array( 'requests' => $requests, 'total' => $total );
     }
 
@@ -1638 +1643 @@
      */
     public static function delete_all_invites( $group_id ) {
-        global $wpdb;
-
-        $bp = buddypress();
-
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE group_id = %d AND invite_sent = 1", $group_id ) );
+        if ( empty( $group_id ) ) {
+            return false;
+        }
+
+        $invites_class = new BP_Groups_Invitation_Manager();
+
+        return $invites_class->delete( array(
+            'item_id' => $group_id,
+        ) );
     }
 

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

@@ -1373 +1373 @@
     public function test_get_group_extras_invited() {
         $u = self::factory()->user->create();
-        $g = self::factory()->group->create();
-
-        $invite                = new BP_Groups_Member;
-        $invite->group_id      = $g;
-        $invite->user_id       = $u;
-        $invite->date_modified = bp_core_current_time();
-        $invite->invite_sent   = true;
-        $invite->is_confirmed  = false;
-        $invite->save();
+        $u2 = self::factory()->user->create();
+        $g = self::factory()->group->create( array( 'creator_id' => $u2, 'status' => 'private' ) );
+
+        // Outstanding invitations should be left intact.
+        groups_invite_user( array(
+            'user_id' => $u,
+            'group_id' => $g,
+            'inviter_id' => $u2,
+            'send_invite' => 1,
+        ) );
 
         $paged_groups = array();
@@ -1412 +1413 @@
     public function test_get_group_extras_pending() {
         $u = self::factory()->user->create();
-        $g = self::factory()->group->create();
-
-        $invite                = new BP_Groups_Member;
-        $invite->group_id      = $g;
-        $invite->user_id       = $u;
-        $invite->date_modified = bp_core_current_time();
-        $invite->invite_sent   = false;
-        $invite->is_confirmed  = false;
-        $invite->save();
+        $g = self::factory()->group->create( array( 'status' => 'private' ) );
+
+        // Create membership request
+        groups_send_membership_request( array(
+            'user_id'       => $u,
+            'group_id'      => $g,
+        ) );
 
         $paged_groups = array();
@@ -1607 +1606 @@
         $this->assertFalse( $group_a->is_invited );
 
-        $this->add_user_to_group( $users[1], $g, array(
-            'invite_sent' => 1,
+        groups_invite_user( array(
+            'user_id'    => $users[1],
+            'group_id'   => $g,
             'inviter_id' => $users[0],
-            'is_confirmed' => 0,
-        ) );
+            'send_invite' => 1
+        ) );
+
         $group_b = new BP_Groups_Group( $g );
         $this->assertFalse( $group_b->is_invited );
@@ -1631 +1632 @@
         $this->assertFalse( $group_a->is_pending );
 
-        $this->add_user_to_group( $users[1], $g, array(
-            'is_confirmed' => 0,
-            'invite_sent' => 0,
-            'inviter_id' => 0,
-        ) );
+        groups_send_membership_request( array(
+            'user_id' => $users[1],
+            'group_id' => $g
+        ) );
+
         $group_b = new BP_Groups_Group( $g );
         $this->assertFalse( $group_b->is_pending );