Changeset 7179

Timestamp:

06/07/2013 01:31:27 AM (12 years ago)

Author:

boonebgorges

Message:

Improvements to refreshing of total_group_count on group membership events

When group membership status is changed for a user, that user's
total_group_count meta must be updated. This changeset introduces a number of
improvements to the way this updating is done:

• Update using an actual queried group count, rather than incrementing. This ensures that even if the count is off (due to a bug in BP or some other plugin), it will be corrected the next time a membership event is recorded.
• Move the total_group_count refreshing further down the stack. Previously, the updating was happening at various depths: sometimes in the bp-groups-functions.php functions, sometimes in the database methods, and sometimes not at all. By moving the updates so that they directly follow the database queries, we reduce redundancy and ensure that the group count is updated in all cases

This changeset also introduces integration tests for the relevant groups_*
membership functions and total_group_count.

Fixes #5018

Props mukkundthanki, r-a-y for early patches

Location:

trunk

Files:

• bp-groups/bp-groups-classes.php (modified) (6 diffs)
• bp-groups/bp-groups-functions.php (modified) (1 diff)
• tests/testcases/groups/functions.php (added)

trunk/bp-groups/bp-groups-classes.php

@@ -1223 +1223 @@
         $this->id = $wpdb->insert_id;
 
+        // Update the user's group count
+        self::refresh_total_group_count_for_user( $this->user_id );
+
         do_action_ref_array( 'groups_member_after_save', array( &$this ) );
 
@@ -1277 +1280 @@
 
         groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) + 1 ) );
-        bp_update_user_meta( $this->user_id, 'total_group_count', (int) bp_get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
 
         return $this->save();
@@ -1287 +1289 @@
         $this->is_confirmed  = 1;
         $this->date_modified = bp_core_current_time();
-
-        bp_update_user_meta( $this->user_id, 'total_group_count', (int) bp_get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
     }
 
@@ -1295 +1295 @@
         $this->is_confirmed = 1;
         $this->date_modified = bp_core_current_time();
-
-        bp_update_user_meta( $this->user_id, 'total_group_count', (int) bp_get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
     }
 
@@ -1309 +1307 @@
         groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) - 1 ) );
 
-        $group_count = bp_get_user_meta( $this->user_id, 'total_group_count', true );
-        if ( !empty( $group_count ) )
-            bp_update_user_meta( $this->user_id, 'total_group_count', (int) $group_count - 1 );
+        // Update the user's group count
+        self::refresh_total_group_count_for_user( $this->user_id );
 
         return $result;
@@ -1318 +1315 @@
     /** Static Methods ********************************************************/
 
+    public static function refresh_total_group_count_for_user( $user_id ) {
+        bp_update_user_meta( $user_id, 'total_group_count', (int) self::total_group_count( $user_id ) );
+    }
+
     function delete( $user_id, $group_id ) {
         global $wpdb, $bp;
 
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id ) );
+        $remove = $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id ) );
+
+        // Update the user's group count
+        self::refresh_total_group_count_for_user( $user_id );
+
+        return $remove;
     }
 

trunk/bp-groups/bp-groups-functions.php

@@ -302 +302 @@
     // Modify group member count
     groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') - 1 );
-
-    // Modify user's group memberhip count
-    bp_update_user_meta( $user_id, 'total_group_count', (int) bp_get_user_meta( $user_id, 'total_group_count', true ) - 1 );
 
     /**