PROD-7348 Update member query and xprofile search query for performance

src/bp-core/admin/bp-core-admin-schema.php

@@ -481,6 +481,7 @@ function bp_core_install_extended_profiles() {
 
 	dbDelta( $sql );
 
+	bb_core_install_xprofile_visibility();
 	bp_core_install_default_profiles_fields();
 }
 
@@ -1231,7 +1232,10 @@ function bp_core_install_suspend() {
 	   PRIMARY KEY  (id),
 	   KEY suspend_item_id (item_id,item_type,blog_id),
 	   KEY suspend_item (item_id,item_type),
-	   KEY item_id (item_id)
+	   KEY item_id (item_id),
+	   KEY user_suspended (user_suspended),
+	   KEY hide_parent (hide_parent),
+	   KEY hide_sitewide (hide_sitewide)
     ) {$charset_collate};";
 
 	$sql[] = "CREATE TABLE {$bp_prefix}bp_suspend_details (
@@ -1375,3 +1379,46 @@ function bb_core_install_subscription() {
 
 	dbDelta( $sql );
 }
+
+/**
+ * Install database tables for the xprofile visibility new structure.
+ *
+ * @since BuddyBoss [BBVERSION]
+ *
+ * @uses  bp_core_get_table_prefix()
+ * @uses  dbDelta()
+ */
+function bb_core_install_xprofile_visibility() {
+	global $wpdb;
+
+	$bp_prefix = bp_core_get_table_prefix();
+
+	// Install bb_xprofile_visibility table if already not exists.
+	$table_exists = $wpdb->get_var( "SHOW TABLES LIKE '{$bp_prefix}bb_xprofile_visibility'" );
+	if ( ! $table_exists ) {
+		$sql             = array();
+		$charset_collate = $wpdb->get_charset_collate();
+
+		$sql[] = "CREATE TABLE {$bp_prefix}bb_xprofile_visibility (
+					id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+					field_id bigint(20) unsigned NOT NULL,
+					user_id bigint(20) unsigned NOT NULL,
+					value varchar(20) DEFAULT NULL,
+					last_updated datetime NOT NULL,
+					PRIMARY KEY (id),
+					KEY field_id (field_id),
+					KEY user_id (user_id),
+					KEY value (value),
+					UNIQUE KEY unique_field_id_user_id (field_id,user_id)
+				) {$charset_collate};";
+
+		dbDelta( $sql );
+	}
+
+	/**
+	 * Fires after BuddyBoss adds the xprofile visibility table.
+	 *
+	 * @since BuddyBoss [BBVERSION]
+	 */
+	do_action( 'bp_core_install_xprofile_visibility' );
+}

src/bp-core/bp-core-update.php

@@ -491,6 +491,10 @@ function bp_version_updater() {
 			bb_update_to_2_6_10();
 		}
 
+		if ( $raw_db_version < 21121 ) {
+			bb_update_to_2_6_20();
+		}
+
 		if ( $raw_db_version !== $current_db ) {
 			// @todo - Write only data manipulate migration here. ( This is not for DB structure change ).
 
@@ -3603,3 +3607,64 @@ function bb_remove_symlinks( $folder_path ) {
 		closedir( $handle );
 	}
 }
+
+/**
+ * Add keys for user_suspended, hide_parent, hide_sitewide columns.
+ *
+ * @since BuddyBoss [BBVERSION]
+ *
+ * @return void
+ */
+function bb_update_to_2_6_20() {
+	global $wpdb;
+
+	$bp_prefix = function_exists( 'bp_core_get_table_prefix' ) ? bp_core_get_table_prefix() : $wpdb->base_prefix;
+
+	// Check if the 'bp_suspend' table exists.
+	// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+	$table_exists = $wpdb->get_var( "SHOW TABLES LIKE '{$bp_prefix}bp_suspend'" );
+	if ( $table_exists ) {
+
+		// Get all existing indexes for the table.
+		$indexes = $wpdb->get_col( $wpdb->prepare(
+			"SELECT index_name
+			FROM INFORMATION_SCHEMA.STATISTICS
+			WHERE table_schema = DATABASE()
+			AND table_name = %s",
+			"{$bp_prefix}bp_suspend"
+		));
+
+		// Array to store parts of the ALTER TABLE query.
+		$alter_statements = [];
+
+		// Add key for user_suspended if it doesn't exist.
+		if ( ! in_array( 'user_suspended', $indexes ) ) {
+			$alter_statements[] = "ADD KEY user_suspended (user_suspended)";
+		}
+
+		// Add key for hide_parent if it doesn't exist.
+		if ( ! in_array( 'hide_parent', $indexes ) ) {
+			$alter_statements[] = "ADD KEY hide_parent (hide_parent)";
+		}
+
+		// Add key for hide_sitewide if it doesn't exist.
+		if ( ! in_array( 'hide_sitewide', $indexes ) ) {
+			$alter_statements[] = "ADD KEY hide_sitewide (hide_sitewide)";
+		}
+
+		// If there are any statements to execute, run the ALTER TABLE query.
+		if ( ! empty( $alter_statements ) ) {
+			$alter_query = "ALTER TABLE {$bp_prefix}bp_suspend " . implode( ', ', $alter_statements );
+			$wpdb->query( $alter_query ); //phpcs:ignore
+		}
+	}
+
+	// Run migration.
+	$is_already_run = get_transient( 'bb_migrate_xprofile_visibility' );
+	if ( ! $is_already_run ) {
+		bb_core_install_xprofile_visibility();
+		bb_migrate_xprofile_visibility( true );
+		set_transient( 'bb_migrate_xprofile_visibility', 'yes', HOUR_IN_SECONDS );
+	}
+
+}

