Exclude unquoted + unit tests

GravityKit · Mar 20, 2024 · d1f5d3b · d1f5d3b
1 parent 1ebabb2
commit d1f5d3b
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 18 deletions.
diff --git a/includes/widgets/search-widget/class-search-widget.php b/includes/widgets/search-widget/class-search-widget.php
@@ -1127,9 +1127,9 @@ public function gf_query_filter( &$query, $view, $request ) {
 		 */
 		$query_parts = $query->_introspect();
 
-		if ($exclude_global_search_words) {
+		if ( $exclude_global_search_words ) {
 			global $wpdb;
-			$extra_conditions[] = new GF_Query_Condition(new GF_Query_Call(
+			$extra_conditions[] = new GF_Query_Condition( new GF_Query_Call(
 				'NOT EXISTS',
 				[
 					sprintf(
@@ -1142,7 +1142,7 @@ public function gf_query_filter( &$query, $view, $request ) {
 						}, $exclude_global_search_words ) )
 					)
 				]
-			));
+			) );
 		}
 
 
@@ -2351,16 +2351,19 @@ private function get_criteria_from_query( string $query, bool $split_words ): ar
 		}
 
 		if ( $query && $split_words ) {
-			foreach ( preg_split( '/\s+/', $query ) as $word ) {
+			foreach ( preg_split( '/\s+/', $query ) as $value ) {
+				$is_exclude = '-' === ($value[0] ?? '');
 				$words[] = [
-					'operator' => 'contains',
-					'value'    => $word,
+					'operator' => $is_exclude ? 'not contains' : 'contains',
+					'value'    => $is_exclude ? substr( $value, 1 ) : $value,
 				];
 			}
 		} elseif ( $query ) {
+			$is_exclude = '-' === ($query[0] ?? '');
+			$value = preg_replace( '/\s+/', ' ', $query );
 			$words[] = [
-				'operator' => 'contains',
-				'value'    => preg_replace( '/\s+/', ' ', $query ),
+				'operator' => $is_exclude ? 'not contains' : 'contains',
+				'value'    => $is_exclude ? substr( $value, 1 ) : $value,
 			];
 		}
 

diff --git a/tests/unit-tests/GravityView_Widget_Search_Test.php b/tests/unit-tests/GravityView_Widget_Search_Test.php
@@ -97,17 +97,31 @@ private function _test_word_splitting() {
 
 		$_GET = [ 'gv_search' => '" space " "another one" and two' ];
 
-		$search_criteria_split_exact = [
-			'field_filters' => [
-				'mode' => 'any',
-				[ 'key' => null, 'value' => ' space ', 'operator' => 'contains' ],
-				[ 'key' => null, 'value' => 'another one', 'operator' => 'contains' ],
-				[ 'key' => null, 'value' => 'and', 'operator' => 'contains' ],
-				[ 'key' => null, 'value' => 'two', 'operator' => 'contains' ],
-			]
-		];
+		$this->assertEquals(
+			[
+				'field_filters' => [
+					'mode' => 'any',
+					[ 'key' => null, 'value' => ' space ', 'operator' => 'contains' ],
+					[ 'key' => null, 'value' => 'another one', 'operator' => 'contains' ],
+					[ 'key' => null, 'value' => 'and', 'operator' => 'contains' ],
+					[ 'key' => null, 'value' => 'two', 'operator' => 'contains' ],
+				]
+			],
+			$this->widget->filter_entries( array(), null, $args, true )
+		);
 
-		$this->assertEquals( $search_criteria_split_exact, $this->widget->filter_entries( array(), null, $args, true ) );
+		$_GET = [ 'gv_search' => '-"excluded spaces" -another' ];
+
+		$this->assertEquals(
+			[
+				'field_filters' => [
+					'mode' => 'any',
+					[ 'key' => null, 'value' => 'excluded spaces', 'operator' => 'not contains' ],
+					[ 'key' => null, 'value' => 'another', 'operator' => 'not contains' ],
+				]
+			],
+			$this->widget->filter_entries( array(), null, $args, true )
+		);
 
 		$_GET = array(
 			'gv_search' => '%20with%20%20spaces'
@@ -1408,6 +1422,18 @@ public function test_search_all_basic() {
 		$entries = $view->get_entries()->fetch()->all();
 		$this->assertCount( 2, $entries );
 
+		$_GET['gv_search'] = 'hello world';
+		$entries = $view->get_entries()->fetch()->all();
+		$this->assertCount( 3, $entries );
+
+		$_GET['gv_search'] = '"hello world"';
+		$entries = $view->get_entries()->fetch()->all();
+		$this->assertCount( 1, $entries );
+
+		$_GET['gv_search'] = 'hello -world';
+		$entries = $view->get_entries()->fetch()->all();
+		$this->assertCount( 1, $entries );
+
 		$_GET = array();
 	}