added commits

Author: mechelon

src/Endpoints/Blocks.php

@@ -25,7 +25,7 @@ public function find(string $blockId): Block
         $jsonArray = $this->getJson(
             $this->url(Endpoint::BLOCKS . "/" . $blockId . "/children")
         );
-        return new Block($this->notion, $jsonArray); 
+        return new Block($jsonArray);
     }
 
     public function create(): array{

src/Endpoints/Databases.php

@@ -37,7 +37,7 @@ public function find(string $databaseId): Database
         $jsonArray = $this->getJson(
             $this->url(Endpoint::DATABASES . "/" . $databaseId)
         );
-        return new Database($this->notion, $jsonArray);
+        return new Database($jsonArray);
     }
 
     public function query(): array

src/Endpoints/Pages.php

@@ -26,7 +26,7 @@ public function find(string $pageId): Page
         $jsonArray = $this->getJson(
             $this->url(Endpoint::PAGES . "/" . $pageId)
         );
-        return new Page($this->notion, $jsonArray); 
+        return new Page($jsonArray);
     }
 
     public function create(): array{

src/Endpoints/Users.php

@@ -39,7 +39,7 @@ public function find(string $userId): User
         $jsonArray = $this->getJson(
             $this->url(Endpoint::USERS . "/" . $userId)
         );
-        return new User($this->notion, $jsonArray);
+        return new User($jsonArray);
     }
 
     public function limit()

src/Entities/Block.php

@@ -11,6 +11,6 @@ class Block extends Entity
     protected function setRaw(array $raw): void
     {
         parent::setRaw($raw);
-        if ($raw['object'] != 'block') throw WrapperException::instance("invalid json-array: the given object is not a block");
+        if ($raw['object'] !== 'block') throw WrapperException::instance("invalid json-array: the given object is not a block");
     }
 }

src/Entities/Database.php

@@ -2,14 +2,78 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities;
 
+use DateTime;
+use Carbon\Carbon;
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
+use Illuminate\Support\Arr;
+
 
 class Database extends Entity
 {
+    private string $title = "";
+    private array $rawTitle = [];
+    private array $rawProperties = [];
+    private DateTime $createdTime;
+    private DateTime $lastEditedTime;
+
     protected function setRaw(array $raw): void
     {
         parent::setRaw($raw);
-        if ($raw['object'] != 'database') throw WrapperException::instance("invalid json-array: the given object is not a database");
+        if ($raw['object'] !== 'database') throw WrapperException::instance("invalid json-array: the given object is not a database");
+
+        if (Arr::exists($raw, 'title') && is_array($raw['title'])) {
+            $this->title = Arr::first($raw['title'], null, ['plain_text' => ''])['plain_text'];
+            $this->rawTitle = $raw['title'];
+        }
+
+        if (Arr::exists($raw, 'properties')) {
+            $this->rawProperties = $raw['properties'];
+        }
+
+        if (Arr::exists($raw, 'created_time')) {
+            $this->createdTime = new Carbon($raw['created_time']);
+        }
+
+        if (Arr::exists($raw, 'last_edited_time')) {
+            $this->lastEditedTime = new Carbon($raw['last_edited_time']);
+        }
+    }
+
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    public function getProperties()
+    {
+        //TODO: return collection of property-entities (id, type, title)
+        throw new \Exception("not implemented yet");
+    }
+
+    public function getRawTitle(): array
+    {
+        return $this->rawTitle;
+    }
+
+    public function getRawProperties(): array
+    {
+        return $this->rawProperties;
+    }
+
+    public function getPropertyNames(): array
+    {
+        return array_keys($this->rawProperties);
+    }
+
+    public function getCreatedTime(): DateTime
+    {
+        return $this->createdTime;
+    }
+
+
+    public function getLastEditedTime(): DateTime
+    {
+        return $this->lastEditedTime;
     }
 }

src/Entities/Entity.php

@@ -10,11 +10,9 @@ class Entity
 {
     private string $id;
     private array $raw;
-    private Notion $notion;
 
-    public function __construct(Notion $notion = null, array $raw = null)
+    public function __construct(array $raw = null)
     {
-        $this->notion = $notion;
         $this->setRaw($raw);
     }
 
@@ -28,12 +26,12 @@ protected function setRaw(array $raw): void
     }
 
 
-    public function getId()
+    public function getId() : string
     {
         return $this->id;
     }
 
-    public function getRaw()
+    public function getRaw() : array
     {
         return $this->raw;
     }

src/Entities/EntityCollection.php

@@ -4,29 +4,32 @@
 
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
+use Illuminate\Support\Arr;
+
 
 //TODO:WORK IN PROGRESS
 class EntityCollection
 {
-    protected string $raw;
+    protected array $raw;
     protected Notion $notion;
 
-    public function __construct(Notion $notion = null, string $raw = null)
+    public function __construct(Notion $notion = null, array $raw = null)
     {
         $this->notion = $notion;
         $this->setRaw($raw);
     }
 
-    protected function setRaw(string $raw):void{
-        if (!isset($raw['object'])) throw WrapperException::instance("invalid json-array: no object given");
-        if (!isset($raw['results'])) throw WrapperException::instance("invalid json-array: no results given");
+    protected function setRaw(array $raw): void
+    {
+        if (!Arr::exists($raw, 'object')) throw WrapperException::instance("invalid json-array: no object given");
+        if (!Arr::exists($raw, 'results')) throw WrapperException::instance("invalid json-array: no results given");
         if ($raw['object'] != 'list') throw WrapperException::instance("invalid json-array: the given object is not a list");
 
         $this->raw = $raw;
-
     }
 
-    public function getRaw(){
+    public function getRaw(): array
+    {
         return $this->raw;
     }
 }

src/Entities/Page.php

@@ -10,6 +10,6 @@ class Page extends Entity
     protected function setRaw(array $raw): void
     {
         parent::setRaw($raw);
-        if ($raw['object'] != 'page') throw WrapperException::instance("invalid json-array: the given object is not a page");
+        if ($raw['object'] !== 'page') throw WrapperException::instance("invalid json-array: the given object is not a page");
     }
 }

src/Entities/User.php

@@ -10,6 +10,6 @@ class User extends Entity
     protected function setRaw(array $raw): void
     {
         parent::setRaw($raw);
-        if ($raw['object'] != 'user') throw WrapperException::instance("invalid json-array: the given object is not a user");
+        if ($raw['object'] !== 'user') throw WrapperException::instance("invalid json-array: the given object is not a user");
     }
 }