MC Product Statuses: Replace WP functions with WC functions

src/API/Google/MerchantReport.php

@@ -65,7 +65,7 @@
 	 * @throws Exception If the product view report data can't be retrieved.
 	 */
 	public function get_product_view_report( $next_page_token = null ): array {
-		$batch_size = apply_filters( 'woocommerce_gla_product_view_report_page_size', 1000 );
+		$batch_size = apply_filters( 'woocommerce_gla_product_view_report_page_size', 500 );
 
 		try {
 			$product_view_data = [
@@ -97,7 +97,7 @@
 					continue;
 				}
 
-				$product_view_data['statuses'][] = [
+				$product_view_data['statuses'][ $wc_product_id ] = [
 					'product_id'      => $wc_product_id,
 					'status'          => $mc_product_status,
 					'expiration_date' => $this->convert_shopping_content_date( $product_view->getExpirationDate() ),

src/MerchantCenter/MerchantStatuses.php

@@ -617,32 +617,28 @@
 	 * @see MerchantReport::get_product_view_report
 	 */
 	public function process_product_statuses( array $statuses ): void {
+		$product_repository = $this->container->get( ProductRepository::class );
+		$products           = $product_repository->find_by_ids_as_associative_array( array_column( $statuses, 'product_id' ) );
+
 		$this->product_statuses = [
 			'products' => [],
 			'parents'  => [],
 		];
 
-		/** @var ProductHelper $product_helper */
-		$product_helper      = $this->container->get( ProductHelper::class );
-		$visibility_meta_key = $this->prefix_meta_key( ProductMetaHandler::KEY_VISIBILITY );
-
 		foreach ( $statuses as $product_status ) {
 
 			$wc_product_id     = $product_status['product_id'];
 			$mc_product_status = $product_status['status'];
 
-			// Skip if the product does not exist or if the product previously found/validated.
-			if ( ! $wc_product_id || ! empty( $this->product_data_lookup[ $wc_product_id ] ) ) {
+			// Skip if the product does not exist in WooCommerce.
+			if ( ! $wc_product_id ) {
 				continue;
 			}
 
-			if ( $this->product_is_expiring( $product_status['expiration_date'] ) ) {
-				$mc_product_status = MCStatus::EXPIRING;
-			}
+			$wc_product = $products[ $wc_product_id ] ?? null;
 
-			$wc_product = $product_helper->get_wc_product_by_wp_post( $wc_product_id );
-			if ( ! $wc_product || 'product' !== substr( $wc_product->post_type, 0, 7 ) ) {
-				// Should never reach here since the products IDS are retrieved from postmeta.
+			if ( ! $wc_product ) {
+				// Skip if the product does not exist in WooCommerce.
 				do_action(
 					'woocommerce_gla_debug_message',
 					sprintf( 'Merchant Center product %s not found in this WooCommerce store.', $wc_product_id ),
@@ -651,23 +647,29 @@
 				continue;
 			}
 
-			$this->product_data_lookup[ $wc_product_id ] = [
-				'name'       => get_the_title( $wc_product ),
-				'visibility' => get_post_meta( $wc_product_id, $visibility_meta_key ),
-				'parent_id'  => $wc_product->post_parent,
-			];
+			if ( $this->product_is_expiring( $product_status['expiration_date'] ) ) {
+				$mc_product_status = MCStatus::EXPIRING;
+			}
 
 			// Products is used later for global product status statistics.
 			$this->product_statuses['products'][ $wc_product_id ][ $mc_product_status ] = 1 + ( $this->product_statuses['products'][ $wc_product_id ][ $mc_product_status ] ?? 0 );
 
 			// Aggregate parent statuses for mc_status postmeta.
-			$wc_parent_id = $this->product_data_lookup[ $wc_product_id ]['parent_id'];
+			$wc_parent_id = $wc_product->get_parent_id();
 			if ( ! $wc_parent_id ) {
 				continue;
 			}
 			$this->product_statuses['parents'][ $wc_parent_id ][ $mc_product_status ] = 1 + ( $this->product_statuses['parents'][ $wc_parent_id ][ $mc_product_status ] ?? 0 );
 
 		}
+
+		$parent_keys     = array_values( array_keys( $this->product_statuses['parents'] ) );
+		$parent_products = $product_repository->find_by_ids_as_associative_array( $parent_keys );
+		$products        = $products + $parent_products;
+
+		// Update each product's mc_status and then update the global statistics.
+		$this->update_products_meta_with_mc_status( $products );
+		$this->update_intermediate_product_statistics( $products );
 	}
 
 	/**
@@ -681,10 +683,6 @@
 		$this->mc_statuses = [];
 
 		$this->process_product_statuses( $statuses );
-
-		// Update each product's mc_status and then update the global statistics.
-		$this->update_products_meta_with_mc_status();
-		$this->update_intermediate_product_statistics();
 	}
 
 	/**
@@ -713,9 +711,11 @@
 	 * 3. Compare if a higher priority status is found for that variable product.
 	 * 4. Loop through the `$parent_statuses` array at the end to add the final status counts.
 	 *
+	 * @param WC_Product[] $products The products to update. (passed by reference).
+	 *
 	 * @return array Product status statistics.
 	 */
-	protected function update_intermediate_product_statistics(): array {
+	protected function update_intermediate_product_statistics( &$products ): array {
 		$product_statistics = [
 			MCStatus::APPROVED           => 0,
 			MCStatus::PARTIALLY_APPROVED => 0,
@@ -744,7 +744,14 @@
 
 		foreach ( $this->product_statuses['products'] as $product_id => $statuses ) {
 			foreach ( $statuses as $status => $num_products ) {
-				$parent_id = $this->product_data_lookup[ $product_id ]['parent_id'];
+				$product = $products[ $product_id ] ?? null;
+
+				if ( ! $product ) {
+					continue;
+				}
+
+				$parent_id = $product->get_parent_id();
+
 				if ( ! $parent_id ) {
 					$product_statistics[ $status ] += $num_products;
 				} elseif ( ! isset( $parent_statuses[ $parent_id ] ) ) {
@@ -823,8 +830,10 @@
 
 	/**
 	 * Update the Merchant Center status for each product.
+	 *
+	 * @param WC_Product[] $products The products to update. (passed by reference).
 	 */
-	protected function update_products_meta_with_mc_status() {
+	protected function update_products_meta_with_mc_status( &$products ) {
 		// Generate a product_id=>mc_status array.
 		$new_product_statuses = [];
 		foreach ( $this->product_statuses as $types ) {
@@ -844,33 +853,23 @@
 				}
 			}
 		}
-		ksort( $new_product_statuses );
-
-		/** @var ProductMetaQueryHelper $product_meta_query_helper */
-		$product_meta_query_helper = $this->container->get( ProductMetaQueryHelper::class );
-
-		// Get all MC statuses.
-		$current_product_statuses = $product_meta_query_helper->get_all_values( ProductMetaHandler::KEY_MC_STATUS );
-
-		// Format: product_id=>status.
-		$to_insert = [];
-		// Format: status=>[product_ids].
-		$to_update = [];
 
 		foreach ( $new_product_statuses as $product_id => $new_status ) {
-			if ( ! isset( $current_product_statuses[ $product_id ] ) ) {
-				// MC status not in WC, insert.
-				$to_insert[ $product_id ] = $new_status;
-			} elseif ( $current_product_statuses[ $product_id ] !== $new_status ) {
-				// MC status not same as WC, update.
-				$to_update[ $new_status ][] = intval( $product_id );
+			$product = $products[ $product_id ] ?? null;
+
+			// At this point, the product should exist in WooCommerce but in the case that product is not found, log it.
+			if ( ! $product ) {
+				do_action(
+					'woocommerce_gla_debug_message',
+					sprintf( 'Merchant Center product %s not found in this WooCommerce store.', $product_id ),
+					__METHOD__,
+				);
+				continue;
 			}
-		}
 
-		// Insert and update changed MC Status postmeta.
-		$product_meta_query_helper->batch_insert_values( ProductMetaHandler::KEY_MC_STATUS, $to_insert );
-		foreach ( $to_update as $status => $product_ids ) {
-			$product_meta_query_helper->batch_update_values( ProductMetaHandler::KEY_MC_STATUS, $status, $product_ids );
+			$product->add_meta_data( $this->prefix_meta_key( ProductMetaHandler::KEY_MC_STATUS ), $new_status, true );
+			// We use save_meta_data so we don't trigger the woocommerce_update_product hook and the Syncer Hooks.
+			$product->save_meta_data();
 		}
 	}
 

src/Product/ProductRepository.php

@@ -98,6 +98,25 @@
 		return $this->find( $args, $limit, $offset );
 	}
 
+	/**
+	 * Find and return an associative array of products with the product ID as the key.
+	 *
+	 * @param int[] $ids    Array of WooCommerce product IDs
+	 * @param array $args   Array of WooCommerce args (except 'return'), and product metadata.
+	 * @param int   $limit  Maximum number of results to retrieve or -1 for unlimited.
+	 * @param int   $offset Amount to offset product results.
+	 *
+	 * @return WC_Product[] Array of WooCommerce product objects
+	 */
+	public function find_by_ids_as_associative_array( array $ids, array $args = [], int $limit = -1, int $offset = 0 ) {
+		$products = $this->find_by_ids( $ids, $args, $limit, $offset );
+		$map      = [];
+		foreach ( $products as $product ) {
+			$map[ $product->get_id() ] = $product;
+		}
+		return $map;
+	}
+
 	/**
 	 * Find and return an array of WooCommerce product objects already submitted to Google Merchant Center.
 	 *