refactor: 'propertyNames' to 'propertyKeys'

johguentner · johguentner · commit 00938fe1cd2e · 2021-05-23T14:32:04.000+02:00
+ handle undefined propertyKey in 'getProperty()' =&gt; null
diff --git a/src/Entities/Database.php b/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
diff --git a/src/Entities/Page.php b/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
diff --git a/src/Entities/Properties/Number.php b/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();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class Database extends Entity`
`14`	`14`	`protected string $objectType = "";`
`15`	`15`	`protected array $rawTitle = [];`
`16`	`16`	`protected array $rawProperties = [];`
`17`		`- protected array $propertyNames = [];`
	`17`	`+ protected array $propertyKeys = [];`
`18`	`18`	`protected DateTime $createdTime;`
`19`	`19`	`protected DateTime $lastEditedTime;`
`20`	`20`
`@@ -57,7 +57,7 @@ private function fillProperties(): void`
`57`	`57`	`{`
`58`	`58`	`if (Arr::exists($this->responseData, 'properties')) {`
`59`	`59`	`$this->rawProperties = $this->responseData['properties'];`
`60`		`- $this->propertyNames = array_keys($this->rawProperties);`
	`60`	`+ $this->propertyKeys = array_keys($this->rawProperties);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`@@ -88,9 +88,9 @@ public function getRawProperties(): array`
`88`	`88`	`return $this->rawProperties;`
`89`	`89`	`}`
`90`	`90`
`91`		`- public function getPropertyNames(): array`
	`91`	`+ public function getPropertyKeys(): array`
`92`	`92`	`{`
`93`		`- return $this->propertyNames;`
	`93`	`+ return $this->propertyKeys;`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`public function getCreatedTime(): DateTime`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ class Page extends Entity`
`15`	`15`	`protected string $objectType = "";`
`16`	`16`	`protected array $rawProperties = [];`
`17`	`17`	`protected array $propertyMap = [];`
	`18`	`+ protected array $propertyKeys = [];`
`18`	`19`	`protected Collection $properties;`
`19`	`20`	`protected DateTime $createdTime;`
`20`	`21`	`protected DateTime $lastEditedTime;`
`@@ -54,6 +55,7 @@ private function fillProperties(): void`
`54`	`55`	`$this->properties->add($property);`
`55`	`56`	`$this->propertyMap[$propertyKey] = $property;`
`56`	`57`	`}`
	`58`	`+ $this->propertyKeys = array_keys($this->rawProperties);`
`57`	`59`	`}`
`58`	`60`	`}`
`59`	`61`
`@@ -83,10 +85,12 @@ public function getProperties(): Collection`
`83`	`85`	`return $this->properties;`
`84`	`86`	`}`
`85`	`87`
`86`		`- public function getProperty(string $propertyName): ?Property`
	`88`	`+ public function getProperty(string $propertyKey): ?Property`
`87`	`89`	`{`
`88`		`- //TODO:Handle undefined propertyNames (exception/null/?)`
`89`		`- return $this->propertyMap[$propertyName];`
	`90`	`+ if(!isset($this->propertyMap[$propertyKey])){`
	`91`	`+ return null;`
	`92`	`+ }`
	`93`	`+ return $this->propertyMap[$propertyKey];`
`90`	`94`	`}`
`91`	`95`
`92`	`96`	`public function getObjectType(): string`
`@@ -99,9 +103,9 @@ public function getRawProperties(): array`
`99`	`103`	`return $this->rawProperties;`
`100`	`104`	`}`
`101`	`105`
`102`		`- public function getPropertyNames(): array`
	`106`	`+ public function getPropertyKeys(): array`
`103`	`107`	`{`
`104`		`- return array_keys($this->rawProperties);`
	`108`	`+ return $this->propertyKeys;`
`105`	`109`	`}`
`106`	`110`
`107`	`111`	`public function getCreatedTime(): DateTime`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,6 @@ class Number extends Property`
`18`	`18`	`protected function fillFromRaw(): void`
`19`	`19`	`{`
`20`	`20`	`parent::fillFromRaw();`
`21`		`- // if (!is_array($this->rawContent))`
`22`		`- // 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.");`
`23`		`-`
`24`	`21`	`$this->fillNumber();`
`25`	`22`	`}`
`26`	`23`