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

Author: mechelon

composer.lock

@@ -28,7 +28,7 @@ protected function setResponseData(array $responseData): void
 
  private function fillFromRaw(): void
  {
- $this->fillId();
+ $this->fillId(); 
  $this->fillObjectType();
  $this->fillProperties();
  $this->fillTitle(); //!Warning: call after 'fillProperties', since title is included within properties
@@ -49,7 +49,7 @@ private function fillProperties(): void
  $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]));
+ $this->propertyCollection->add(Property::fromResponse($propertyKey, $this->rawProperties[$propertyKey]));
  }
  }
  }

src/Entities/Page.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\Properties;
+
+use DateTime;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\SelectItem;
+use FiveamCode\LaravelNotionApi\Entities\User;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Notion;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+
+class CreatedBy extends Property
+{
+ protected function fillFromRaw(): void
+ {
+ parent::fillFromRaw();
+ if (!is_array($this->rawContent))
+ throw HandlingException::instance("The property-type is created_by, however the raw data-structure does not reprecent this type (= array of items). Please check the raw response-data.");
+
+ $this->content = new User($this->rawContent);
+ }
+
+ public function getContent(): User
+ {
+ return $this->getUser();
+ }
+
+ public function getUser(): User
+ {
+ return $this->content;
+ }
+
+}

src/Entities/Properties/CreatedBy.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\Properties;
+
+use DateTime;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\SelectItem;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Notion;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+
+class MultiSelect extends Property
+{
+ protected function fillFromRaw(): void
+ {
+ parent::fillFromRaw();
+ if (!is_array($this->rawContent))
+ throw HandlingException::instance("The property-type is multi_select, however the raw data-structure does not represent this type (= array of items). Please check the raw response-data.");
+
+ $itemCollection = new Collection();
+
+ foreach ($this->rawContent as $item) {
+ $itemCollection->add(new SelectItem($item));
+ }
+
+ $this->content = $itemCollection;
+ }
+
+ public function getContent(): Collection
+ {
+ return $this->getItems();
+ }
+
+ public function getItems(): Collection
+ {
+ return $this->content;
+ }
+
+ public function getNames(): array
+ {
+ $names = [];
+ foreach ($this->getItems() as $item) {
+ array_push($names, $item->getName());
+ }
+ return $names;
+ }
+
+ public function getColors(): array
+ {
+ $colors = [];
+ foreach ($this->getItems() as $item) {
+ array_push($colors, $item->getColor());
+ }
+ return $colors;
+ }
+}

src/Entities/Properties/MultiSelect.php

@@ -13,6 +13,7 @@ class Property extends Entity
  protected string $title;
  protected string $type;
  protected $rawContent;
+ protected $content;
 
  public function __construct(string $title, array $responseData)
  {
@@ -28,7 +29,7 @@ protected function setResponseData(array $responseData): void
  $this->fillFromRaw();
  }
 
- private function fillFromRaw(): void
+ protected function fillFromRaw(): void
  {
  $this->fillId();
  $this->fillType();
@@ -63,4 +64,25 @@ public function getRawContent()
  {
  return $this->rawContent;
  }
+
+ public function getContent()
+ {
+ return $this->rawContent;
+ }
+
+ public static function fromResponse($propertyKey, $rawContent): Property
+ {
+ if ($rawContent['type'] == 'multi_select') {
+ return new MultiSelect($propertyKey, $rawContent);
+ } else if ($rawContent['type'] == 'select') {
+ return new Select($propertyKey, $rawContent);
+ } else if ($rawContent['type'] == 'text') {
+ return new Text($propertyKey, $rawContent);
+ } else if($rawContent['type'] == 'created_by'){
+ return new CreatedBy($propertyKey, $rawContent);
+ }
+
+
+ return new Property($propertyKey, $rawContent);
+ }
 }

src/Entities/Properties/Property.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\Properties;
+
+use DateTime;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\SelectItem;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Notion;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+
+class Select extends Property
+{
+ protected function fillFromRaw(): void
+ {
+ parent::fillFromRaw();
+ if (!is_array($this->rawContent))
+ throw HandlingException::instance("The property-type is select, however the raw data-structure does not reprecent this type. Please check the raw response-data.");
+
+ $this->content = new SelectItem($this->rawContent);
+ }
+
+ public function getContent(): SelectItem
+ {
+ return $this->getItem();
+ }
+
+ public function getItem(): SelectItem
+ {
+ return $this->content;
+ }
+
+ public function getName()
+ {
+ return $this->content->getName();
+ }
+
+ public function getColor()
+ {
+ return $this->content->getColor();
+ }
+}

src/Entities/Properties/Select.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\Properties;
+
+use DateTime;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\SelectItem;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Notion;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+
+class Text extends Property
+{
+ protected function fillFromRaw(): void
+ {
+ parent::fillFromRaw();
+ if (!is_array($this->rawContent))
+ throw HandlingException::instance("The property-type is text, however the raw data-structure does not represent this type (= array of items). Please check the raw response-data.");
+
+ $this->content = new RichText($this->rawContent);
+ }
+
+ public function getContent(): RichText
+ {
+ return $this->getRichText();
+ }
+
+ public function getRichText(): RichText
+ {
+ return $this->content;
+ }
+
+ public function getPlainText()
+ {
+ return $this->content->getPlaintext();
+ }
+
+}

src/Entities/Properties/Text.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\PropertyItems;
+
+use DateTime;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Notion;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+
+class RichText extends Entity
+{
+ private string $plainText = "";
+
+ public function __construct(array $responseData)
+ {
+ $this->setResponseData($responseData);
+ }
+
+ protected function setResponseData(array $responseData): void
+ {
+ $this->responseData = $responseData;
+ $this->fillFromRaw();
+ }
+
+ protected function fillFromRaw(): void
+ {
+ $this->fillPlainText();
+ }
+
+ protected function fillPlainText(): void
+ {
+ if (is_array($this->responseData)) {
+ foreach ($this->responseData as $textItem) {
+ if (Arr::exists($textItem, 'plain_text')) {
+ $this->plainText .= $textItem['plain_text'];
+ }
+ }
+ }
+ }
+
+ public function getPlainText(): string
+ {
+ return $this->plainText;
+ }
+}

src/Entities/PropertyItems/RichText.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\PropertyItems;
+
+use DateTime;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Notion;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+
+class SelectItem extends Entity
+{
+ private string $color;
+ private string $name;
+
+ public function __construct(array $responseData)
+ {
+ $this->setResponseData($responseData);
+ }
+
+ protected function setResponseData(array $responseData): void
+ {
+ if (!Arr::exists($responseData, 'id')) throw HandlingException::instance("invalid json-array: no id provided");
+ $this->responseData = $responseData;
+ $this->fillFromRaw();
+ }
+
+ protected function fillFromRaw(): void
+ {
+ $this->fillId();
+ $this->fillName();
+ $this->fillColor();
+ }
+
+ 
+ protected function fillName():void{
+ if (Arr::exists($this->responseData, 'name')) {
+ $this->name = $this->responseData['name'];
+ }
+ }
+
+ protected function fillColor():void{
+ if (Arr::exists($this->responseData, 'color')) {
+ $this->color = $this->responseData['color'];
+ }
+ }
+
+
+
+ public function getColor(): string
+ {
+ return $this->color;
+ }
+
+ public function getName(): string
+ {
+ return $this->name;
+ }
+}