v0.8.0 🍉 - Bugfixes, Pagination and General Improvements

src/Endpoints/Database.php

@@ -2,6 +2,7 @@
 
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
+use FiveamCode\LaravelNotionApi\Entities\Collections\EntityCollection;
 use FiveamCode\LaravelNotionApi\Entities\Collections\PageCollection;
 use FiveamCode\LaravelNotionApi\Notion;
 use FiveamCode\LaravelNotionApi\Query\Filters\Filter;
@@ -66,7 +67,7 @@ public function query(): PageCollection
         } // TODO Compound filters!
 
         if ($this->startCursor !== null) {
-            $postData['start_cursor'] = $this->startCursor;
+            $postData['start_cursor'] = $this->startCursor->__toString();
         }
 
         if ($this->pageSize !== null) {
@@ -104,4 +105,15 @@ public function sortBy(Collection $sorts): Database
 
         return $this;
     }
+
+    /**
+     * @param  EntityCollection  $entityCollection
+     * @return $this
+     */
+    public function offsetByResponse(EntityCollection $entityCollection): Database
+    {
+        $this->offset($entityCollection->nextCursor());
+
+        return $this;
+    }
 }

src/Entities/Collections/EntityCollection.php

@@ -7,6 +7,7 @@
 use FiveamCode\LaravelNotionApi\Entities\Page;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
 use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
+use FiveamCode\LaravelNotionApi\Query\StartCursor;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
@@ -25,6 +26,16 @@ class EntityCollection
      */
     protected array $rawResults = [];
 
+    /**
+     * @var bool
+     */
+    protected bool $hasMore = false;
+
+    /**
+     * @var string
+     */
+    protected ?string $nextCursor = null;
+
     /**
      * @var Collection
      */
@@ -96,13 +107,24 @@ protected function collectChildren(): void
     protected function fillFromRaw()
     {
         $this->fillResult();
+        $this->fillCursorInformation();
     }
 
     protected function fillResult()
     {
         $this->rawResults = $this->responseData['results'];
     }
 
+    protected function fillCursorInformation()
+    {
+        if (Arr::exists($this->responseData, 'has_more')) {
+            $this->hasMore = $this->responseData['has_more'];
+        }
+        if (Arr::exists($this->responseData, 'next_cursor')) {
+            $this->nextCursor = $this->responseData['next_cursor'];
+        }
+    }
+
     /**
      * @return array
      */
@@ -111,6 +133,14 @@ public function getRawResponse(): array
         return $this->responseData;
     }
 
+    /**
+     * @return string
+     */
+    public function getRawNextCursor(): ?string
+    {
+        return $this->nextCursor;
+    }
+
     /**
      * @return Collection
      */
@@ -128,4 +158,25 @@ public function asJson(): string
             return $item->toArray();
         });
     }
+
+    /**
+     * @return bool
+     */
+    public function hasMoreEntries(): bool
+    {
+        return $this->hasMore;
+    }
+
+    /**
+     * @return StartCursor
+     */
+    public function nextCursor(): ?StartCursor
+    {
+        $rawNextCursor = $this->getRawNextCursor();
+        if ($rawNextCursor === null) {
+            return null;
+        }
+
+        return new StartCursor($rawNextCursor);
+    }
 }

src/Entities/Page.php

@@ -344,6 +344,19 @@ public function setDate(string $propertyTitle, DateTime $start, ?DateTime $end =
         return $this;
     }
 
