III-1957: Use separate term queries instead of a combined terms query

cultuurnet · Mar 14, 2017 · 6569b23 · 6569b23
1 parent 7f7cb74
commit 6569b23
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/src/Offer/ElasticSearchOfferQuery.php b/src/Offer/ElasticSearchOfferQuery.php
@@ -8,6 +8,7 @@
 use ONGR\ElasticsearchDSL\Query\FullText\QueryStringQuery;
 use ONGR\ElasticsearchDSL\Query\Geo\GeoShapeQuery;
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 use ONGR\ElasticsearchDSL\Query\TermLevel\TermsQuery;
 use ONGR\ElasticsearchDSL\Search;
 
@@ -115,19 +116,12 @@ public static function fromSearchParameters(
      */
     private static function addLabelsQuery(BoolQuery $boolQuery, $field, array $labelNames)
     {
-        if (empty($labelNames)) {
-            return;
+        // Use separate term queries instead of a single terms query, because
+        // a combined terms query uses OR as operator instead of AND.
+        foreach ($labelNames as $labelName) {
+            $label = $labelName->toNative();
+            $termQuery = new TermQuery($field, $label);
+            $boolQuery->add($termQuery, BoolQuery::FILTER);
         }
-
-        $labels = array_map(
-            function (LabelName $labelName) {
-                return $labelName->toNative();
-            },
-            $labelNames
-        );
-
-        $labelQuery = new TermsQuery($field, $labels);
-
-        $boolQuery->add($labelQuery, BoolQuery::FILTER);
     }
 }
diff --git a/tests/Offer/ElasticSearchOfferQueryTest.php b/tests/Offer/ElasticSearchOfferQueryTest.php
@@ -162,11 +162,13 @@ public function it_can_be_created_with_a_labels_query()
                     ],
                     'filter' => [
                         [
-                            'terms' => [
-                                'labels' => [
-                                    'foo',
-                                    'bar',
-                                ],
+                            'term' => [
+                                'labels' => 'foo',
+                            ],
+                        ],
+                        [
+                            'term' => [
+                                'labels' => 'bar',
                             ],
                         ],
                     ],
@@ -205,11 +207,13 @@ public function it_can_be_created_with_a_location_labels_query()
                     ],
                     'filter' => [
                         [
-                            'terms' => [
-                                'location.labels' => [
-                                    'foo',
-                                    'bar',
-                                ],
+                            'term' => [
+                                'location.labels' => 'foo',
+                            ],
+                        ],
+                        [
+                            'term' => [
+                                'location.labels' => 'bar',
                             ],
                         ],
                     ],
@@ -248,11 +252,13 @@ public function it_can_be_created_with_an_organizer_labels_query()
                     ],
                     'filter' => [
                         [
-                            'terms' => [
-                                'organizer.labels' => [
-                                    'foo',
-                                    'bar',
-                                ],
+                            'term' => [
+                                'organizer.labels' => 'foo',
+                            ],
+                        ],
+                        [
+                            'term' => [
+                                'organizer.labels' => 'bar',
                             ],
                         ],
                     ],