added single database endpoint, replaced generic exception class, fixed constructors

Author: mechelon

src/Endpoints/Blocks.php

@@ -7,11 +7,6 @@
 
 class Blocks extends Endpoint implements EndpointInterface
 {
-    public function __construct(Notion $notion)
-    {
-        $this->notion = $notion;
-    }
-
     /**
      * Retrieve block children
      * url: https://api.notion.com/{version}/blocks/{block_id}/children

src/Endpoints/Database.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Endpoints;
+
+
+use FiveamCode\LaravelNotionApi\Notion;
+
+class Database extends Endpoint
+{
+    private string $databaseId;
+
+    public function __construct(string $databaseId, Notion $notion)
+    {
+        $this->databaseId = $databaseId;
+        parent::__construct($notion);
+    }
+
+    public function query(string $databaseId): array
+    {
+
+        $filterJson = '
+                {
+                  "property": "Tags",
+                  "multi_select": {
+                    "contains": "great"
+                  }
+                }';
+
+        $filter = json_decode($filterJson);
+        $postData = ["filter" => $filter];
+
+        $response = $this->post(
+            $this->url(Endpoint::DATABASES . "/{$databaseId}/query"),
+            $postData
+        )
+            ->json();
+
+        dump($response);
+        return [];
+    }
+
+    public function filterBy()
+    {
+    }
+
+    public function sortBy()
+    {
+    }
+
+    public function limit()
+    {
+    }
+
+    public function offset()
+    {
+    }
+}

src/Endpoints/Databases.php

@@ -7,15 +7,8 @@
 
 class Databases extends Endpoint implements EndpointInterface
 {
-    private string $databaseId;
 
 
-    public function __construct(Notion $notion)
-    {
-        $this->notion = $notion;
-        parent::__construct();
-    }
-
     /**
      * List databases
      * url: https://api.notion.com/{version}/databases
@@ -44,43 +37,4 @@ public function find(string $databaseId): Database
         return new Database($jsonArray);
     }
 
-    public function query(string $databaseId): array
-    {
-
-        $filterJson = '
-                {
-                  "property": "Tags",
-                  "multi_select": {
-                    "contains": "great"
-                  }
-                }';
-
-        $filter = json_decode($filterJson);
-        $postData = ["filter" => $filter];
-
-        $response = $this->post(
-            $this->url(Endpoint::DATABASES . "/{$databaseId}/query"),
-            $postData
-        )
-            ->json();
-
-        dump($response);
-        return [];
-    }
-
-    public function filterBy()
-    {
-    }
-
-    public function sortBy()
-    {
-    }
-
-    public function limit()
-    {
-    }
-
-    public function offset()
-    {
-    }
 }

src/Endpoints/Endpoint.php

@@ -18,9 +18,10 @@ class Endpoint
     public Notion $notion;
     private Collection $validVersions;
 
-    public function __construct()
+    public function __construct(Notion $notion)
     {
         $this->validVersions = collect(["v1"]);
+        $this->notion = $notion;
     }
 
     /**

src/Endpoints/Pages.php

@@ -3,16 +3,12 @@
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
 use FiveamCode\LaravelNotionApi\Entities\Page;
+use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
 
 class Pages extends Endpoint implements EndpointInterface
 {
 
-    public function __construct(Notion $notion)
-    {
-        $this->notion = $notion;
-    }
-
     /**
      * Retrieve a page
      * url: https://api.notion.com/{version}/pages/{page_id}
@@ -23,10 +19,14 @@ public function __construct(Notion $notion)
      */
     public function find(string $pageId): Page
     {
-        $jsonArray = $this->getJson(
+        $response = $this->get(
             $this->url(Endpoint::PAGES . "/" . $pageId)
         );
-        return new Page($jsonArray);
+
+        if(!$response->ok())
+            throw WrapperException::instance("Page not found.", ["pageId" => $pageId]);
+
+        return new Page($response->json());
     }
 
     public function create(): array{

src/Endpoints/Search.php

@@ -7,10 +7,5 @@
 class Search extends Endpoint
 {
 
-    public function __construct(Notion $notion)
-    {
-        $this->notion = $notion;
-    }
-
     // toDo: Think about it. 🧐
 }

src/Endpoints/Users.php

@@ -3,16 +3,12 @@
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
 use FiveamCode\LaravelNotionApi\Entities\User;
+use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
 
 class Users extends Endpoint implements EndpointInterface
 {
 
-    public function __construct(Notion $notion)
-    {
-        $this->notion = $notion;
-    }
-
     /**
      * List users
      * url: https://api.notion.com/{version}/users
@@ -45,12 +41,12 @@ public function find(string $userId): User
     public function limit()
     {
         //toDo
-        throw new \Exception("not implemented yet");
+        throw new WrapperException("not implemented yet");
     }
 
     public function offset()
     {
         //toDo
-        throw new \Exception("not implemented yet");
+        throw new WrapperException("not implemented yet");
     }
 }

src/Notion.php

@@ -2,14 +2,15 @@
 
 namespace FiveamCode\LaravelNotionApi;
 
-use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Support\Facades\Http;
-use FiveamCode\LaravelNotionApi\Endpoints\Blocks;
-use FiveamCode\LaravelNotionApi\Endpoints\Databases;
-use FiveamCode\LaravelNotionApi\Endpoints\Endpoint;
+use Illuminate\Http\Client\PendingRequest;
 use FiveamCode\LaravelNotionApi\Endpoints\Pages;
+use FiveamCode\LaravelNotionApi\Endpoints\Blocks;
 use FiveamCode\LaravelNotionApi\Endpoints\Search;
 use FiveamCode\LaravelNotionApi\Endpoints\Users;
+use FiveamCode\LaravelNotionApi\Endpoints\Endpoint;
+use FiveamCode\LaravelNotionApi\Endpoints\Database;
+use FiveamCode\LaravelNotionApi\Endpoints\Databases;
 
 
 class Notion
@@ -27,17 +28,17 @@ class Notion
      */
     public function __construct(string $version = null, string $token = null)
     {
-        $this->endpoint = new Endpoint();
+        if ($token !== null) {
+            $this->setToken($token);
+        }
+
+        $this->endpoint = new Endpoint($this);
 
         if ($version !== null) {
             $this->setVersion($version);
         } else {
             $this->v1();
         }
-
-        if ($token !== null) {
-            $this->setToken($token);
-        }
     }
 
     /**
@@ -96,6 +97,14 @@ public function databases(): Databases
         return new Databases($this);
     }
 
+    /**
+     * @return Database
+     */
+    public function database(string $databaseId): Database
+    {
+        return new Database($this, $databaseId);
+    }
+
     /**
      * @return Pages
      */

src/Query/QueryHelper.php

@@ -2,9 +2,10 @@
 
 namespace FiveamCode\LaravelNotionApi\Query;
 
+use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
 
-class QueryHelper
+class QueryHelper extends JsonResource
 {
     /**
      * Contains the property name the query helper works with.

src/Query/Sorting.php

@@ -29,4 +29,6 @@ public function __construct(string $timestamp, string $direction)
     }
 
 
+
+
 }