Merge pull request #35 from 5am-code/dev

Dev for v0.6.0
5am-code · Sep 25, 2021 · 15d3c73 · 15d3c73
2 parents 11c11e1 + 235271b
commit 15d3c73
Show file tree

Hide file tree

Showing 68 changed files with 1,582 additions and 284 deletions.
diff --git a/src/Endpoints/Block.php b/src/Endpoints/Block.php
@@ -2,10 +2,11 @@
 
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
-use FiveamCode\LaravelNotionApi\Notion;
-use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
-use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Entities\Blocks\Block as BlockEntity;
 use FiveamCode\LaravelNotionApi\Entities\Collections\BlockCollection;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
+use FiveamCode\LaravelNotionApi\Notion;
 
 /**
  * Class Block
@@ -31,9 +32,29 @@ public function __construct(Notion $notion, string $blockId)
         $this->blockId = $blockId;
     }
 
+    /**
+     * Retrieve a block
+     * url: https://api.notion.com/{version}/blocks/{block_id}
+     * notion-api-docs: https://developers.notion.com/reference/retrieve-a-block
+     *
+     * @param string $blockId
+     * @return BlockEntity
+     * @throws HandlingException
+     * @throws NotionException
+     */
+    public function retrieve(): BlockEntity
+    {
+
+        $response = $this->get(
+            $this->url(Endpoint::BLOCKS . '/' . $this->blockId)
+        );
+
+        return BlockEntity::fromResponse($response->json());
+    }
+
     /**
      * Retrieve block children
-     * url: https://api.notion.com/{version}/blocks/{block_id}/children
+     * url: https://api.notion.com/{version}/blocks/{block_id}/children [get]
      * notion-api-docs: https://developers.notion.com/reference/get-block-children
      *
      * @return BlockCollection
@@ -50,11 +71,37 @@ public function children(): BlockCollection
     }
 
     /**
-     * @return array
+     * Append one Block or an array of Blocks
+     * url: https://api.notion.com/{version}/blocks/{block_id}/children [patch]
+     * notion-api-docs: https://developers.notion.com/reference/patch-block-children
+     *
+     * @return FiveamCode\LaravelNotionApi\Entities\Blocks\Block
      * @throws HandlingException
      */
-    public function create(): array
+    public function append(array|BlockEntity $appendices): BlockEntity
     {
-        throw new HandlingException('Not implemented');
+        if (!is_array($appendices)) {
+            $appendices = [$appendices];
+        }
+        $children = [];
+
+        foreach ($appendices as $block) {
+            $children[] = [
+                "object" => "block",
+                "type" => $block->getType(),
+                $block->getType() => $block->getRawContent()
+            ];
+        }
+
+        $body = [
+            "children" => $children
+        ];
+
+        $response = $this->patch(
+            $this->url(Endpoint::BLOCKS . '/' . $this->blockId . '/children' . ""),
+            $body
+        );
+
+        return new BlockEntity($response->json());
     }
 }
diff --git a/src/Endpoints/Database.php b/src/Endpoints/Database.php
@@ -2,11 +2,11 @@
 
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
-use Illuminate\Support\Collection;
+use FiveamCode\LaravelNotionApi\Entities\Collections\PageCollection;
 use FiveamCode\LaravelNotionApi\Notion;
-use FiveamCode\LaravelNotionApi\Query\Filter;
+use FiveamCode\LaravelNotionApi\Query\Filters\Filter;
 use FiveamCode\LaravelNotionApi\Query\Sorting;
