Merge pull request #109 from 5am-code/feature/add-database-attributes

johguentner · web-flow · commit ff4794a4db09 · 2023-02-06T20:19:43.000+01:00
add missing database attributes and introduce traits for general attributes
diff --git a/src/Entities/Blocks/Block.php b/src/Entities/Blocks/Block.php
@@ -59,13 +59,10 @@ protected function setResponseData(array $responseData): void
 
     protected function fillFromRaw(): void
     {
-        parent::fillEntityBase();
+        parent::fillEssentials();
         $this->fillType();
         $this->fillRawContent();
         $this->fillHasChildren();
-        $this->fillParentAttributes();
-        $this->fillArchivedAttributes();
-        $this->fillTimestampableAttributes();
     }
 
     private function fillType(): void
diff --git a/src/Entities/Database.php b/src/Entities/Database.php
@@ -99,17 +99,14 @@ protected function setResponseData(array $responseData): void
 
     private function fillFromRaw()
     {
-        parent::fillEntityBase();
+        parent::fillEssentials();
         $this->fillIcon();
         $this->fillCover();
         $this->fillTitle();
         $this->fillIsInline();
         $this->fillDescription();
         $this->fillProperties();
         $this->fillDatabaseUrl();
-        $this->fillParentAttributes();
-        $this->fillArchivedAttributes();
-        $this->fillTimestampableAttributes();
     }
 
     private function fillTitle(): void
diff --git a/src/Entities/Entity.php b/src/Entities/Entity.php
@@ -72,10 +72,48 @@ protected function setResponseData(array $responseData): void
         $this->responseData = $responseData;
     }
 
-    protected function fillEntityBase(): void
+    protected function fillEssentials(): void
     {
         $this->fillId();
         $this->fillObjectType();
+        $this->fillTraitAttributes();
+    }
+
+    private function fillTraitAttributes(): void
+    {
+        $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);
+            }
+        }
+    }
+
+    private function class_uses_deep($class, $autoload = true)
+    {
+        $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);
     }
 
     private function fillId()
diff --git a/src/Entities/Page.php b/src/Entities/Page.php
@@ -111,15 +111,12 @@ protected function setResponseData(array $responseData): void
 
     private function fillFromRaw(): void
     {
-        parent::fillEntityBase();
+        parent::fillEssentials();
         $this->fillProperties();
         $this->fillTitle(); // This has to be called after fillProperties(), since title is provided by properties
         $this->fillPageUrl();
         $this->fillIcon();
         $this->fillCover();
-        $this->fillParentAttributes();
-        $this->fillArchivedAttributes();
-        $this->fillTimestampableAttributes();
     }
 
     /**
diff --git a/src/Entities/Properties/Property.php b/src/Entities/Properties/Property.php
@@ -62,7 +62,7 @@ protected function setResponseData(array $responseData): void
 
     protected function fillFromRaw(): void
     {
-        parent::fillEntityBase();
+        parent::fillEssentials();
         $this->fillType();
         $this->fillContent();
     }
diff --git a/src/Entities/PropertyItems/SelectItem.php b/src/Entities/PropertyItems/SelectItem.php
@@ -36,7 +36,7 @@ protected function setResponseData(array $responseData): void
 
     protected function fillFromRaw(): void
     {
-        parent::fillEntityBase();
+        parent::fillEssentials();
         $this->fillName();
         $this->fillColor();
     }
diff --git a/src/Entities/User.php b/src/Entities/User.php
@@ -37,7 +37,7 @@ protected function setResponseData(array $responseData): void
 
     private function fillFromRaw(): void
     {
-        parent::fillEntityBase();
+        parent::fillEssentials();
         $this->fillName();
         $this->fillAvatarUrl();
     }

Original file line number	Diff line number	Diff line change
`@@ -59,13 +59,10 @@ protected function setResponseData(array $responseData): void`
`59`	`59`
`60`	`60`	`protected function fillFromRaw(): void`
`61`	`61`	`{`
`62`		`- parent::fillEntityBase();`
	`62`	`+ parent::fillEssentials();`
`63`	`63`	`$this->fillType();`
`64`	`64`	`$this->fillRawContent();`
`65`	`65`	`$this->fillHasChildren();`
`66`		`- $this->fillParentAttributes();`
`67`		`- $this->fillArchivedAttributes();`
`68`		`- $this->fillTimestampableAttributes();`
`69`	`66`	`}`
`70`	`67`
`71`	`68`	`private function fillType(): void`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ protected function setResponseData(array $responseData): void`
`62`	`62`
`63`	`63`	`protected function fillFromRaw(): void`
`64`	`64`	`{`
`65`		`- parent::fillEntityBase();`
	`65`	`+ parent::fillEssentials();`
`66`	`66`	`$this->fillType();`
`67`	`67`	`$this->fillContent();`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protected function setResponseData(array $responseData): void`
`36`	`36`
`37`	`37`	`protected function fillFromRaw(): void`
`38`	`38`	`{`
`39`		`- parent::fillEntityBase();`
	`39`	`+ parent::fillEssentials();`
`40`	`40`	`$this->fillName();`
`41`	`41`	`$this->fillColor();`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ protected function setResponseData(array $responseData): void`
`37`	`37`
`38`	`38`	`private function fillFromRaw(): void`
`39`	`39`	`{`
`40`		`- parent::fillEntityBase();`
	`40`	`+ parent::fillEssentials();`
`41`	`41`	`$this->fillName();`
`42`	`42`	`$this->fillAvatarUrl();`
`43`	`43`	`}`