changes for elastic search to be able to have paginated results (#71)

* changes for elastic search to be able to have paginated results * bump * fix test
spira · Sep 19, 2016 · 02276be · 02276be
1 parent 4059e75
commit 02276be
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Controllers/EntityController.php b/Controllers/EntityController.php
@@ -437,7 +437,6 @@ protected function convertQueryToElasticsearchRequest($query, $limit = null, $of
     {
         /* @var ElasticquentTrait $model */
         $model = $this->getModel();
-
         // Complex query
         if (is_array($query)) {
             $params = [
@@ -446,6 +445,14 @@ protected function convertQueryToElasticsearchRequest($query, $limit = null, $of
                 'body' => $this->translateQuery($query),
             ];
 
+            if (is_numeric($limit)) {
+                $params = array_merge($params, ['size' => $limit]);
+            }
+
+            if (is_numeric($offset)) {
+                $params = array_merge($params, ['from' => $offset]);
+            }
+
         // Simple query
         } else {
             $params = $model->getBasicEsParams(true, true, true, $limit, $offset);

diff --git a/tests/integration/EntityTest.php b/tests/integration/EntityTest.php
@@ -303,6 +303,8 @@ public function testGetAllPaginatedComplexSearch($path)
                 'index' => 'defaultIndex',
                 'type' => 'someTypeName',
                 'body' => ['query' => ['bool' => ['must' => [['match_phrase_prefix' => ['_all' => 'search term']], ['match_phrase_prefix' => ['author_id' => 'some UUID']], ['nested' => ['path' => '_tags', 'query' => ['bool' => ['must' => ['match_phrase_prefix' => ['_tags.tag_id' => 'tag ID 1']]]]]], ['nested' => ['path' => '_tags', 'query' => ['bool' => ['must' => ['match_phrase_prefix' => ['_tags.tag_id' => 'tag ID 2']]]]]]]]]],
+                'size' => 10,
+                'from' => 0,
             ])
             ->andReturn($resultsMock);
 
@@ -352,6 +354,8 @@ public function testGetAllPaginatedComplexSearchMatchAll($path)
                 'index' => 'defaultIndex',
                 'type' => 'someTypeName',
                 'body' => ['query' => ['match_all' => []]],
+                'size' => 10,
+                'from' => 0,
             ])
             ->andReturn($resultsMock);