Merge pull request #147 from apisearch-io/feature/added-query-methods

Added forcePage method

Author: mmoreram

Query/Query.php

@@ -243,9 +243,9 @@ public static function create(
 
         $page = (int) (max(1, $page));
         $query = new static($queryText);
-        $query->from = ($page - 1) * $size;
         $query->size = $size;
         $query->page = $page;
+        $query->calculateFrom();
 
         return $query;
     }
@@ -338,6 +338,15 @@ public function getFields(): array
         return $this->fields;
     }
 
+    /**
+     * @param int $page
+     */
+    public function forcePage(int $page): void
+    {
+        $this->page = $page;
+        $this->calculateFrom();
+    }
+
     /**
      * @param int $size
      *
@@ -346,6 +355,15 @@ public function getFields(): array
     public function forceSize(int $size)
     {
         $this->size = $size;
+        $this->calculateFrom();
+    }
+
+    /**
+     * @return void
+     */
+    public function calculateFrom()
+    {
+        $this->from = ($this->page - 1) * $this->size;
     }
 
     /**

Tests/Query/QueryTest.php

@@ -367,11 +367,22 @@ public function testDeleteAggregationByField()
         $this->assertNull($query->getAggregation('field3'));
     }
 
-    public function testForceSize()
+    public function testForceSizeAndPage()
     {
         $query = Query::create('x', 1, 10);
         $this->assertEquals(10, $query->getSize());
+        $this->assertEquals(0, $query->getFrom());
         $query->forceSize(7);
         $this->assertEquals(7, $query->getSize());
+        $this->assertEquals(0, $query->getFrom());
+
+        $query = Query::create('x', 2, 5);
+        $this->assertEquals(2, $query->getPage());
+        $this->assertEquals(5, $query->getSize());
+        $this->assertEquals(5, $query->getFrom());
+
+        $query->forcePage(3);
+        $this->assertEquals(3, $query->getPage());
+        $this->assertEquals(10, $query->getFrom());
     }
 }