fix: 🐛 Fix the broken freshness-filter

It turns out that `wc_get_products()` discarded
the meta_query, which lost the ability to filter
out recently synced products, resulting in the
ingestion loop trying to sync the same product
batch over and over

Author: stracker-phil

modules/ppcp-store-sync/src/Ingestion/IngestionBatchProvider.php

@@ -126,10 +126,9 @@ private function collect_eligible( array $meta_query, array $current_batch = arr
 	private function query_candidates( array $meta_query, array $exclude, int $limit, bool $order_by_meta ): array {
 		// phpcs:disable WordPress.DB.SlowDBQuery -- intentionally using the meta_query here.
 		$args = array(
-			'limit'      => $limit,
-			'return'     => 'ids',
-			'meta_query' => array( $meta_query ),
-			'exclude'    => $exclude,
+			'limit'   => $limit,
+			'return'  => 'ids',
+			'exclude' => $exclude,
 		);
 
 		// Add ordering for stale products (oldest first).
@@ -142,7 +141,23 @@ private function query_candidates( array $meta_query, array $exclude, int $limit
 		// Constrain to the coarse eligibility criteria (status/type/downloadable).
 		$args = array_merge( $args, $this->product_filter->query_filters() );
 
-		$products = wc_get_products( $args );
+		// wc_get_products() silently discards a raw 'meta_query' argument
+		// (WC_Data_Store_WP::get_wp_query_args() skips it), so the freshness clause
+		// is injected into the underlying WP_Query args through WooCommerce's own
+		// query filter instead.
+		$inject_meta_query = static function ( array $wp_query_args ) use ( $meta_query ): array {
+			$wp_query_args['meta_query'][] = $meta_query;
+
+			return $wp_query_args;
+		};
+
+		add_filter( 'woocommerce_product_data_store_cpt_get_products_query', $inject_meta_query );
+
+		try {
+			$products = wc_get_products( $args );
+		} finally {
+			remove_filter( 'woocommerce_product_data_store_cpt_get_products_query', $inject_meta_query );
+		}
 		// phpcs:enable WordPress.DB.SlowDBQuery
 
 		assert( is_array( $products ) );

tests/PHPUnit/StoreSync/Ingestion/IngestionBatchProviderTest.php

@@ -83,12 +83,12 @@ public function test_get_batch_returns_never_synced_products_first(): void {
 		} );
 
 		when( 'wc_get_products' )->alias( function ( $args ) use ( $never_synced_ids, $stale_ids ) {
-			if ( 'NOT EXISTS' === $args['meta_query'][0]['compare'] ) {
+			if ( ! isset( $args['orderby'] ) ) { // Fresh pass (the stale pass sets orderby).
 				$available = array_values( array_diff( $never_synced_ids, $args['exclude'] ) );
 				return array_slice( $available, 0, $args['limit'] );
 			}
 
-			if ( '<' === $args['meta_query'][0]['compare'] ) {
+			if ( isset( $args['orderby'] ) ) { // Stale pass (orders by the processed-at meta).
 				$available = array_values( array_diff( $stale_ids, $args['exclude'] ) );
 				return array_slice( $available, 0, $args['limit'] );
 			}
@@ -119,7 +119,7 @@ public function test_get_batch_respects_limit_with_never_synced_products(): void
 		} );
 
 		when( 'wc_get_products' )->alias( function ( $args ) use ( $never_synced_ids ) {
-			if ( 'NOT EXISTS' === $args['meta_query'][0]['compare'] ) {
+			if ( ! isset( $args['orderby'] ) ) { // Fresh pass (the stale pass sets orderby).
 				$available = array_values( array_diff( $never_synced_ids, $args['exclude'] ) );
 				return array_slice( $available, 0, $args['limit'] );
 			}
@@ -146,7 +146,7 @@ public function test_get_batch_returns_stale_products_when_no_never_synced(): vo
 		} );
 
 		when( 'wc_get_products' )->alias( function ( $args ) use ( $stale_product_ids ) {
-			if ( '<' === $args['meta_query'][0]['compare'] ) {
+			if ( isset( $args['orderby'] ) ) { // Stale pass (orders by the processed-at meta).
 				$available = array_values( array_diff( $stale_product_ids, $args['exclude'] ) );
 				return array_slice( $available, 0, $args['limit'] );
 			}
@@ -192,12 +192,12 @@ public function test_get_batch_handles_mixed_results(): void {
 		} );
 
 		when( 'wc_get_products' )->alias( function ( $args ) use ( $fresh_pool, $stale_pool ) {
-			if ( 'NOT EXISTS' === $args['meta_query'][0]['compare'] ) {
+			if ( ! isset( $args['orderby'] ) ) { // Fresh pass (the stale pass sets orderby).
 				$available = array_values( array_diff( $fresh_pool, $args['exclude'] ) );
 				return array_slice( $available, 0, $args['limit'] );
 			}
 
-			if ( '<' === $args['meta_query'][0]['compare'] ) {
+			if ( isset( $args['orderby'] ) ) { // Stale pass (orders by the processed-at meta).
 				$available = array_values( array_diff( $stale_pool, $args['exclude'] ) );
 				return array_slice( $available, 0, $args['limit'] );
 			}
@@ -230,7 +230,7 @@ public function test_get_batch_stops_when_limit_reached_after_fresh_products():
 		} );
 
 		when( 'wc_get_products' )->alias( function ( $args ) use ( $fresh_pool ) {
-			if ( 'NOT EXISTS' === $args['meta_query'][0]['compare'] ) {
+			if ( ! isset( $args['orderby'] ) ) { // Fresh pass (the stale pass sets orderby).
 				$available = array_values( array_diff( $fresh_pool, $args['exclude'] ) );
 				return array_slice( $available, 0, $args['limit'] );
 			}
@@ -273,7 +273,7 @@ public function test_get_batch_terminates_and_skips_unloadable_product_id(): voi
 		when( 'wc_get_products' )->alias( function ( $args ) use ( $fresh_pool, &$call_count ) {
 			$call_count++;
 
-			if ( 'NOT EXISTS' === $args['meta_query'][0]['compare'] ) {
+			if ( ! isset( $args['orderby'] ) ) { // Fresh pass (the stale pass sets orderby).
 				$available = array_values( array_diff( $fresh_pool, $args['exclude'] ) );
 				return array_slice( $available, 0, $args['limit'] );
 			}
@@ -330,7 +330,7 @@ function ( $product ) use ( $products ) {
 		$fresh_pool = array( 1, 2, 3 );
 
 		when( 'wc_get_products' )->alias( function ( $args ) use ( $fresh_pool ) {
-			if ( 'NOT EXISTS' === $args['meta_query'][0]['compare'] ) {
+			if ( ! isset( $args['orderby'] ) ) { // Fresh pass (the stale pass sets orderby).
 				$available = array_values( array_diff( $fresh_pool, $args['exclude'] ) );
 				return array_slice( $available, 0, $args['limit'] );
 			}