Merge branch 'feature/refactor-collections' of https://github.com/5am-code/laravel-notion-api into feature/refactor-collections

Author: mechelon

src/Entities/Database.php

@@ -14,7 +14,7 @@ class Database extends Entity
     protected string $objectType = "";
     protected array $rawTitle = [];
     protected array $rawProperties = [];
-    protected array $propertyNames = [];
+    protected array $propertyKeys = [];
     protected DateTime $createdTime;
     protected DateTime $lastEditedTime;
 
@@ -57,7 +57,7 @@ private function fillProperties(): void
     {
         if (Arr::exists($this->responseData, 'properties')) {
             $this->rawProperties = $this->responseData['properties'];
-            $this->propertyNames = array_keys($this->rawProperties);
+            $this->propertyKeys = array_keys($this->rawProperties);
         }
     }
 
@@ -88,9 +88,9 @@ public function getRawProperties(): array
         return $this->rawProperties;
     }
 
-    public function getPropertyNames(): array
+    public function getPropertyKeys(): array
     {
-        return $this->propertyNames;
+        return $this->propertyKeys;
     }
 
     public function getCreatedTime(): DateTime

src/Entities/Page.php

@@ -15,6 +15,7 @@ class Page extends Entity
     protected string $objectType = "";
     protected array $rawProperties = [];
     protected array $propertyMap = [];
+    protected array $propertyKeys = [];
     protected Collection $properties;
     protected DateTime $createdTime;
     protected DateTime $lastEditedTime;
@@ -54,6 +55,7 @@ private function fillProperties(): void
                 $this->properties->add($property);
                 $this->propertyMap[$propertyKey] = $property;
             }
+            $this->propertyKeys = array_keys($this->rawProperties);
         }
     }
 
@@ -83,10 +85,12 @@ public function getProperties(): Collection
         return $this->properties;
     }
 
-    public function getProperty(string $propertyName): ?Property
+    public function getProperty(string $propertyKey): ?Property
     {
-        //TODO:Handle undefined propertyNames (exception/null/?)
-        return $this->propertyMap[$propertyName];
+        if(!isset($this->propertyMap[$propertyKey])){
+            return null;
+        }
+        return $this->propertyMap[$propertyKey];
     }
 
     public function getObjectType(): string
@@ -99,9 +103,9 @@ public function getRawProperties(): array
         return $this->rawProperties;
     }
 
-    public function getPropertyNames(): array
+    public function getPropertyKeys(): array
     {
-        return array_keys($this->rawProperties);
+        return $this->propertyKeys;
     }
 
     public function getCreatedTime(): DateTime

src/Entities/Properties/Number.php

@@ -18,9 +18,6 @@ class Number extends Property
     protected function fillFromRaw(): void
     {
         parent::fillFromRaw();
-        // if (!is_array($this->rawContent))
-        //     throw HandlingException::instance("The property-type is number, however the raw data-structure does not represent this type (= array of items). Please check the raw response-data.");
-
         $this->fillNumber();
     }