renamed / condensed collect methods

mechelon · mechelon · commit a58b9051bbf3 · 2021-05-23T14:21:03.000+02:00
diff --git a/src/Endpoints/Block.php b/src/Endpoints/Block.php
@@ -25,17 +25,10 @@ public function __construct(Notion $notion, string $blockId)
      * @return BlockCollection
      */
     public function children(): BlockCollection
-    {
-        return $this->collectChildren();
-    }
-
-    private function collectChildren(): BlockCollection
     {
         $response = $this->get(
             $this->url(Endpoint::BLOCKS . "/" . $this->blockId . "/children" . "?{$this->buildPaginationQuery()}")
         );
-        if (!$response->ok())
-            throw HandlingException::instance("Block not found.", ["blockId" => $this->blockId]);
 
         return new BlockCollection($response->json());
     }
diff --git a/src/Endpoints/Databases.php b/src/Endpoints/Databases.php
@@ -28,13 +28,6 @@ class Databases extends Endpoint implements EndpointInterface
      * @return DatabaseCollection
      */
     public function all(): DatabaseCollection
-    {
-        return $this->collect();
-    }
-
-
-    // TODO rename this function - receive, access, fetch?
-    private function collect(): DatabaseCollection
     {
         $resultData = $this->getJson($this->url(Endpoint::DATABASES) . "?{$this->buildPaginationQuery()}");
         return new DatabaseCollection($resultData);
diff --git a/src/Endpoints/Users.php b/src/Endpoints/Users.php
@@ -21,14 +21,10 @@ class Users extends Endpoint implements EndpointInterface
      */
     public function all(): UserCollection
     {
-        return $this->collect();
-    }
-
-    private function collect(): UserCollection{
         $result = $this->get(
             $this->url(Endpoint::USERS . "?{$this->buildPaginationQuery()}")
         );
-
+        
         return new UserCollection($result->json());
     }
 
diff --git a/src/Entities/Collections/EntityCollection.php b/src/Entities/Collections/EntityCollection.php
@@ -55,16 +55,11 @@ protected function fillResult()
     }
 
 
-    public function getRaw(): array
+    public function getRawResponse(): array
     {
         return $this->responseData;
     }
 
-    public function asRaw(): array
-    {
-        return $this->rawResults;
-    }
-
     public function asCollection(): Collection
     {
         return $this->collection;

Original file line number	Diff line number	Diff line change
`@@ -55,16 +55,11 @@ protected function fillResult()`
`55`	`55`	`}`
`56`	`56`
`57`	`57`
`58`		`- public function getRaw(): array`
	`58`	`+ public function getRawResponse(): array`
`59`	`59`	`{`
`60`	`60`	`return $this->responseData;`
`61`	`61`	`}`
`62`	`62`
`63`		`- public function asRaw(): array`
`64`		`- {`
`65`		`- return $this->rawResults;`
`66`		`- }`
`67`		`-`
`68`	`63`	`public function asCollection(): Collection`
`69`	`64`	`{`
`70`	`65`	`return $this->collection;`