5am-code · johguentner · Feb 6, 2023 · Feb 4, 2023 · Feb 4, 2023 · Feb 5, 2023
diff --git a/src/Entities/Blocks/Block.php b/src/Entities/Blocks/Block.php
@@ -2,16 +2,20 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities\Blocks;
 
-use DateTime;
 use FiveamCode\LaravelNotionApi\Entities\Entity;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Traits\HasArchive;
+use FiveamCode\LaravelNotionApi\Traits\HasParent;
+use FiveamCode\LaravelNotionApi\Traits\HasTimestamps;
 use Illuminate\Support\Arr;
 
 /**
  * Class Block.
  */
 class Block extends Entity
 {
+    use HasTimestamps, HasArchive, HasParent;
+
     /**
      * @var string
      */
@@ -37,16 +41,6 @@ class Block extends Entity
      */
     protected string $text = '[warning: unsupported in notion api]';
 
-    /**
-     * @var DateTime
-     */
-    protected DateTime $createdTime;
-
-    /**
-     * @var DateTime
-     */
-    protected DateTime $lastEditedTime;
-
     /**
      * @param  array  $responseData
      *
@@ -65,12 +59,10 @@ protected function setResponseData(array $responseData): void
 
     protected function fillFromRaw(): void
     {
-        $this->fillId();
+        parent::fillEssentials();
         $this->fillType();
         $this->fillRawContent();
         $this->fillHasChildren();
-        $this->fillCreatedTime();
-        $this->fillLastEditedTime();
     }
 
     private function fillType(): void
@@ -126,22 +118,6 @@ public function hasChildren(): bool
         return $this->hasChildren;
     }
 
-    /**
-     * @return DateTime
-     */
-    public function getCreatedTime(): DateTime
-    {
-        return $this->createdTime;
-    }
-
-    /**
-     * @return DateTime
-     */
-    public function getLastEditedTime(): DateTime
-    {
-        return $this->lastEditedTime;
-    }
-
     public function getContent()
     {
         return $this->content;

diff --git a/src/Entities/Database.php b/src/Entities/Database.php
@@ -2,9 +2,12 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities;
 
-use DateTime;
 use FiveamCode\LaravelNotionApi\Entities\Properties\Property;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Traits\HasArchive;
+use FiveamCode\LaravelNotionApi\Traits\HasParent;
+use FiveamCode\LaravelNotionApi\Traits\HasTimestamps;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
@@ -13,11 +16,18 @@
  */
 class Database extends Entity
 {
+    use HasTimestamps, HasArchive, HasParent;
+
     /**
      * @var string
      */
     protected string $title = '';
 
+    /**
+     * @var string
+     */
+    protected string $description = '';
+
     /**
      * @var string
      */
@@ -44,14 +54,19 @@ class Database extends Entity
     private string $url;
 
     /**
-     * @var string
+     * @var ?RichText
      */
-    protected string $objectType = '';
+    protected ?RichText $richTitle = null;
 
     /**
-     * @var array
+     * @var ?RichText
      */
-    protected array $rawTitle = [];
+    protected ?RichText $richDescription = null;
+
+    /**
+     * @var bool
+     */
+    protected bool $isInline = false;
 
     /**
      * @var array
@@ -73,16 +88,6 @@ class Database extends Entity
      */
     protected Collection $properties;
 
-    /**
-     * @var DateTime
-     */
-    protected DateTime $createdTime;
-
-    /**
-     * @var DateTime
-     */
-    protected DateTime $lastEditedTime;
-
     protected function setResponseData(array $responseData): void
     {
         parent::setResponseData($responseData);
@@ -94,22 +99,36 @@ protected function setResponseData(array $responseData): void
 
     private function fillFromRaw()
     {
-        $this->fillId();
+        parent::fillEssentials();
         $this->fillIcon();
         $this->fillCover();
         $this->fillTitle();
-        $this->fillObjectType();
+        $this->fillIsInline();
+        $this->fillDescription();
         $this->fillProperties();
         $this->fillDatabaseUrl();
-        $this->fillCreatedTime();
-        $this->fillLastEditedTime();
     }
 
     private function fillTitle(): void
     {
         if (Arr::exists($this->responseData, 'title') && is_array($this->responseData['title'])) {
             $this->title = Arr::first($this->responseData['title'], null, ['plain_text' => ''])['plain_text'];
-            $this->rawTitle = $this->responseData['title'];
+            $this->richTitle = new RichText($this->responseData['title']);
+        }
+    }
+
+    private function fillIsInline(): void
+    {
+        if (Arr::exists($this->responseData, 'is_inline')) {
+            $this->isInline = $this->responseData['is_inline'];
+        }
+    }
+
+    private function fillDescription(): void
+    {
+        if (Arr::exists($this->responseData, 'description') && is_array($this->responseData['description'])) {
+            $this->description = Arr::first($this->responseData['description'], null, ['plain_text' => ''])['plain_text'];
+            $this->richDescription = new RichText($this->responseData['description']);
         }
     }
 
@@ -146,13 +165,6 @@ private function fillCover(): void
         }
     }
 
-    private function fillObjectType(): void
-    {
-        if (Arr::exists($this->responseData, 'object')) {
-            $this->objectType = $this->responseData['object'];
-        }
-    }
-
     private function fillProperties(): void
     {
         if (Arr::exists($this->responseData, 'properties')) {
@@ -184,17 +196,25 @@ public function getProperty(string $propertyKey): ?Property
     /**
      * @return string
      */
-    public function getObjectType(): string
+    public function getTitle(): string
     {
-        return $this->objectType;
+        return $this->title;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isInline(): bool
+    {
+        return $this->isInline;
     }
 
     /**
      * @return string
      */
-    public function getTitle(): string
+    public function getDescription(): string
     {
-        return $this->title;
+        return $this->description;
     }
 
     /**
@@ -246,42 +266,34 @@ public function getProperties(): Collection
     }
 
     /**
-     * @return array
+     * @return ?RichText
      */
-    public function getRawTitle(): array
+    public function getRichTitle(): ?RichText
     {
-        return $this->rawTitle;
+        return $this->richTitle;
     }
 
     /**
-     * @return array
+     * @return ?RichText
      */
-    public function getRawProperties(): array
+    public function getRichDescription(): ?RichText
     {
-        return $this->rawProperties;
+        return $this->richDescription;
     }
 
     /**
      * @return array
      */
-    public function getPropertyKeys(): array
-    {
-        return $this->propertyKeys;
-    }
-
-    /**
-     * @return DateTime
-     */
-    public function getCreatedTime(): DateTime
+    public function getRawProperties(): array
     {
-        return $this->createdTime;
+        return $this->rawProperties;
     }
 
     /**
      * @return array
      */
-    public function getLastEditedTime(): DateTime
+    public function getPropertyKeys(): array
     {
-        return $this->lastEditedTime;
+        return $this->propertyKeys;
     }
 }
diff --git a/src/Entities/Entity.php b/src/Entities/Entity.php
@@ -2,7 +2,6 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities;
 
-use Carbon\Carbon;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
 use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
 use Illuminate\Support\Arr;
@@ -18,6 +17,11 @@ class Entity implements JsonSerializable
      */
     private string $id;
 
+    /**
+     * @var string
+     */
+    protected string $objectType = '';
+
     /**
      * @var array
      */
@@ -68,25 +72,62 @@ protected function setResponseData(array $responseData): void
         $this->responseData = $responseData;
     }
 
-    protected function fillCreatedTime()
+    protected function fillEssentials(): void
+    {
+        $this->fillId();
+        $this->fillObjectType();
+        $this->fillTraitAttributes();
+    }
+
+    private function fillTraitAttributes(): void
     {
-        if (Arr::exists($this->responseData, 'created_time')) {
-            $this->createdTime = new Carbon($this->responseData['created_time']);
+        $traitMapping = [
+            'FiveamCode\LaravelNotionApi\Traits\HasTimestamps' => function ($entity) {
+                $entity->fillTimestampableAttributes();
+            },
+            'FiveamCode\LaravelNotionApi\Traits\HasParent' => function ($entity) {
+                $entity->fillParentAttributes();
+            },
+            'FiveamCode\LaravelNotionApi\Traits\HasArchive' => function ($entity) {
+                $entity->fillArchivedAttributes();
+            },
+        ];
+
+        $traits = $this->class_uses_deep($this);
+        foreach ($traits as $trait) {
+            if (Arr::exists($traitMapping, $trait)) {
+                $traitMapping[$trait]($this);
+            }
         }
     }
 
-    protected function fillLastEditedTime()
+    private function class_uses_deep($class, $autoload = true)
     {
-        if (Arr::exists($this->responseData, 'last_edited_time')) {
-            $this->lastEditedTime = new Carbon($this->responseData['last_edited_time']);
+        $traits = [];
+
+        do {
+            $traits = array_merge(class_uses($class, $autoload), $traits);
+        } while ($class = get_parent_class($class));
+
+        foreach ($traits as $trait => $same) {
+            $traits = array_merge(class_uses($trait, $autoload), $traits);
         }
+
+        return array_unique($traits);
     }
 
-    protected function fillId()
+    private function fillId()
     {
         $this->id = $this->responseData['id'];
     }
 
+    private function fillObjectType(): void
+    {
+        if (Arr::exists($this->responseData, 'object')) {
+            $this->objectType = $this->responseData['object'];
+        }
+    }
+
     /**
      * @return string
      */
@@ -100,6 +141,14 @@ public function setId($id): void
         $this->id = $id;
     }
 
+    /**
+     * @return string
+     */
+    public function getObjectType(): string
+    {
+        return $this->objectType;
+    }
+
     /**
      * @return array
      */