polish notion model creation and usage

Author: johguentner

src/Console/Commands/MakeNotionModel.php

@@ -21,7 +21,7 @@ class MakeNotionModel extends Command
      *
      * @var string
      */
-    protected $description = 'Make Notion Model';
+    protected $description = 'Make Notion Model based on a provided {database_id}';
 
     /**
      * Execute the console command.
@@ -59,6 +59,9 @@ public function handle()
             $propName = Str::slug($propertyInfo->getTitle(), '_');
             $phpDocsProperties .= " * @property {$propType} \${$propName} $notionPropType \n";
             $visibleArray .= "        '$propName',\n";
+            $propertyTypeMape .= "        '$propName' => '$notionPropType',\n";
+            $propertyTitleMap .= "        '$propName' => '{$propertyInfo->getTitle()}',\n";
+            
         }
 
         $contents = "<?php
@@ -79,10 +82,12 @@ class {$databaseName} extends NotionModel
     public static \$visible = [
 $visibleArray    ];
 
-    /**
-     * @var {$databaseName}Properties
-     */
-    public static \$props;
+    public static \$propertyTypeMap = [
+$propertyTypeMape    ];
+    
+    public static \$propertyTitleMap = [
+$propertyTitleMap    ];
+
 }
 
 ";

src/Models/NotionModel.php

@@ -41,8 +41,6 @@ class NotionModel
      */
     public static $convertPropsToText = false;
 
-    public $props;
-
     public Page $page;
 
     public function __construct($databaseId = null)
@@ -52,6 +50,11 @@ public function __construct($databaseId = null)
         }
     }
 
+    public function getPage(): Page
+    {
+        return $this->page;
+    }
+
     public static function createInstance()
     {
         return new static();
@@ -77,13 +80,22 @@ public static function notionInstance(): Notion
     }
 
     /**
-     * @return NotionModel
+     * @return NotionQueryBuilder
      */
     public static function query(): NotionQueryBuilder
     {
         return new NotionQueryBuilder(static::class);
     }
 
+
+    /**
+     * @return NotionQueryBuilder
+     */
+    public static function where($property, $operator, $value = null)
+    {
+        return static::query()->where($property, $operator, $value);
+    }
+
     /**
      * @return void
      */

src/Models/NotionQueryBuilder.php

@@ -40,7 +40,7 @@ public function pluck($value, $key = null): Collection
     {
         $pageCollection = $this->internalQuery();
 
-        return $pageCollection->pluck('props.'.$value, $key !== null ? 'props.'.$key : null);
+        return $pageCollection->pluck('props.' . $value, $key !== null ? 'props.' . $key : null);
     }
 
     private function queryToNotion(int $limit = 100): PageCollection
@@ -81,9 +81,8 @@ private function internalQuery(int $limit = 100): Collection
 
         foreach ($queryResponse->asCollection() as $pageItem) {
             $instance = $this->modelClass::createInstance($this->modelClass::$databaseId);
-            // $instance->page = $pageItem;
-
-            // $instance->{'props'} = (object)[];
+            $instance->page = $pageItem;
+            
             foreach ($pageItem->getProperties() as $propertyItem) {
                 $propertyContent = $propertyItem->getContent();
                 if ($this->modelClass::$convertPropsToText || $this->localConvertPropsToText) {
@@ -109,6 +108,14 @@ public function get()
         return $this->internalQuery();
     }
 
+    /**
+     * @return static
+     */
+    public function first()
+    {
+        return $this->get()->first();
+    }
+
     /**
      * @return string
      */
@@ -187,7 +194,7 @@ public function where($property, $operator, $value = null)
             $value = $operator;
             $operator = Operators::EQUALS;
         } else {
-            switch ($operator) {
+            switch (Str::lower($operator)) {
                 case '=':
                     $operator = Operators::EQUALS;
                     break;
@@ -206,6 +213,9 @@ public function where($property, $operator, $value = null)
                 case '>=':
                     $operator = Operators::GREATER_THAN_OR_EQUAL_TO;
                     break;
+                case 'contains':
+                    $operator = Operators::CONTAINS;
+                    break;
             }
         }
 
@@ -258,9 +268,9 @@ private function cacheKey(): string
     {
         $postCacheKey = '';
         if ($this->nextCursor !== null) {
-            $postCacheKey = '-'.$this->nextCursor->__toString();
+            $postCacheKey = '-' . $this->nextCursor->__toString();
         }
 
-        return  $this->modelClass::$preCacheKey.$this->modelClass::$databaseId.$postCacheKey;
+        return  $this->modelClass::$preCacheKey . $this->modelClass::$databaseId . $postCacheKey;
     }
 }