add properties to Page, add PageCollection

johguentner · johguentner · commit 584a19d22883 · 2021-05-14T23:25:09.000+02:00
&gt; + add PageCollection as return-type within Database-&gt;query
diff --git a/src/Endpoints/Database.php b/src/Endpoints/Database.php
@@ -2,6 +2,7 @@
 
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
+use FiveamCode\LaravelNotionApi\Entities\PageCollection;
 use Illuminate\Support\Collection;
 use FiveamCode\LaravelNotionApi\Notion;
 use FiveamCode\LaravelNotionApi\Query\Filter;
@@ -28,7 +29,7 @@ public function __construct(string $databaseId, Notion $notion)
         parent::__construct($notion);
     }
 
-    public function query(): array
+    public function query(): Collection
     {
         if ($this->sorts->isNotEmpty())
             $postData["sorts"] = Sorting::sortQuery($this->sorts);
@@ -50,7 +51,9 @@ public function query(): array
             ->json();
 
         // toDo return Database Entity
-        dd($response);
+        // dd($response);
+        $pageCollection = new PageCollection($response);
+        return $pageCollection->getResults();
     }
 
     public function filterBy(Collection $filter)
diff --git a/src/Entities/Database.php b/src/Entities/Database.php
@@ -34,15 +34,15 @@ private function fillFromRaw()
         $this->fillLastEditedTime();
     }
 
-    private function fillTitle()
+    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'];
         }
     }
 
-    private function fillProperties()
+    private function fillProperties() : void
     {
         if (Arr::exists($this->responseData, 'properties')) {
             $this->rawProperties = $this->responseData['properties'];
@@ -80,7 +80,6 @@ public function getCreatedTime(): DateTime
         return $this->createdTime;
     }
 
-
     public function getLastEditedTime(): DateTime
     {
         return $this->lastEditedTime;
diff --git a/src/Entities/Page.php b/src/Entities/Page.php
@@ -2,14 +2,64 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities;
 
+use DateTime;
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
+use Illuminate\Support\Arr;
 
 class Page extends Entity
 {
+    protected array $rawProperties = [];
+    protected DateTime $createdTime;
+    protected DateTime $lastEditedTime;
+
+
     protected function setResponseData(array $responseData): void
     {
         parent::setResponseData($responseData);
         if ($responseData['object'] !== 'page') throw WrapperException::instance("invalid json-array: the given object is not a page");
+        $this->fillFromRaw();
+    }
+
+    private function fillFromRaw(): void
+    {
+        $this->fillId();
+        $this->fillProperties();
+        $this->fillCreatedTime();
+        $this->fillLastEditedTime();
+    }
+
+    private function fillProperties() : void
+    {
+        if (Arr::exists($this->responseData, 'properties')) {
+            $this->rawProperties = $this->responseData['properties'];
+        }
+    }
+
+    
+    public function getProperties()
+    {
+        //TODO: return collection of property-entities (id, type, title)
+        throw new \Exception("not implemented yet");
+    }
+
+    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;
     }
 }
diff --git a/src/Entities/PageCollection.php b/src/Entities/PageCollection.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities;
+
+use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
+use FiveamCode\LaravelNotionApi\Notion;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+
+
+class PageCollection extends EntityCollection
+{
+
+    protected function setResponseData(array $responseData): void
+    {
+        parent::setResponseData($responseData);
+        $this->collectChildren();
+    }
+
+    protected function collectChildren()
+    {
+        $this->collection = new Collection();
+        foreach ($this->rawResults as $blockChild) {
+            $this->collection->add(new Page($blockChild));
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,15 @@ private function fillFromRaw()`
`34`	`34`	`$this->fillLastEditedTime();`
`35`	`35`	`}`
`36`	`36`
`37`		`- private function fillTitle()`
	`37`	`+ private function fillTitle() : void`
`38`	`38`	`{`
`39`	`39`	`if (Arr::exists($this->responseData, 'title') && is_array($this->responseData['title'])) {`
`40`	`40`	`$this->title = Arr::first($this->responseData['title'], null, ['plain_text' => ''])['plain_text'];`
`41`	`41`	`$this->rawTitle = $this->responseData['title'];`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`- private function fillProperties()`
	`45`	`+ private function fillProperties() : void`
`46`	`46`	`{`
`47`	`47`	`if (Arr::exists($this->responseData, 'properties')) {`
`48`	`48`	`$this->rawProperties = $this->responseData['properties'];`
`@@ -80,7 +80,6 @@ public function getCreatedTime(): DateTime`
`80`	`80`	`return $this->createdTime;`
`81`	`81`	`}`
`82`	`82`
`83`		`-`
`84`	`83`	`public function getLastEditedTime(): DateTime`
`85`	`84`	`{`
`86`	`85`	`return $this->lastEditedTime;`