added limit to database endpoint and prepared

mechelon · mechelon · commit 3b79e2ba0d75 · 2021-05-14T21:52:14.000+02:00
start cursor structure (NOT implemented yet)
diff --git a/src/Endpoints/Database.php b/src/Endpoints/Database.php
@@ -2,20 +2,31 @@
 
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
-
+use Illuminate\Support\Collection;
 use FiveamCode\LaravelNotionApi\Notion;
-use \FiveamCode\LaravelNotionApi\Entities\Database as DatabaseEntity;
+use FiveamCode\LaravelNotionApi\Query\Filter;
 use FiveamCode\LaravelNotionApi\Query\Sorting;
-use Illuminate\Support\Collection;
+use FiveamCode\LaravelNotionApi\Query\StartCursor;
+use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 
 class Database extends Endpoint
 {
     private string $databaseId;
-    private Collection $sortings;
+
+    private Collection $filter;
+    private Collection $sorts;
+
+    private ?StartCursor $startCursor = null;
+    private ?int $pageSize = null;
+
 
     public function __construct(string $databaseId, Notion $notion)
     {
         $this->databaseId = $databaseId;
+
+        $this->sorts = new Collection();
+        $this->filter = new Collection();
+
         parent::__construct($notion);
     }
 
@@ -31,17 +42,21 @@ public function query(): array
                 }';
 
 
-        $sortingJson = '{
-        "property": "Ordered",
-	      "timestamp": "created_time",
-	      "direction": "descending"
-	    }';
+        $filter = json_decode($filterJson);
 
+        if ($this->sorts->isNotEmpty())
+            $postData["sorts"] = Sorting::sortQuery($this->sorts);
+
+        if ($this->filter->isNotEmpty())
+            $postData["filter"] = []; //Filter::filterQuery($this->filter);
+
+        if($this->startCursor !== null)
+            $postData["start_cursor"] = $this->startCursor;
+
+        if($this->pageSize !== null)
+            $postData["page_size"] = $this->pageSize;
 
-        $filter = json_decode($filterJson);
 
-        if($this->sortings->isNotEmpty())
-            $postData["sorts"] = Sorting::sortQuery($this->sortings);
 
         $response = $this->post(
             $this->url(Endpoint::DATABASES . "/{$this->databaseId}/query"),
@@ -61,20 +76,24 @@ public function filterBy()
 
     public function sortBy(Collection $sortings)
     {
-        $this->sortings = $sortings;
+        $this->sorts = $sortings;
 
         return $this;
     }
 
-    public function limit()
+    public function limit(int $limit)
     {
+        $this->pageSize = min($limit, 100);
 
         return $this;
     }
 
-    public function offset()
+    public function offset(StartCursor $startCursor)
     {
+        // toDo
+        throw WrapperException::instance("Not implemented yet.");
 
+        $this->startCursor = $startCursor;
         return $this;
     }
 }
diff --git a/src/Query/Sorting.php b/src/Query/Sorting.php
@@ -33,7 +33,6 @@ public function __construct(string $direction, string $property = null, string $
 
     public static function timestampSort(string $timestampToSort, string $direction)
     {
-
         $propertySort = new Sorting($direction, null, $timestampToSort);
 
         return $propertySort;
diff --git a/src/Query/StartCursor.php b/src/Query/StartCursor.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Query;
+
+use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
+use Illuminate\Support\Collection;
+
+class StartCursor {
+    private string $cursor;
+
+    public function __construct(string $cursor)
+    {
+        $this->cursor = $cursor;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public function __construct(string $direction, string $property = null, string $`
`33`	`33`
`34`	`34`	`public static function timestampSort(string $timestampToSort, string $direction)`
`35`	`35`	`{`
`36`		`-`
`37`	`36`	`$propertySort = new Sorting($direction, null, $timestampToSort);`
`38`	`37`
`39`	`38`	`return $propertySort;`