Merge 23cb074 into d32e9ba

composer.json

@@ -11,7 +11,7 @@
   ],
   "require": {
     "cultuurnet/hydra": "~0.1",
-    "cultuurnet/udb3-search": "~0.1",
+    "cultuurnet/udb3-search": "dev-feature/III-2072 as 0.1",
     "cultuurnet/geocoding": "~0.1",
     "cultuurnet/valueobjects": "~3.0",
     "symfony/http-foundation": "~2.7.2"

src/OfferSearchController.php

@@ -132,6 +132,12 @@ public function search(Request $request)
             );
         }
 
+        if (!empty($request->query->get('text'))) {
+            $parameters = $parameters->withText(
+                new StringLiteral($request->query->get('text'))
+            );
+        }
+
         $textLanguages = $this->getLanguagesFromQuery($request, 'textLanguages');
         if (!empty($textLanguages)) {
             $parameters = $parameters->withTextLanguages(...$textLanguages);

tests/OfferSearchControllerTest.php

@@ -5,7 +5,6 @@
 use CultuurNet\Geocoding\Coordinate\Coordinates;
 use CultuurNet\Geocoding\Coordinate\Latitude;
 use CultuurNet\Geocoding\Coordinate\Longitude;
-use CultuurNet\Hydra\PagedCollection;
 use CultuurNet\UDB3\Address\PostalCode;
 use CultuurNet\UDB3\Label\ValueObjects\LabelName;
 use CultuurNet\UDB3\Language;
@@ -106,7 +105,8 @@ public function it_returns_a_paged_collection_of_search_results_based_on_request
             [
                 'start' => 30,
                 'limit' => 10,
-                'q' => 'dag van de fiets',
+                'q' => 'dag van de fiets AND labels:foo',
+                'text' => '(foo OR bar) AND baz',
                 'id' => '42926044-09f4-4bd5-bc35-427b2fc1a525',
                 'locationId' => '652ab95e-fdff-41ce-8894-1b29dce0d230',
                 'organizerId' => '392168d7-57c9-4488-8e2e-d492c843054b',
@@ -155,7 +155,10 @@ public function it_returns_a_paged_collection_of_search_results_based_on_request
 
         $expectedSearchParameters = (new OfferSearchParameters())
             ->withQueryString(
-                new MockQueryString('dag van de fiets')
+                new MockQueryString('dag van de fiets AND labels:foo')
+            )
+            ->withText(
+                new StringLiteral('(foo OR bar) AND baz')
             )
             ->withCdbid(
                 new Cdbid('42926044-09f4-4bd5-bc35-427b2fc1a525')