src/bp-core/classes/class-bp-user-query.php

@@ -311,25 +311,23 @@ public function prepare_user_ids_query() {
 			case 'active':
 			case 'newest':
 			case 'random':
-				$this->uid_name  = 'ID';
-				$this->uid_table = $wpdb->users;
-				$sql['select']   = $wpdb->prepare( "SELECT u.{$this->uid_name} as id FROM {$this->uid_table} u LEFT JOIN {$bp->members->table_name_last_activity} a ON u.ID = a.user_id AND a.component = %s AND a.type = 'last_activity' ", buddypress()->members->id );
-				$sql['where'][]  = ' u.user_status = 0 ';
+				$this->uid_name  = 'user_id';
+				$this->uid_table = $bp->members->table_name_last_activity;
+				$sql['select']   = "SELECT u.{$this->uid_name} as id FROM {$this->uid_table} u";
+				$sql['where'][]  = $wpdb->prepare( "u.component = %s AND u.type = 'last_activity'", buddypress()->members->id );
 
 				if ( 'newest' == $type ) {
-					$sql['orderby'] = 'ORDER BY u.ID';
+					$sql['orderby'] = 'ORDER BY u.user_id';
 					$sql['order']   = 'DESC';
 				} elseif ( 'random' == $type ) {
 					$sql['orderby'] = 'ORDER BY rand()';
 				} else {
-					$sql['orderby'] = array(
-						array( 'COALESCE( a.date_recorded, NULL )', 'DESC' ),
-						array( 'u.display_name', 'ASC' ),
-					);
+					$sql['orderby'] = 'ORDER BY u.date_recorded';
+					$sql['order']   = 'DESC';
 				}
 
 				// Date query.
-				$date_query = BP_Date_Query::get_where_sql( $date_query, 'a.date_recorded' );
+				$date_query = BP_Date_Query::get_where_sql( $date_query, 'u.date_recorded' );
 				if ( ! empty( $date_query ) ) {
 					$sql['where']['date_query'] = $date_query;
 				}

src/bp-core/profile-search/bps-search.php

@@ -323,8 +323,6 @@ function bp_ps_search( $request, $users = null ) {
 
 	$fields = bp_ps_parse_request( $request );
 
-	$copied_arr = array();
-
 	foreach ( $fields as $f ) {
 		// Disable search for some individual field.
 		if ( ! apply_filters( 'bp_ps_field_can_filter', true, $f, $request ) ) {
@@ -343,23 +341,6 @@ function bp_ps_search( $request, $users = null ) {
 		$found = call_user_func( $f->search, $f );
 		$found = apply_filters( 'bp_ps_field_search_results', $found, $f );
 
-		$copied_arr = $found;
-		if ( isset( $copied_arr, $f->id ) && ! empty( $copied_arr ) ) {
-			foreach ( $copied_arr as $key => $user ) {
-				$field_visibility = xprofile_get_field_visibility_level( intval( $f->id ), intval( $user ) );
-				if ( 'adminsonly' === $field_visibility && ! current_user_can( 'administrator' ) ) {
-					if ( ( $key = array_search( $user, $found ) ) !== false ) {
-						unset( $found[ $key ] );
-					}
-				}
-				if ( 'friends' === $field_visibility && ! current_user_can( 'administrator' ) && false === friends_check_friendship( intval( $user ), bp_loggedin_user_id() ) ) {
-					if ( ( $key = array_search( $user, $found ) ) !== false ) {
-						unset( $found[ $key ] );
-					}
-				}
-			}
-		}
-
 		$match_all = apply_filters( 'bp_ps_match_all', true );
 		if ( $match_all ) {
 			$users = isset( $users ) ? array_intersect( $users, $found ) : $found;

src/bp-core/profile-search/bps-xprofile.php

@@ -81,18 +81,43 @@ function bp_ps_xprofile_search( $f ) {
 	$value  = $f->value;
 	$filter = $f->format . '_' . ( $f->filter == '' ? 'is' : $f->filter );
 
-	$sql                      = array(
+	$sql           = array(
 		'select' => '',
 		'where'  => array(),
 	);
-	$sql['select']            = "SELECT user_id, field_id FROM {$bp->profile->table_name_data}";
+	$sql['select'] = "SELECT DISTINCT xpd.user_id FROM {$bp->profile->table_name_data} xpd";
 
 	if ( 'on' === bp_xprofile_get_meta( $f->group_id, 'group', 'is_repeater_enabled', true ) ) {
 		$sql['where']['field_id'] = $wpdb->prepare( "field_id IN ( SELECT f.id FROM {$bp->profile->table_name_fields} as f, {$bp->profile->table_name_meta} as m where f.id = m.object_id AND group_id = %d AND f.type = %s AND m.meta_key = '_cloned_from' AND m.meta_value = %d )", $f->group_id, $f->type, $f->id );
 	} else {
 		$sql['where']['field_id'] = $wpdb->prepare( 'field_id = %d', $f->id );
 	}
 
+	if (
+		! current_user_can( 'administrator' )
+	) {
+		$field_visibility = array( 'public' );
+		if ( is_user_logged_in() ) {
+			$loggin_user_id = bp_loggedin_user_id();
+			$field_visibility[] = 'loggedin';
+			if ( bp_is_active( 'friends' ) ) {
+				$friend_ids_sql = $wpdb->prepare(
+					"SELECT CASE WHEN initiator_user_id = %d THEN friend_user_id ELSE initiator_user_id END AS friend_id
+					FROM {$bp->friends->table_name} WHERE is_confirmed = 1 AND( initiator_user_id = %d OR friend_user_id = %d )",
+					$loggin_user_id,
+					$loggin_user_id,
+					$loggin_user_id
+				);
+			}
+		}
+		$sql['where'][] = "field_id IN (
+			SELECT field_id FROM {$bp->profile->table_name_visibility} WHERE xpd.user_id = user_id AND ( `value` IN ('" . implode( "','", $field_visibility ) . "')
+				OR ( `value` = 'friends' AND user_id IN ({$friend_ids_sql}) )
+				OR ( user_id = {$loggin_user_id} )
+			)
+		)";
+	}
+
 	switch ( $filter ) {
 		case 'integer_range':
 			if ( isset( $value['min'] ) ) {
@@ -218,37 +243,7 @@ function bp_ps_xprofile_search( $f ) {
 	$sql   = apply_filters( 'bp_ps_field_sql', $sql, $f );
 	$query = $sql['select'] . ' WHERE ' . implode( ' AND ', $sql['where'] );
 
-	// If repeater enabel then we check repeater field id is private or not.
-	if ( 'on' === bp_xprofile_get_meta( $f->group_id, 'group', 'is_repeater_enabled', true ) ) {
-		$results  = $wpdb->get_results( $query, ARRAY_A );
-		$user_ids = array();
-		if ( ! empty( $results ) ) {
-			foreach ( $results as $key => $value ) {
-				$field_id = ! empty( $value['field_id'] ) ? (int) $value['field_id'] : 0;
-				$user_id  = ! empty( $value['user_id'] ) ? (int) $value['user_id'] : 0;
-				if ( ! empty( $field_id ) && ! empty( $user_id ) ) {
-					$field_visibility = xprofile_get_field_visibility_level( intval( $field_id ), intval( $user_id ) );
-					if (
-						! current_user_can( 'administrator' ) &&
-						(
-							'adminsonly' === $field_visibility ||
-							(
-								bp_is_active( 'friends' ) &&
-								'friends' === $field_visibility &&
-								false === friends_check_friendship( intval( $user_id ), bp_loggedin_user_id() )
-							)
-						)
-					) {
-						unset( $results[ $key ] );
-					} else {
-						$user_ids[] = $user_id;
-					}
-				}
-			}
-		}
-	} else {
-		$user_ids = $wpdb->get_col( $query );
-	}
+	$user_ids = $wpdb->get_col( $query );
 
 	return $user_ids;
 }
@@ -621,22 +616,49 @@ function bp_ps_anyfield_search( $f ) {
 		'select' => '',
 		'where'  => array(),
 	);
-	$sql['select'] = "SELECT DISTINCT user_id, field_id FROM {$bp->profile->table_name_data}";
+
+	$sql['select'] = "SELECT DISTINCT xpd.user_id as user_id, xpd.field_id as field_id FROM {$bp->profile->table_name_data} xpd";
+
+	if (
+		! current_user_can( 'administrator' )
+	) {
+		$field_visibility = array( 'public' );
+		if ( is_user_logged_in() ) {
+			$loggin_user_id = bp_loggedin_user_id();
+			$field_visibility[] = 'loggedin';
+			if ( bp_is_active( 'friends' ) ) {
+				$friend_ids_sql = $wpdb->prepare(
+					"SELECT CASE WHEN initiator_user_id = %d THEN friend_user_id ELSE initiator_user_id END AS friend_id
+					FROM {$bp->friends->table_name} WHERE is_confirmed = 1 AND( initiator_user_id = %d OR friend_user_id = %d )",
+					$loggin_user_id,
+					$loggin_user_id,
+					$loggin_user_id
+				);
+			}
+		}
+
+		$sql['where'][] = "xpd.field_id IN (
+			SELECT xpv.field_id FROM {$bp->profile->table_name_visibility} xpv WHERE xpv.user_id = xpd.user_id AND ( xpv.value IN ('" . implode( "','", $field_visibility ) . "')
+				OR ( xpv.value = 'friends' AND xpv.user_id IN ({$friend_ids_sql}) )
+				OR ( xpv.user_id = {$loggin_user_id} )
+			)
+		)";
+	}
 
 	switch ( $filter ) {
 		case 'contains':
 			$escaped                 = '%' . bp_ps_esc_like( $value ) . '%';
-			$sql['where'][ $filter ] = $wpdb->prepare( 'value LIKE %s', $escaped );
+			$sql['where'][ $filter ] = $wpdb->prepare( 'xpd.value LIKE %s', $escaped );
 			break;
 
 		case '':
-			$sql['where'][ $filter ] = $wpdb->prepare( 'value = %s', $value );
+			$sql['where'][ $filter ] = $wpdb->prepare( 'xpd.value = %s', $value );
 			break;
 
 		case 'like':
 			$value                   = str_replace( '\\\\%', '\\%', $value );
 			$value                   = str_replace( '\\\\_', '\\_', $value );
-			$sql['where'][ $filter ] = $wpdb->prepare( 'value LIKE %s', $value );
+			$sql['where'][ $filter ] = $wpdb->prepare( 'xpd.value LIKE %s', $value );
 			break;
 	}
 
@@ -655,6 +677,7 @@ function bp_ps_anyfield_search( $f ) {
 				'user_id'                        => false,
 			)
 		);
+
 		$fields_array = array();
 		if ( ! empty( $group_ids ) ) {
 			foreach ( $group_ids as $group_value ) {
@@ -666,6 +689,7 @@ function bp_ps_anyfield_search( $f ) {
 				}
 			}
 		}
+
 		foreach ( $results as $key => $value ) {
 			$field_id = ! empty( $value['field_id'] ) ? (int) $value['field_id'] : 0;
 			$user_id  = ! empty( $value['user_id'] ) ? (int) $value['user_id'] : 0;
@@ -674,22 +698,8 @@ function bp_ps_anyfield_search( $f ) {
 					unset( $results[ $key ] );
 					continue;
 				}
-				$field_visibility = xprofile_get_field_visibility_level( intval( $field_id ), intval( $user_id ) );
-				if (
-					! current_user_can( 'administrator' ) &&
-					(
-						'adminsonly' === $field_visibility ||
-						(
-							bp_is_active( 'friends' ) &&
-							'friends' === $field_visibility &&
-							false === friends_check_friendship( intval( $user_id ), bp_loggedin_user_id() )
-						)
-					)
-				) {
-					unset( $results[ $key ] );
-				} else {
-					$user_ids[] = $user_id;
-				}
+
+				$user_ids[] = $user_id;
 			}
 		}
 	}