added basic sorting structure

Author: mechelon

src/Endpoints/Database.php

@@ -4,18 +4,22 @@
 
 
 use FiveamCode\LaravelNotionApi\Notion;
+use \FiveamCode\LaravelNotionApi\Entities\Database as DatabaseEntity;
+use FiveamCode\LaravelNotionApi\Query\Sorting;
+use Illuminate\Support\Collection;
 
 class Database extends Endpoint
 {
     private string $databaseId;
+    private Collection $sortings;
 
     public function __construct(string $databaseId, Notion $notion)
     {
         $this->databaseId = $databaseId;
         parent::__construct($notion);
     }
 
-    public function query(string $databaseId): array
+    public function query(): array
     {
 
         $filterJson = '
@@ -26,32 +30,51 @@ public function query(string $databaseId): array
                   }
                 }';
 
+
+        $sortingJson = '{
+        "property": "Ordered",
+	      "timestamp": "created_time",
+	      "direction": "descending"
+	    }';
+
+
         $filter = json_decode($filterJson);
-        $postData = ["filter" => $filter];
+
+        if($this->sortings->isNotEmpty())
+            $postData["sorts"] = Sorting::sortQuery($this->sortings);
 
         $response = $this->post(
-            $this->url(Endpoint::DATABASES . "/{$databaseId}/query"),
+            $this->url(Endpoint::DATABASES . "/{$this->databaseId}/query"),
             $postData
         )
             ->json();
 
-        dump($response);
-        return [];
+        // toDo return Database Entity
+        dd($response);
     }
 
     public function filterBy()
     {
+
+        return $this;
     }
 
-    public function sortBy()
+    public function sortBy(Collection $sortings)
     {
+        $this->sortings = $sortings;
+
+        return $this;
     }
 
     public function limit()
     {
+
+        return $this;
     }
 
     public function offset()
     {
+
+        return $this;
     }
 }

src/Query/QueryHelper.php

@@ -5,13 +5,13 @@
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
 
-class QueryHelper extends JsonResource
+class QueryHelper
 {
     /**
      * Contains the property name the query helper works with.
      * @var
      */
-    protected string $property;
+    protected ?string $property = null;
 
     /**
      * Contains all valid timestamps to sort against.
@@ -20,6 +20,7 @@ class QueryHelper extends JsonResource
      * @var Collection
      */
     protected Collection $validTimestamps;
+
     /**
      * Contains all valid directions to sort by.
      *

src/Query/Sorting.php

@@ -3,32 +3,76 @@
 namespace FiveamCode\LaravelNotionApi\Query;
 
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
+use Illuminate\Support\Collection;
 
 class Sorting extends QueryHelper
 {
 
-    private string $timestamp;
+    private ?string $timestamp = null;
     private string $direction;
 
-    public function __construct(string $timestamp, string $direction)
+    public function __construct(string $direction, string $property = null, string $timestamp = null)
     {
         parent::__construct();
 
-        if ($this->validTimestamps->contains($timestamp))
+        if ($timestamp !== null && !$this->validTimestamps->contains($timestamp))
             throw WrapperException::instance(
                 "Invalid sorting timestamp provided.", ["invalidTimestamp" => $timestamp]
             );
 
-        if ($this->validDirections->contains($direction))
+
+        if (!$this->validDirections->contains($direction))
             throw WrapperException::instance(
                 "Invalid sorting direction provided.", ["invalidDirection" => $direction]
             );
 
+        $this->property = $property;
         $this->timestamp = $timestamp;
         $this->direction = $direction;
     }
 
+    public static function timestampSort(string $timestampToSort, string $direction)
+    {
+
+        $propertySort = new Sorting($direction, null, $timestampToSort);
+
+        return $propertySort;
+    }
+
+    public static function propertySort(string $property, string $direction)
+    {
+        $propertySort = new Sorting($direction, $property);
 
+        return $propertySort;
+    }
+
+    public function toArray(): array
+    {
+        if ($this->timestamp !== null) {
+            return [
+                "timestamp" => $this->timestamp,
+                "direction" => $this->direction
+            ];
+        }
+
+        return [
+            "property" => $this->property,
+            "direction" => $this->direction
+        ];
+    }
+
+    public static function sortQuery(Collection $sortings): array
+    {
+
+        $querySortings = new Collection();
+
+        $sortings->each(function (Sorting $sorting) use ($querySortings) {
+            $querySortings->add($sorting->toArray());
+        });
+
+        return $querySortings->toArray();
+
+    }
 
 
 }