introduce HasParent as Trait for entities

- move page logic of ``HasParent`` to its on trait and did minor refactoring
- add ``HasParent`` to Database and Block entity

Author: johguentner

src/Entities/Blocks/Block.php

@@ -4,6 +4,7 @@
 
 use FiveamCode\LaravelNotionApi\Entities\Entity;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Traits\HasParent;
 use FiveamCode\LaravelNotionApi\Traits\HasTimestamps;
 use Illuminate\Support\Arr;
 
@@ -12,7 +13,7 @@
  */
 class Block extends Entity
 {
-    use HasTimestamps;
+    use HasTimestamps, HasParent;
 
     /**
      * @var string
@@ -61,6 +62,7 @@ protected function fillFromRaw(): void
         $this->fillType();
         $this->fillRawContent();
         $this->fillHasChildren();
+        $this->fillParentProperties();
         $this->fillTimestampableProperties();
     }
 

src/Entities/Database.php

@@ -5,6 +5,7 @@
 use FiveamCode\LaravelNotionApi\Entities\Properties\Property;
 use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Traits\HasParent;
 use FiveamCode\LaravelNotionApi\Traits\HasTimestamps;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
@@ -14,7 +15,7 @@
  */
 class Database extends Entity
 {
-    use HasTimestamps;
+    use HasTimestamps, HasParent;
 
     /**
      * @var string
@@ -105,6 +106,7 @@ private function fillFromRaw()
         $this->fillObjectType();
         $this->fillProperties();
         $this->fillDatabaseUrl();
+        $this->fillParentProperties();
         $this->fillTimestampableProperties();
     }
 

src/Entities/Page.php

@@ -17,6 +17,7 @@
 use FiveamCode\LaravelNotionApi\Entities\Properties\Title;
 use FiveamCode\LaravelNotionApi\Entities\Properties\Url;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Traits\HasParent;
 use FiveamCode\LaravelNotionApi\Traits\HasTimestamps;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
@@ -26,7 +27,7 @@
  */
 class Page extends Entity
 {
-    use HasTimestamps;
+    use HasTimestamps, HasParent;
 
     /**
      * @var string
@@ -58,16 +59,6 @@ class Page extends Entity
      */
     private string $coverType = '';
 
-    /**
-     * @var string
-     */
-    private string $parentId = '';
-
-    /**
-     * @var string
-     */
-    private string $parentType = '';
-
     /**
      * @var string
      */
@@ -125,13 +116,13 @@ protected function setResponseData(array $responseData): void
     private function fillFromRaw(): void
     {
         $this->fillId();
-        $this->fillParent();
         $this->fillObjectType();
         $this->fillProperties();
         $this->fillTitle(); // This has to be called after fillProperties(), since title is provided by properties
         $this->fillPageUrl();
         $this->fillIcon();
         $this->fillCover();
+        $this->fillParentProperties();
         $this->fillTimestampableProperties();
     }
 
@@ -208,19 +199,6 @@ private function fillPageUrl(): void
         }
     }
 
-    private function fillParent(): void
-    {
-        if (Arr::exists($this->responseData, 'parent')) {
-            $this->parentType = $this->responseData['parent']['type'];
-            if (Arr::exists($this->responseData['parent'], 'database_id')) {
-                $this->parentId = $this->responseData['parent']['database_id'];
-            } elseif (Arr::exists($this->responseData['parent'], 'page_id')) {
-                $this->parentId = $this->responseData['parent']['page_id'];
-            } elseif (Arr::exists($this->responseData['parent'], 'workspace')) {
-                $this->parentId = $this->responseData['parent']['workspace'];
-            }
-        }
-    }
 
     /**
      * @param $propertyTitle
@@ -475,22 +453,6 @@ public function getObjectType(): string
         return $this->objectType;
     }
 
-    /**
-     * @return string
-     */
-    public function getParentId(): string
-    {
-        return $this->parentId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getParentType(): string
-    {
-        return $this->parentType;
-    }
-
     /**
      * @return array
      */

src/Traits/HasParent.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Traits;
+
+use Carbon\Carbon;
+use DateTime;
+use FiveamCode\LaravelNotionApi\Entities\User;
+use Illuminate\Support\Arr;
+
+/**
+ * Trait HasParent
+ */
+trait HasParent
+{
+    /**
+     * @var array
+     */
+    protected array $responseData = [];
+
+    /**
+     * @var string
+     */
+    private string $parentId = '';
+
+    /**
+     * @var string
+     */
+    private string $parentType = '';
+
+
+    protected function fillParentProperties(): void
+    {
+        $this->fillParent();
+    }
+
+    private function fillParent(): void
+    {
+        if (Arr::exists($this->responseData, 'parent') && Arr::exists($this->responseData['parent'], 'type')) {
+            $this->parentType = $this->responseData['parent']['type'];
+            if (Arr::exists($this->responseData['parent'], $this->parentType)) {
+                $this->parentId = $this->responseData['parent'][$this->parentType];
+            }
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getParentId(): string
+    {
+        return $this->parentId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getParentType(): string
+    {
+        return $this->parentType;
+    }
+}