Product Collection: Fix max price filter query value inclusion (#49917)

plugins/woocommerce-blocks/tests/e2e/tests/product-collection/product-collection.block_theme.spec.ts

@@ -422,6 +422,76 @@ test.describe( 'Product Collection', () => {
 			await expect( pageObject.products ).toHaveCount( 4 );
 		} );
 
+		// See https://github.com/woocommerce/woocommerce/pull/49917
+		test( 'Price range is inclusive in both editor and frontend.', async ( {
+			page,
+			pageObject,
+			editor,
+		} ) => {
+			await pageObject.createNewPostAndInsertBlock();
+
+			await expect( pageObject.products ).toHaveCount( 9 );
+
+			await pageObject.addFilter( 'Price Range' );
+			await pageObject.setPriceRange( {
+				min: '45',
+				max: '55',
+			} );
+
+			// Wait for the products to be filtered.
+			await expect( pageObject.products ).not.toHaveCount( 9 );
+
+			await expect(
+				pageObject.products.filter( { hasText: '$45.00' } )
+			).not.toHaveCount( 0 );
+			await expect(
+				pageObject.products.filter( { hasText: '$55.00' } )
+			).not.toHaveCount( 0 );
+
+			// Reset the price range.
+			await pageObject.setPriceRange( {
+				min: '0',
+				max: '0',
+			} );
+
+			await expect( pageObject.products ).toHaveCount( 9 );
+
+			await editor.insertBlock( {
+				name: 'woocommerce/filter-wrapper',
+				attributes: { filterType: 'price-filter' },
+			} );
+
+			await pageObject.publishAndGoToFrontend();
+
+			await expect( pageObject.products ).toHaveCount( 9 );
+
+			await page
+				.getByRole( 'textbox', {
+					name: 'Filter products by minimum',
+				} )
+				.dblclick();
+			await page.keyboard.type( '45' );
+
+			await page
+				.getByRole( 'textbox', {
+					name: 'Filter products by maximum',
+				} )
+				.dblclick();
+			await page.keyboard.type( '55' );
+
+			await page.keyboard.press( 'Tab' );
+
+			// Wait for the products to be filtered.
+			await expect( pageObject.products ).not.toHaveCount( 9 );
+
+			await expect(
+				pageObject.products.filter( { hasText: '$45.00' } )
+			).not.toHaveCount( 0 );
+			await expect(
+				pageObject.products.filter( { hasText: '$55.00' } )
+			).not.toHaveCount( 0 );
+		} );
+
 		test.describe( '"Use page context" control', () => {
 			test( 'should be visible on posts', async ( { pageObject } ) => {
 				await pageObject.createNewPostAndInsertBlock();

plugins/woocommerce/changelog/fix-pc-max-price-filter-value-inclusion

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Product Collection: Fix max price query to include prices less or equal to the given max value.

plugins/woocommerce/src/Blocks/BlockTypes/ProductCollection.php

@@ -1092,7 +1092,7 @@ class ProductCollection extends AbstractBlock {
 		$max_price_query = empty( $max_price ) ? array() : array(
 			'key'     => '_price',
 			'value'   => $max_price,
-			'compare' => '<',
+			'compare' => '<=',
 			'type'    => 'numeric',
 		);
 

plugins/woocommerce/src/Blocks/BlockTypes/ProductQuery.php

@@ -619,7 +619,7 @@ class ProductQuery extends AbstractBlock {
 		$max_price_query = empty( $max_price ) ? array() : [
 			'key'     => '_price',
 			'value'   => $max_price,
-			'compare' => '<',
+			'compare' => '<=',
 			'type'    => 'numeric',
 		];
 

plugins/woocommerce/tests/php/src/Blocks/BlockTypes/ProductCollection.php

@@ -345,7 +345,7 @@ class ProductCollection extends \WP_UnitTestCase {
 				array(
 					'key'     => '_price',
 					'value'   => 100,
-					'compare' => '<',
+					'compare' => '<=',
 					'type'    => 'numeric',
 				),
 				array(),
@@ -394,7 +394,7 @@ class ProductCollection extends \WP_UnitTestCase {
 				array(
 					'key'     => '_price',
 					'value'   => 100,
-					'compare' => '<',
+					'compare' => '<=',
 					'type'    => 'numeric',
 				),
 				array(
@@ -573,7 +573,7 @@ class ProductCollection extends \WP_UnitTestCase {
 				array(
 					'key'     => '_price',
 					'value'   => 100,
-					'compare' => '<',
+					'compare' => '<=',
 					'type'    => 'numeric',
 				),
 				array(

plugins/woocommerce/tests/php/src/Blocks/BlockTypes/ProductQuery.php

@@ -339,7 +339,7 @@ class ProductQuery extends \WP_UnitTestCase {
 				array(
 					'key'     => '_price',
 					'value'   => 100,
-					'compare' => '<',
+					'compare' => '<=',
 					'type'    => 'numeric',
 				),
 				array(),
@@ -388,7 +388,7 @@ class ProductQuery extends \WP_UnitTestCase {
 				array(
 					'key'     => '_price',
 					'value'   => 100,
-					'compare' => '<',
+					'compare' => '<=',
 					'type'    => 'numeric',
 				),
 				array(
@@ -512,7 +512,7 @@ class ProductQuery extends \WP_UnitTestCase {
 				array(
 					'key'     => '_price',
 					'value'   => 100,
-					'compare' => '<',
+					'compare' => '<=',
 					'type'    => 'numeric',
 				),
 				array(