5am-code · johguentner · May 15, 2021 · May 15, 2021 · May 15, 2021
diff --git a/src/Endpoints/Block.php b/src/Endpoints/Block.php
@@ -2,7 +2,7 @@
 
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
-use FiveamCode\LaravelNotionApi\Entities\BlockCollection;
+use FiveamCode\LaravelNotionApi\Entities\Collections\BlockCollection;
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Collection;

diff --git a/src/Endpoints/Database.php b/src/Endpoints/Database.php
@@ -2,7 +2,7 @@
 
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
-use FiveamCode\LaravelNotionApi\Entities\PageCollection;
+use FiveamCode\LaravelNotionApi\Entities\Collections\PageCollection;
 use Illuminate\Support\Collection;
 use FiveamCode\LaravelNotionApi\Notion;
 use FiveamCode\LaravelNotionApi\Query\Filter;

diff --git a/src/Endpoints/Databases.php b/src/Endpoints/Databases.php
@@ -3,7 +3,7 @@
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
 use FiveamCode\LaravelNotionApi\Entities\Database;
-use FiveamCode\LaravelNotionApi\Entities\DatabaseCollection;
+use FiveamCode\LaravelNotionApi\Entities\Collections\DatabaseCollection;
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
 use FiveamCode\LaravelNotionApi\Query\StartCursor;

diff --git a/src/Endpoints/Users.php b/src/Endpoints/Users.php
@@ -3,7 +3,7 @@
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
 use FiveamCode\LaravelNotionApi\Entities\User;
-use FiveamCode\LaravelNotionApi\Entities\UserCollection;
+use FiveamCode\LaravelNotionApi\Entities\Collections\UserCollection;
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
 use FiveamCode\LaravelNotionApi\Query\StartCursor;

diff --git a/src/Entities/Block.php → src/Entities/Blocks/Block.php b/src/Entities/Block.php → src/Entities/Blocks/Block.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace FiveamCode\LaravelNotionApi\Entities;
+namespace FiveamCode\LaravelNotionApi\Entities\Blocks;
 
 use DateTime;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;

diff --git a/src/Entities/BlockCollection.php → src/Entities/Collections/BlockCollection.php b/src/Entities/BlockCollection.php → src/Entities/Collections/BlockCollection.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace FiveamCode\LaravelNotionApi\Entities;
+namespace FiveamCode\LaravelNotionApi\Entities\Collections;
 
+use FiveamCode\LaravelNotionApi\Entities\Blocks\Block;
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;

diff --git a/src/Entities/DatabaseCollection.php → ...tities/Collections/DatabaseCollection.php b/src/Entities/DatabaseCollection.php → ...tities/Collections/DatabaseCollection.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace FiveamCode\LaravelNotionApi\Entities;
+namespace FiveamCode\LaravelNotionApi\Entities\Collections;
 
+use FiveamCode\LaravelNotionApi\Entities\Database;
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;

diff --git a/src/Entities/EntityCollection.php → ...Entities/Collections/EntityCollection.php b/src/Entities/EntityCollection.php → ...Entities/Collections/EntityCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FiveamCode\LaravelNotionApi\Entities;
+namespace FiveamCode\LaravelNotionApi\Entities\Collections;
 
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;

diff --git a/src/Entities/PageCollection.php → src/Entities/Collections/PageCollection.php b/src/Entities/PageCollection.php → src/Entities/Collections/PageCollection.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace FiveamCode\LaravelNotionApi\Entities;
+namespace FiveamCode\LaravelNotionApi\Entities\Collections;
 
+use FiveamCode\LaravelNotionApi\Entities\Page;
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;

diff --git a/src/Entities/UserCollection.php → src/Entities/Collections/UserCollection.php b/src/Entities/UserCollection.php → src/Entities/Collections/UserCollection.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace FiveamCode\LaravelNotionApi\Entities;
+namespace FiveamCode\LaravelNotionApi\Entities\Collections;
 
+use FiveamCode\LaravelNotionApi\Entities\User;
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;

diff --git a/src/Entities/Page.php b/src/Entities/Page.php
@@ -3,13 +3,17 @@
 namespace FiveamCode\LaravelNotionApi\Entities;
 
 use DateTime;
+use FiveamCode\LaravelNotionApi\Entities\Properties\Property;
 use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
 use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 
 class Page extends Entity
 {
+
     protected array $rawProperties = [];
+    protected Collection $propertyCollection;
     protected DateTime $createdTime;
     protected DateTime $lastEditedTime;
 
@@ -29,18 +33,30 @@ private function fillFromRaw(): void
         $this->fillLastEditedTime();
     }
 
-    private function fillProperties() : void
+    private function fillProperties(): void
     {
         if (Arr::exists($this->responseData, 'properties')) {
             $this->rawProperties = $this->responseData['properties'];
+            $this->propertyCollection = new Collection();
+            foreach (array_keys($this->rawProperties) as $propertyKey) {
+                $this->propertyCollection->add(new Property($propertyKey, $this->rawProperties[$propertyKey]));
+            }
         }
     }
 
-
-    public function getProperties()
+
+    public function getProperties(): Collection
+    {
+        return $this->propertyCollection;
+    }
+
+    public function getProperty(string $propertyName): ?Property
     {
-        //TODO: return collection of property-entities (id, type, title)
-        throw new \Exception("not implemented yet");
+        $property = $this->propertyCollection->filter(function($property) use($propertyName) {
+            return $property->getTitle() == $propertyName;
+        })->first();
+
+        return $property;
     }
 
     public function getRawProperties(): array

diff --git a/src/Entities/Properties/Property.php b/src/Entities/Properties/Property.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\Properties;
+
+use DateTime;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
+use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
+use FiveamCode\LaravelNotionApi\Notion;
+use Illuminate\Support\Arr;
+
+class Property extends Entity
+{
+    protected string $title;
+    protected string $type;
+    protected $rawContent;
+
+    public function __construct(string $title, array $responseData)
+    {
+        $this->title = $title;
+        $this->setResponseData($responseData);
+    }
+
+
+    protected function setResponseData(array $responseData): void
+    {
+        if (!Arr::exists($responseData, 'id')) throw WrapperException::instance("invalid json-array: no id provided");
+        $this->responseData = $responseData;
+        $this->fillFromRaw();
+    }
+
+    private function fillFromRaw(): void
+    {
+        $this->fillId();
+        $this->fillType();
+        $this->fillContent();
+    }
+
+    private function fillType(): void
+    {
+        $this->type = $this->responseData['type'];
+    }
+
+    private function fillContent(): void
+    {
+        $this->rawContent = $this->responseData[$this->getType()];
+    }
+
+    public function getTitle():string{
+        return $this->title;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function getRawContent()
+    {
+        return $this->rawContent;
+    }
+}