III-1957: Add label term queries to offer search query

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

Hide file tree

Showing 2 changed files with 159 additions and 0 deletions.
diff --git a/src/Offer/ElasticSearchOfferQuery.php b/src/Offer/ElasticSearchOfferQuery.php
@@ -2,11 +2,13 @@
 
 namespace CultuurNet\UDB3\Search\ElasticSearch\Offer;
 
+use CultuurNet\UDB3\Label\ValueObjects\LabelName;
 use CultuurNet\UDB3\Search\Offer\OfferSearchParameters;
 use ONGR\ElasticsearchDSL\Query\Compound\BoolQuery;
 use ONGR\ElasticsearchDSL\Query\FullText\QueryStringQuery;
 use ONGR\ElasticsearchDSL\Query\Geo\GeoShapeQuery;
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\TermsQuery;
 use ONGR\ElasticsearchDSL\Search;
 
 class ElasticSearchOfferQuery
@@ -94,11 +96,38 @@ public static function fromSearchParameters(
             $boolQuery->add($geoShapeQuery, BoolQuery::FILTER);
         }
 
+        self::addLabelsQuery($boolQuery, 'labels', $searchParameters->getLabels());
+        self::addLabelsQuery($boolQuery, 'location.labels', $searchParameters->getLocationLabels());
+        self::addLabelsQuery($boolQuery, 'organizer.labels', $searchParameters->getOrganizerLabels());
+
         $search = new Search();
         $search->setFrom($searchParameters->getStart()->toNative());
         $search->setSize($searchParameters->getLimit()->toNative());
         $search->addQuery($boolQuery);
 
         return new ElasticSearchOfferQuery($search->toArray());
     }
+
+    /**
+     * @param BoolQuery $boolQuery
+     * @param string $field
+     * @param LabelName[] $labelNames
+     */
+    private static function addLabelsQuery(BoolQuery $boolQuery, $field, array $labelNames)
+    {
+        if (empty($labelNames)) {
+            return;
+        }
+
+        $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
@@ -2,6 +2,7 @@
 
 namespace CultuurNet\UDB3\Search\ElasticSearch\Offer;
 
+use CultuurNet\UDB3\Label\ValueObjects\LabelName;
 use CultuurNet\UDB3\Search\ElasticSearch\LuceneQueryString;
 use CultuurNet\UDB3\Search\Offer\OfferSearchParameters;
 use CultuurNet\UDB3\Search\Region\RegionId;
@@ -135,4 +136,133 @@ public function it_can_be_created_with_a_geoshape_query()
 
         $this->assertEquals($expectedQueryArray, $actualQueryArray);
     }
+
+    /**
+     * @test
+     */
+    public function it_can_be_created_with_a_labels_query()
+    {
+        $searchParameters = (new OfferSearchParameters())
+            ->withStart(new Natural(30))
+            ->withLimit(new Natural(10))
+            ->withLabels(
+                new LabelName('foo'),
+                new LabelName('bar')
+            );
+
+        $expectedQueryArray = [
+            'from' => 30,
+            'size' => 10,
+            'query' => [
+                'bool' => [
+                    'must' => [
+                        [
+                            'match_all' => (object) [],
+                        ],
+                    ],
+                    'filter' => [
+                        [
+                            'terms' => [
+                                'labels' => [
+                                    'foo',
+                                    'bar',
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $actualQueryArray = ElasticSearchOfferQuery::fromSearchParameters($searchParameters)
+            ->toArray();
+
+        $this->assertEquals($expectedQueryArray, $actualQueryArray);
+    }
+
+    /**
+     * @test
+     */
+    public function it_can_be_created_with_a_location_labels_query()
+    {
+        $searchParameters = (new OfferSearchParameters())
+            ->withStart(new Natural(30))
+            ->withLimit(new Natural(10))
+            ->withLocationLabels(
+                new LabelName('foo'),
+                new LabelName('bar')
+            );
+
+        $expectedQueryArray = [
+            'from' => 30,
+            'size' => 10,
+            'query' => [
+                'bool' => [
+                    'must' => [
+                        [
+                            'match_all' => (object) [],
+                        ],
+                    ],
+                    'filter' => [
+                        [
+                            'terms' => [
+                                'location.labels' => [
+                                    'foo',
+                                    'bar',
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $actualQueryArray = ElasticSearchOfferQuery::fromSearchParameters($searchParameters)
+            ->toArray();
+
+        $this->assertEquals($expectedQueryArray, $actualQueryArray);
+    }
+
+    /**
+     * @test
+     */
+    public function it_can_be_created_with_an_organizer_labels_query()
+    {
+        $searchParameters = (new OfferSearchParameters())
+            ->withStart(new Natural(30))
+            ->withLimit(new Natural(10))
+            ->withOrganizerLabels(
+                new LabelName('foo'),
+                new LabelName('bar')
+            );
+
+        $expectedQueryArray = [
+            'from' => 30,
+            'size' => 10,
+            'query' => [
+                'bool' => [
+                    'must' => [
+                        [
+                            'match_all' => (object) [],
+                        ],
+                    ],
+                    'filter' => [
+                        [
+                            'terms' => [
+                                'organizer.labels' => [
+                                    'foo',
+                                    'bar',
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $actualQueryArray = ElasticSearchOfferQuery::fromSearchParameters($searchParameters)
+            ->toArray();
+
+        $this->assertEquals($expectedQueryArray, $actualQueryArray);
+    }
 }