Merge pull request #4168 from 10up/fix/4164

Fix: Date Query handles array for Compare IN and NOT IN

Author: felipeelia

includes/classes/Indexable/Post/DateQuery.php

@@ -263,11 +263,11 @@ protected function get_es_filter_for_clause( $query ) {
 				} elseif ( '!=' === $compare ) {
 					$date_terms['must_not'][]['term'][ "date_terms.{$param}" ] = $value;
 				} elseif ( 'IN' === $compare ) {
-					foreach ( $value as $in_value ) {
+					foreach ( (array) $value as $in_value ) {
 						$date_terms['should'][]['term'][ "date_terms.{$param}" ] = $in_value;
 					}
 				} elseif ( 'NOT IN' === $compare ) {
-					foreach ( $value as $in_value ) {
+					foreach ( (array) $value as $in_value ) {
 						$date_terms['must_not'][]['term'][ "date_terms.{$param}" ] = $in_value;
 					}
 				} elseif ( 'BETWEEN' === $compare ) {

tests/php/indexables/TestPost.php

@@ -5968,6 +5968,124 @@ public function testDateQueryWeekdayRange() {
 		$this->assertEquals( 9, $query->found_posts );
 	}
 
+	/**
+	 * Test a date query with IN comparison
+	 *
+	 * @group post
+	 */
+	public function test_date_query_compare_in() {
+		$this->ep_factory->post->create(
+			[
+				'post_date' => '2023-01-01',
+			]
+		);
+
+		$this->ep_factory->post->create(
+			[
+				'post_date' => '2024-01-01',
+			]
+		);
+
+		$this->ep_factory->post->create(
+			[
+				'post_date' => '2025-01-01',
+			]
+		);
+
+		ElasticPress\Elasticsearch::factory()->refresh_indices();
+
+		$query = new \WP_Query(
+			[
+				'ep_integrate' => true,
+				'date_query'   => [
+					[
+						'year'    => 2023,
+						'compare' => 'IN',
+					],
+				],
+			]
+		);
+
+		$this->assertTrue( $query->elasticsearch_success );
+		$this->assertEquals( 1, $query->post_count );
+		$this->assertEquals( 1, $query->found_posts );
+
+		$query = new \WP_Query(
+			[
+				'ep_integrate' => true,
+				'date_query'   => [
+					[
+						'year'    => [ 2023, 2025 ],
+						'compare' => 'IN',
+					],
+				],
+			]
+		);
+
+		$this->assertTrue( $query->elasticsearch_success );
+		$this->assertEquals( 2, $query->post_count );
+		$this->assertEquals( 2, $query->found_posts );
+	}
+
+	/**
+	 * Test a date query with NOT IN comparison
+	 *
+	 * @group post
+	 */
+	public function test_date_query_compare_not_in() {
+		$this->ep_factory->post->create(
+			[
+				'post_date' => '2023-01-01',
+			]
+		);
+
+		$this->ep_factory->post->create(
+			[
+				'post_date' => '2024-01-01',
+			]
+		);
+
+		$this->ep_factory->post->create(
+			[
+				'post_date' => '2025-01-01',
+			]
+		);
+
+		ElasticPress\Elasticsearch::factory()->refresh_indices();
+
+		$query = new \WP_Query(
+			[
+				'ep_integrate' => true,
+				'date_query'   => [
+					[
+						'year'    => 2024,
+						'compare' => 'NOT IN',
+					],
+				],
+			]
+		);
+
+		$this->assertTrue( $query->elasticsearch_success );
+		$this->assertEquals( 2, $query->post_count );
+		$this->assertEquals( 2, $query->found_posts );
+
+		$query = new \WP_Query(
+			[
+				'ep_integrate' => true,
+				'date_query'   => [
+					[
+						'year'    => [ 2023, 2025 ],
+						'compare' => 'NOT IN',
+					],
+				],
+			]
+		);
+
+		$this->assertTrue( $query->elasticsearch_success );
+		$this->assertEquals( 1, $query->post_count );
+		$this->assertEquals( 1, $query->found_posts );
+	}
+
 	/**
 	 * Check if elasticpress_enabled() properly handles an object without the is_search() method.
 	 *