-use FiveamCode\LaravelNotionApi\Entities\Collections\PageCollection;
+use Illuminate\Support\Collection;
 
 /**
  * Class Database
@@ -68,7 +68,6 @@ public function query(): PageCollection
         if ($this->pageSize !== null)
             $postData['page_size'] = $this->pageSize;
 
-
         $response = $this
             ->post(
                 $this->url(Endpoint::DATABASES . "/{$this->databaseId}/query"),

diff --git a/src/Endpoints/Databases.php b/src/Endpoints/Databases.php
@@ -2,10 +2,10 @@
 
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
+use FiveamCode\LaravelNotionApi\Entities\Collections\DatabaseCollection;
 use FiveamCode\LaravelNotionApi\Entities\Database;
-use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Entities\Collections\DatabaseCollection;
+use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
 
 
 /**
@@ -26,6 +26,7 @@ class Databases extends Endpoint implements EndpointInterface
      * @return DatabaseCollection
      * @throws HandlingException
      * @throws NotionException
+     * @deprecated
      */
     public function all(): DatabaseCollection
     {
@@ -36,7 +37,7 @@ public function all(): DatabaseCollection
     /**
      * Retrieve a database
      * url: https://api.notion.com/{version}/databases/{database_id}
-     * notion-api-docs: https://developers.notion.com/reference/get-database
+     * notion-api-docs: https://developers.notion.com/reference/retrieve-a-database 
      *
      * @param string $databaseId
      * @return Database

diff --git a/src/Endpoints/Endpoint.php b/src/Endpoints/Endpoint.php
@@ -2,11 +2,11 @@
 
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
-use Illuminate\Http\Client\Response;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
 use FiveamCode\LaravelNotionApi\Notion;
 use FiveamCode\LaravelNotionApi\Query\StartCursor;
-use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
-use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use Illuminate\Http\Client\Response;
 
 /**
  * Class Endpoint

diff --git a/src/Endpoints/Pages.php b/src/Endpoints/Pages.php
@@ -2,9 +2,10 @@
 
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
+use FiveamCode\LaravelNotionApi\Entities\Collections\EntityCollection;
 use FiveamCode\LaravelNotionApi\Entities\Page;
-use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
 
 /**
  * Class Pages

diff --git a/src/Endpoints/Search.php b/src/Endpoints/Search.php
@@ -2,10 +2,10 @@
 
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
-use Illuminate\Support\Collection;
+use FiveamCode\LaravelNotionApi\Entities\Collections\EntityCollection;
 use FiveamCode\LaravelNotionApi\Notion;
 use FiveamCode\LaravelNotionApi\Query\Sorting;
-use FiveamCode\LaravelNotionApi\Entities\Collections\EntityCollection;
+use Illuminate\Support\Collection;
 
 /**
  * Class Search

diff --git a/src/Endpoints/Users.php b/src/Endpoints/Users.php
@@ -2,10 +2,10 @@
 
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
+use FiveamCode\LaravelNotionApi\Entities\Collections\UserCollection;
 use FiveamCode\LaravelNotionApi\Entities\User;
-use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Entities\Collections\UserCollection;
+use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
 
 /**
  * Class Users

diff --git a/src/Entities/Blocks/BaseFileBlock.php b/src/Entities/Blocks/BaseFileBlock.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\Blocks;
+
+use FiveamCode\LaravelNotionApi\Entities\Contracts\Modifiable;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
+
+/**
+ * Class TextBlock
+ * @package FiveamCode\LaravelNotionApi\Entities\Blocks
+ */
+class BaseFileBlock extends Block implements Modifiable
+{
+    protected static final function createFileBlock(BaseFileBlock $fileBlock, string $url, string $caption = ""): BaseFileBlock
+    {
+        $fileBlock->rawContent = [
+            'type' => 'external',
+            'caption' => [
+                [
+                    'type' => 'text',
+                    'text' => [
+                        'content' => $caption
+                    ]
+                ]
+            ],
+            'external' => [
+                'url' => $url,
+            ]
+        ];
+
+        $fileBlock->fillContent();
+
+        return $fileBlock;
+    }
+
+    private string $hostingType = "";
+    private string $url = "";
+    private RichText $caption;
+
+
+    /**
+     *
+     */
+    protected function fillFromRaw(): void
+    {
+        parent::fillFromRaw();
+        $this->fillContent();
+    }
+
+    /**
+     *
+     */
+    protected function fillContent(): void
+    {
+        $this->hostingType = $this->rawContent['type'];
+        $this->url = $this->rawContent[$this->hostingType]['url'];
+        $this->caption = new RichText($this->rawContent['caption']);
+        $this->content = $this->url;
+    }
+
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+    public function getHostingType()
+    {
+        return $this->hostingType;
+    }
+
+    public function getCaption()
+    {
+        return $this->caption;
+    }
+}
diff --git a/src/Entities/Blocks/Block.php b/src/Entities/Blocks/Block.php
@@ -3,9 +3,9 @@
 namespace FiveamCode\LaravelNotionApi\Entities\Blocks;
 
 use DateTime;
-use Illuminate\Support\Arr;
 use FiveamCode\LaravelNotionApi\Entities\Entity;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use Illuminate\Support\Arr;
 
 /**
  * Class Block
@@ -69,7 +69,7 @@ protected function fillFromRaw(): void
     {
         $this->fillId();
         $this->fillType();
-        $this->fillContent();
+        $this->fillRawContent();
         $this->fillHasChildren();
         $this->fillCreatedTime();
         $this->fillLastEditedTime();
@@ -88,7 +88,7 @@ private function fillType(): void
     /**
      *
      */
-    private function fillContent(): void
+    private function fillRawContent(): void
     {
         if (Arr::exists($this->responseData, $this->getType())) {
             $this->rawContent = $this->responseData[$this->getType()];
@@ -146,7 +146,7 @@ public function getLastEditedTime(): DateTime
     }
 
     /**
-     * 
+     *
      */
     public function getContent()
     {
@@ -156,11 +156,16 @@ public function getContent()
     /**
      * @return string
      */
-    public function asText() : string
+    public function asText(): string
     {
         return $this->text;
     }
 
+    public function setContent($content)
+    {
+        $this->content = $content;
+    }
+
     /**
      * @param $rawContent
      * @return Block
@@ -173,6 +178,7 @@ public static function fromResponse($rawContent): Block
         return $block;
     }
 
+
     /**
      * Maps the type of a block to the corresponding package class by converting the type name.
      *
@@ -189,6 +195,11 @@ private static function mapTypeToClass(string $type): string
             case 'paragraph':
             case 'to_do':
             case 'toggle':
+            case 'embed':
+            case 'image':
+            case 'video':
+            case 'file':
+            case 'pdf':
                 $class = str_replace('_', '', ucwords($type, '_'));
                 return "FiveamCode\\LaravelNotionApi\\Entities\\Blocks\\" . $class;
             case 'heading_1':

diff --git a/src/Entities/Blocks/BulletedListItem.php b/src/Entities/Blocks/BulletedListItem.php
@@ -2,15 +2,22 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities\Blocks;
 
-use DateTime;
-use Illuminate\Support\Arr;
-use FiveamCode\LaravelNotionApi\Entities\Entity;
-use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-
 /**
  * Class BulletedListItem
  * @package FiveamCode\LaravelNotionApi\Entities\Blocks
  */
 class BulletedListItem extends TextBlock
 {
+    public static function create(array|string $textContent): BulletedListItem
+    {
+        $bulletedListItem = new BulletedListItem();
+        TextBlock::createTextBlock($bulletedListItem, $textContent);
+        return $bulletedListItem;
+    }
+
+    function __construct(array $responseData = null)
+    {
+        $this->type = "bulleted_list_item";
+        parent::__construct($responseData);
+    }
 }