split up rollup content type filling into separate methods

Author: mechelon

src/Entities/Properties/Property.php

@@ -40,7 +40,7 @@ class Property extends Entity
      */
     public function __construct(string $title = null)
     {
-        if ($title != null) $this->title = $title;
+        if ($title !== null) $this->title = $title;
     }
 
 
@@ -112,7 +112,7 @@ public function getType(): string
      */
     public function asText(): string
     {
-        if($this->content == null) return "";
+        if ($this->content == null) return "";
         return json_encode($this->content);
     }
 
@@ -165,17 +165,17 @@ public static function fromResponse($propertyKey, $rawContent): Property
             $property = new PhoneNumber($propertyKey);
         } else if ($rawContent['type'] == 'url') {
             $property = new Url($propertyKey);
-        }else if ($rawContent['type'] == 'last_edited_by') {
+        } else if ($rawContent['type'] == 'last_edited_by') {
             $property = new LastEditedBy($propertyKey);
-        }else if ($rawContent['type'] == 'created_time') {
+        } else if ($rawContent['type'] == 'created_time') {
             $property = new CreatedTime($propertyKey);
-        }else if ($rawContent['type'] == 'last_edited_time') {
+        } else if ($rawContent['type'] == 'last_edited_time') {
             $property = new LastEditedTime($propertyKey);
-        }else if ($rawContent['type'] == 'files') {
+        } else if ($rawContent['type'] == 'files') {
             $property = new Files($propertyKey);
-        }else if ($rawContent['type'] == 'formula') {
+        } else if ($rawContent['type'] == 'formula') {
             $property = new Formula($propertyKey);
-        }else if ($rawContent['type'] == 'rollup') {
+        } else if ($rawContent['type'] == 'rollup') {
             $property = new Rollup($propertyKey);
         } else {
             $property = new Property($propertyKey);

src/Entities/Properties/Rollup.php

@@ -4,7 +4,9 @@
 
 use DateTime;
 use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichDate;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 
 /**
  * Class Rollup
@@ -15,26 +17,26 @@ class Rollup extends Property
     protected string $rollupType;
 
     /**
-     *
+     * @throws HandlingException
      */
     protected function fillFromRaw(): void
     {
         parent::fillFromRaw();
 
         $this->rollupType = $this->rawContent['type'];
 
-        if ($this->rollupType == 'number') {
-            $this->content = $this->rawContent[$this->rollupType];
-        } else if ($this->rollupType == 'date') {
-            $this->content = new RichDate();
-            if (isset($this->rawContent[$this->rollupType]['start'])) $this->content->setStart(new DateTime($this->rawContent[$this->rollupType]['start']));
-            if (isset($this->rawContent[$this->rollupType]['end'])) $this->content->setEnd(new DateTime($this->rawContent[$this->rollupType]['end']));
-        } else if ($this->rollupType == 'array') {
-            $this->content = new Collection();
-            foreach ($this->rawContent[$this->rollupType] as $rollupPropertyItem) {
-                $rollupPropertyItem['id'] = 'undefined';
-                $this->content->add(Property::fromResponse("", $rollupPropertyItem));
-            }
+        switch ($this->rollupType) {
+            case 'number':
+                $this->setRollupContentNumber();
+                break;
+            case 'array':
+                $this->setRollupContentArray();
+                break;
+            case 'date':
+                $this->setRollupContentDate();
+                break;
+            default:
+                throw new HandlingException("Unexpected rollupType {$this->rollupType}");
         }
     }
 
@@ -55,17 +57,56 @@ public function getRollupType(): string
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getRollupContentType(): string
+    public function getRollupContentType(): ?string
     {
-        if($this->getContent() instanceof Collection){
+        if ($this->getContent() instanceof Collection) {
             $firstItem = $this->getContent()->first();
-            if($firstItem == null) return "null";
+
+            # if rollup is empty, there is no type
+            if ($firstItem == null) return null;
+
             return $firstItem->getType();
-        }
-        else{
+        } else {
             return $this->getRollupType();
         }
     }
+
+
+    private function setRollupContentNumber()
+    {
+        $this->content = $this->rawContent[$this->rollupType];
+    }
+
+    private function setRollupContentArray()
+    {
+        $this->content = new Collection();
+
+        foreach ($this->rawContent[$this->rollupType] as $rollupPropertyItem) {
+            // TODO
+            $rollupPropertyItem['id'] = 'undefined';
+
+            $this->content->add(
+                Property::fromResponse("", $rollupPropertyItem)
+            );
+        }
+    }
+
+    private function setRollupContentDate()
+    {
+        $this->content = new RichDate();
+
+        if (isset($this->rawContent[$this->rollupType]['start'])) {
+            $this->content->setStart(
+                new DateTime($this->rawContent[$this->rollupType]['start'])
+            );
+        }
+
+        if (isset($this->rawContent[$this->rollupType]['end'])) {
+            $this->content->setEnd(
+                new DateTime($this->rawContent[$this->rollupType]['end'])
+            );
+        }
+    }
 }