Don't set "from" if it's zero

Otherwise there is no way to disable it. E.g. the Count API doesn't support "from" and "size".
digiaonline · May 22, 2018 · 3090b81 · 3090b81
1 parent e2e724b
commit 3090b81
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/Search/Search.php b/src/Search/Search.php
@@ -297,7 +297,9 @@ public function buildBody()
             $from = ($this->getPage() - 1) * $this->getSize();
         }
 
-        $body['from'] = $from;
+        if ($from > 0) {
+            $body['from'] = $from;    
+        }
 
         return $body;
     }

diff --git a/tests/Search/SearchTest.php b/tests/Search/SearchTest.php
@@ -103,7 +103,6 @@ public function testToArray()
         $this->assertEquals([
             'query' => ['match_all' => new \stdClass()],
             'size'  => 100,
-            'from'  => 0,
         ], $this->search->buildBody());
 
         $this->search = $this->service->createSearch();
@@ -142,7 +141,6 @@ public function testToArray()
                 ],
             ],
             'size'  => 100,
-            'from'  => 0,
         ], $this->search->buildBody());
 
         $this->search = $this->service->createSearch();
@@ -152,7 +150,6 @@ public function testToArray()
             'query' => ['match_all' => new \stdClass()],
             'sort'  => ['_score'],
             'size'  => 100,
-            'from'  => 0,
         ], $this->search->buildBody());
 
         $this->search = $this->service->createSearch();
@@ -170,8 +167,19 @@ public function testToArray()
                 ],
             ],
             'size'  => 100,
-            'from'  => 0,
         ], $this->search->buildBody());
+
+        // Make sure "from" is present when it's a positive number
+        $this->search->setFrom(10);
+
+        $this->assertArraySubset([
+            'from' => 10,
+        ], $this->search->buildBody());
+
+        // Make sure "size" is not present when it's set to zero
+        $this->search->setSize(0);
+
+        $this->assertArrayNotHasKey('size', $this->search->buildBody());
     }
 
     public function testToArrayWithSource()
@@ -184,7 +192,6 @@ public function testToArrayWithSource()
         $this->assertEquals([
             'query' => ['match_all' => new \stdClass()],
             'size' => 100,
-            'from' => 0,
             '_source' => [
                 'id',
                 'title',
@@ -227,7 +234,6 @@ public function testAddAggregations()
                 ]
             ],
             'size'  => 100,
-            'from'  => 0,
         ], $this->search->buildBody());
     }
 }