added asJson

mechelon · mechelon · commit 00d7dca277c1 · 2021-05-20T19:57:59.000+02:00
diff --git a/src/Endpoints/Search.php b/src/Endpoints/Search.php
@@ -25,7 +25,7 @@ public function __construct(Notion $notion, string $searchText = "")
         parent::__construct($notion);
     }
 
-    public function query(): Collection
+    public function query(): EntityCollection
     {
         $postData = [];
 
@@ -43,19 +43,15 @@ public function query(): Collection
 
         if ($this->searchText !== null)
             $postData['query'] = $this->searchText;
-
-
-
+        
         $response = $this
             ->post(
                 $this->url(Endpoint::SEARCH),
                 $postData
             )
             ->json();
 
-        $pageCollection = new EntityCollection($response);
-
-        return $pageCollection->getResults();
+        return new EntityCollection($response);
     }
 
     public function sortByLastEditedTime(string $direction = "ascending"): Search
diff --git a/src/Entities/Collections/EntityCollection.php b/src/Entities/Collections/EntityCollection.php
@@ -3,6 +3,7 @@
 namespace FiveamCode\LaravelNotionApi\Entities\Collections;
 
 
+use FiveamCode\LaravelNotionApi\Entities\Entity;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use FiveamCode\LaravelNotionApi\Entities\Page;
@@ -64,8 +65,14 @@ public function getRawResults(): array
         return $this->rawResults;
     }
 
-    public function getResults(): Collection
+    public function getResults(): Collection // toDo: rename asCollection()
     {
         return $this->collection;
     }
+
+    public function asJson(): string {
+        return $this->collection->map(function (Entity $item) {
+            return $item->toArray();
+        });
+    }
 }
diff --git a/src/Entities/Entity.php b/src/Entities/Entity.php
@@ -68,4 +68,8 @@ public function getRaw(): array
     {
         return $this->responseData;
     }
+
+    public function toArray(): array {
+        return get_object_vars($this);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace FiveamCode\LaravelNotionApi\Entities\Collections;`
`4`	`4`
`5`	`5`
	`6`	`+use FiveamCode\LaravelNotionApi\Entities\Entity;`
`6`	`7`	`use Illuminate\Support\Arr;`
`7`	`8`	`use Illuminate\Support\Collection;`
`8`	`9`	`use FiveamCode\LaravelNotionApi\Entities\Page;`
`@@ -64,8 +65,14 @@ public function getRawResults(): array`
`64`	`65`	`return $this->rawResults;`
`65`	`66`	`}`
`66`	`67`
`67`		`- public function getResults(): Collection`
	`68`	`+ public function getResults(): Collection // toDo: rename asCollection()`
`68`	`69`	`{`
`69`	`70`	`return $this->collection;`
`70`	`71`	`}`
	`72`	`+`
	`73`	`+ public function asJson(): string {`
	`74`	`+ return $this->collection->map(function (Entity $item) {`
	`75`	`+ return $item->toArray();`
	`76`	`+ });`
	`77`	`+ }`
`71`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,8 @@ public function getRaw(): array`
`68`	`68`	`{`
`69`	`69`	`return $this->responseData;`
`70`	`70`	`}`
	`71`	`+`
	`72`	`+ public function toArray(): array {`
	`73`	`+ return get_object_vars($this);`
	`74`	`+ }`
`71`	`75`	`}`