Merge branch 'feature/db-query' of https://github.com/5am-code/laravel-notion-api into feature/db-query

johguentner · johguentner · commit 64d08c7a0b09 · 2021-05-14T22:25:53.000+02:00
diff --git a/src/Query/Filter.php b/src/Query/Filter.php
@@ -5,6 +5,14 @@
 class Filter extends QueryHelper
 {
 
+    public function __construct(string $property )
+    {
+        parent::__construct();
+
+        $this->property = $property;
+
+
+    }
 
 
 }
diff --git a/src/Query/QueryHelper.php b/src/Query/QueryHelper.php
@@ -29,10 +29,20 @@ class QueryHelper
      */
     protected Collection $validDirections;
 
+    /**
+     * Contains all valid/implemented filter types.
+     *
+     * @see https://developers.notion.com/reference/post-database-query#post-database-query-filter
+     * @var Collection
+     */
+    protected Collection $validFilterTypes;
+
 
     public function __construct()
     {
         $this->validTimestamps = collect(["created_time", "last_edited_time"]);
         $this->validDirections = collect(["ascending", "descending"]);
+
+
     }
 }
diff --git a/src/Query/Sorting.php b/src/Query/Sorting.php
@@ -31,14 +31,14 @@ public function __construct(string $direction, string $property = null, string $
         $this->direction = $direction;
     }
 
-    public static function timestampSort(string $timestampToSort, string $direction)
+    public static function timestampSort(string $timestampToSort, string $direction): Sorting
     {
         $propertySort = new Sorting($direction, null, $timestampToSort);
 
         return $propertySort;
     }
 
-    public static function propertySort(string $property, string $direction)
+    public static function propertySort(string $property, string $direction): Sorting
     {
         $propertySort = new Sorting($direction, $property);
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,14 @@`
`5`	`5`	`class Filter extends QueryHelper`
`6`	`6`	`{`
`7`	`7`
	`8`	`+ public function __construct(string $property )`
	`9`	`+ {`
	`10`	`+ parent::__construct();`
	`11`	`+`
	`12`	`+ $this->property = $property;`
	`13`	`+`
	`14`	`+`
	`15`	`+ }`
`8`	`16`
`9`	`17`
`10`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,20 @@ class QueryHelper`
`29`	`29`	`*/`
`30`	`30`	`protected Collection $validDirections;`
`31`	`31`
	`32`	`+ /**`
	`33`	`+ * Contains all valid/implemented filter types.`
	`34`	`+ *`
	`35`	`+ * @see https://developers.notion.com/reference/post-database-query#post-database-query-filter`
	`36`	`+ * @var Collection`
	`37`	`+ */`
	`38`	`+ protected Collection $validFilterTypes;`
	`39`	`+`
`32`	`40`
`33`	`41`	`public function __construct()`
`34`	`42`	`{`
`35`	`43`	`$this->validTimestamps = collect(["created_time", "last_edited_time"]);`
`36`	`44`	`$this->validDirections = collect(["ascending", "descending"]);`
	`45`	`+`
	`46`	`+`
`37`	`47`	`}`
`38`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,14 @@ public function __construct(string $direction, string $property = null, string $`
`31`	`31`	`$this->direction = $direction;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public static function timestampSort(string $timestampToSort, string $direction)`
	`34`	`+ public static function timestampSort(string $timestampToSort, string $direction): Sorting`
`35`	`35`	`{`
`36`	`36`	`$propertySort = new Sorting($direction, null, $timestampToSort);`
`37`	`37`
`38`	`38`	`return $propertySort;`
`39`	`39`	`}`
`40`	`40`
`41`		`- public static function propertySort(string $property, string $direction)`
	`41`	`+ public static function propertySort(string $property, string $direction): Sorting`
`42`	`42`	`{`
`43`	`43`	`$propertySort = new Sorting($direction, $property);`
`44`	`44`