Changeset 7182 for trunk/bp-groups/bp-groups-classes.php

Timestamp:

06/07/2013 02:06:51 AM (13 years ago)

Author:

boonebgorges

Message:

Improvements to how group total_member_count is refreshed on membership events

• Use an actual member count when refreshing, rather than incrementing
• Centralize all of the updating in the database methods, rather than having the updates spread throughout the groups component

Also adds integration tests for total_member_count as relates to the groups_*
functions.

See #5018

File:

• trunk/bp-groups/bp-groups-classes.php (modified) (6 diffs)

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

@@ -1226 +1226 @@
                 self::refresh_total_group_count_for_user( $this->user_id );
 
+                // Update the group's member count
+                self::refresh_total_member_count_for_group( $this->group_id );
+
                 do_action_ref_array( 'groups_member_after_save', array( &$this ) );
 
@@ -1256 +1259 @@
 
         function ban() {
-
                 if ( !empty( $this->is_admin ) )
                         return false;
@@ -1263 +1265 @@
                 $this->is_banned = 1;
 
-                groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) - 1 ) );
-
                 return $this->save();
         }
 
         function unban() {
-
                 if ( !empty( $this->is_admin ) )
                         return false;
 
                 $this->is_banned = 0;
-
-                groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) + 1 ) );
 
                 return $this->save();
@@ -1299 +1296 @@
                         return false;
 
-                groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) - 1 ) );
-
                 // Update the user's group count
                 self::refresh_total_group_count_for_user( $this->user_id );
 
+                // Update the group's member count
+                self::refresh_total_member_count_for_group( $this->group_id );
+
                 return $result;
         }
@@ -1309 +1307 @@
         /** Static Methods ********************************************************/
 
+        /**
+         * Refresh the total_group_count for a user
+         *
+         * @since BuddyPress (1.8)
+         * @param int $user_id
+         * @return bool True on success
+         */
         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 ) );
+                return bp_update_user_meta( $user_id, 'total_group_count', (int) self::total_group_count( $user_id ) );
+        }
+
+        /**
+         * Refresh the total_member_count for a group
+         *
+         * @since BuddyPress (1.8)
+         * @param int $group_id
+         * @return bool True on success
+         */
+        public static function refresh_total_member_count_for_group( $group_id ) {
+                return groups_update_groupmeta( $group_id, 'total_member_count', (int) BP_Groups_Group::get_total_member_count( $group_id ) );
         }
 
@@ -1320 +1336 @@
                 // Update the user's group count
                 self::refresh_total_group_count_for_user( $user_id );
+
+                // Update the group's member count
+                self::refresh_total_member_count_for_group( $group_id );
 
                 return $remove;