+    /**
+     * @param $propertyTitle
+     * @param $start
+     * @param $end
+     * @return Page
+     */
+    public function setDateTime(string $propertyTitle, DateTime $start, ?DateTime $end = null): Page
+    {
+        $this->set($propertyTitle, Date::valueWithTime($start, $end));
+
+        return $this;
+    }
+
     /**
      * @param $propertyTitle
      * @param $relationIds

src/Entities/Properties/Date.php

@@ -6,6 +6,7 @@
 use FiveamCode\LaravelNotionApi\Entities\Contracts\Modifiable;
 use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichDate;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+use Illuminate\Support\Arr;
 
 /**
  * Class Date.
@@ -26,6 +27,39 @@ public static function value(?DateTime $start, ?DateTime $end = null): Date
         $dateProperty = new Date();
         $dateProperty->content = $richDate;
 
+        if ($richDate->isRange()) {
+            $dateProperty->rawContent = [
+                'date' => [
+                    'start' => $start->format('Y-m-d'),
+                    'end' => $end->format('Y-m-d'),
+                ],
+            ];
+        } else {
+            $dateProperty->rawContent = [
+                'date' => [
+                    'start' => $start->format('Y-m-d'),
+                ],
+            ];
+        }
+
+        return $dateProperty;
+    }
+
+    /**
+     * @param $start
+     * @param $end
+     * @return Date
+     */
+    public static function valueWithTime(?DateTime $start, ?DateTime $end = null): Date
+    {
+        $richDate = new RichDate();
+        $richDate->setStart($start);
+        $richDate->setEnd($end);
+        $richDate->setHasTime(true);
+
+        $dateProperty = new Date();
+        $dateProperty->content = $richDate;
+
         if ($richDate->isRange()) {
             $dateProperty->rawContent = [
                 'date' => [
@@ -57,19 +91,26 @@ protected function fillDate(): void
     {
         $richDate = new RichDate();
 
-        if (isset($this->rawContent['start'])) {
+        if (Arr::exists($this->rawContent, 'start')) {
             $startAsIsoString = $this->rawContent['start'];
             $richDate->setStart(new DateTime($startAsIsoString));
+            $richDate->setHasTime($this->isIsoTimeString($startAsIsoString));
         }
 
-        if (isset($this->rawContent['end'])) {
+        if (Arr::exists($this->rawContent, 'end')) {
             $endAsIsoString = $this->rawContent['end'];
             $richDate->setEnd(new DateTime($endAsIsoString));
         }
 
         $this->content = $richDate;
     }
 
+    // function for checking if ISO datetime string includes time or not
+    private function isIsoTimeString(string $isoTimeDateString): bool
+    {
+        return strpos($isoTimeDateString, 'T') !== false;
+    }
+
     /**
      * @return RichDate
      */
@@ -95,10 +136,18 @@ public function getStart(): DateTime
     }
 
     /**
-     * @return DateTime
+     * @return ?DateTime
      */
-    public function getEnd(): DateTime
+    public function getEnd(): ?DateTime
     {
         return $this->getContent()->getEnd();
     }
+
+    /**
+     * @return bool
+     */
+    public function hasTime(): bool
+    {
+        return $this->getContent()->hasTime();
+    }
 }

src/Entities/Properties/Rollup.php

@@ -37,7 +37,7 @@ protected function fillFromRaw(): void
                     break;
                 default:
                     throw new HandlingException("Unexpected rollupType {$this->rollupType}");
-        }
+            }
         }
     }
 
@@ -89,12 +89,21 @@ private function setRollupContentArray()
             // TODO
             $rollupPropertyItem['id'] = 'undefined';
 
-            $this->content->add(
-                Property::fromResponse('', $rollupPropertyItem)
-            );
+            if ($this->isRollupPropertyContentSet($rollupPropertyItem)) {
+                $this->content->add(
+                    Property::fromResponse('', $rollupPropertyItem)
+                );
+            }
         }
     }
 
+    private function isRollupPropertyContentSet($rollupPropertyItem): bool
+    {
+        return Arr::exists($rollupPropertyItem, 'type')
+            && Arr::exists($rollupPropertyItem, $rollupPropertyItem['type'])
+            && ! is_null($rollupPropertyItem[$rollupPropertyItem['type']]);
+    }
+
     private function setRollupContentDate()
     {
         $this->content = new RichDate();

src/Entities/PropertyItems/RichDate.php

@@ -11,11 +11,9 @@
  */
 class RichDate extends Entity
 {
-    /**
-     * @var string
-     */
     protected DateTime $start;
     protected ?DateTime $end = null;
+    protected bool $hasTime = false;
 
     /**
      * @param  array  $responseData
@@ -63,13 +61,21 @@ public function getStart(): ?DateTime
     }
 
     /**
-     * @return DateTime
+     * @return ?DateTime
      */
     public function getEnd(): ?DateTime
     {
         return $this->end;
     }
 
+    /**
+     * @return bool
+     */
+    public function hasTime(): bool
+    {
+        return $this->hasTime;
+    }
+
     public function setStart($start): void
     {
         $this->start = $start;
@@ -79,4 +85,9 @@ public function setEnd($end): void
     {
         $this->end = $end;
     }
+
+    public function setHasTime($hasTime): void
+    {
+        $this->hasTime = $hasTime;
+    }
 }

src/Query/StartCursor.php

@@ -22,7 +22,7 @@ public function __construct(string $cursor)
         $this->cursor = $cursor;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return $this->cursor;
     }