Merge 662232b into 88f2afd

cultuurnet · Aug 8, 2018 · 2595f9b · 2595f9b
2 parents 88f2afd + 662232b
commit 2595f9b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/src/AbstractElasticSearchQueryBuilder.php b/src/AbstractElasticSearchQueryBuilder.php
@@ -241,6 +241,7 @@ protected function withMatchPhraseQuery($fieldName, $term)
 
         $c = $this->getClone();
         $c->boolQuery->add($matchPhraseQuery, BoolQuery::FILTER);
+        $c->boolQuery->add($matchPhraseQuery, BoolQuery::SHOULD);
         return $c;
     }
 

diff --git a/tests/Organizer/ElasticSearchOrganizerQueryBuilderTest.php b/tests/Organizer/ElasticSearchOrganizerQueryBuilderTest.php
@@ -132,6 +132,15 @@ public function it_should_build_a_query_with_an_autocomplete_filter()
                             ],
                         ],
                     ],
+                    'should' => [
+                        [
+                            'match_phrase' => [
+                                'name.nl.autocomplete' => [
+                                    'query' => 'Collectief Cursief',
+                                ],
+                            ],
+                        ],
+                    ],
                 ],
             ],
         ];
@@ -215,6 +224,15 @@ public function it_should_build_a_query_with_multiple_filters()
                             ],
                         ],
                     ],
+                    'should' => [
+                        [
+                            'match_phrase' => [
+                                'name.nl.autocomplete' => [
+                                    'query' => 'foo',
+                                ],
+                            ],
+                        ],
+                    ],
                 ],
             ],
         ];

diff --git a/tests/Organizer/ElasticSearchOrganizerSearchServiceTest.php b/tests/Organizer/ElasticSearchOrganizerSearchServiceTest.php
@@ -120,6 +120,15 @@ public function it_returns_a_paged_result_set_for_the_given_search_query()
                                         ],
                                     ],
                                 ],
+                                'should' => [
+                                    [
+                                        'match_phrase' => [
+                                            'name.nl.autocomplete' => [
+                                                'query' => 'Collectief'
+                                            ],
+                                        ],
+                                    ],
+                                ],
                             ],
                         ],
                     ],