Allow condition to be passed to sortable/filterable

Author: tobyzerner

src/Handler/Index.php

@@ -27,6 +27,7 @@
 use Tobyz\JsonApiServer\Schema\HasMany;
 use Tobyz\JsonApiServer\Schema\HasOne;
 use Tobyz\JsonApiServer\Serializer;
+use function Tobyz\JsonApiServer\evaluate;
 use function Tobyz\JsonApiServer\run_callbacks;
 
 class Index implements RequestHandlerInterface
@@ -162,7 +163,7 @@ private function sort($query, Request $request)
             if (
                 isset($fields[$name])
                 && $fields[$name] instanceof Attribute
-                && $fields[$name]->isSortable()
+                && evaluate($fields[$name]->isSortable(), [$request])
             ) {
                 $adapter->sortByAttribute($query, $fields[$name], $direction);
                 continue;
@@ -249,7 +250,7 @@ private function filter($query, Request $request)
                 continue;
             }
 
-            if (isset($fields[$name]) && $fields[$name]->isFilterable()) {
+            if (isset($fields[$name]) && evaluate($fields[$name]->isFilterable(), [$request])) {
                 if ($fields[$name] instanceof Attribute) {
                     $adapter->filterByAttribute($query, $fields[$name], $value);
                 } elseif ($fields[$name] instanceof HasOne) {

src/Schema/Attribute.php

@@ -11,6 +11,8 @@
 
 namespace Tobyz\JsonApiServer\Schema;
 
+use function Tobyz\JsonApiServer\negate;
+
 final class Attribute extends Field
 {
     private $sortable = false;
@@ -23,24 +25,24 @@ public function getLocation(): string
     /**
      * Allow this attribute to be used for sorting the resource listing.
      */
-    public function sortable()
+    public function sortable(callable $condition = null)
     {
-        $this->sortable = true;
+        $this->sortable = $condition ?: true;
 
         return $this;
     }
 
     /**
      * Disallow this attribute to be used for sorting the resource listing.
      */
-    public function notSortable()
+    public function notSortable(callable $condition = null)
     {
-        $this->sortable = false;
+        $this->sortable = $condition ? negate($condition) : false;
 
         return $this;
     }
 
-    public function isSortable(): bool
+    public function isSortable()
     {
         return $this->sortable;
     }

src/Schema/Field.php

@@ -178,19 +178,19 @@ public function validate(callable $callback)
     /**
      * Allow this field to be used for filtering the resource listing.
      */
-    public function filterable()
+    public function filterable(callable $condition = null)
     {
-        $this->filterable = true;
+        $this->filterable = $condition ?: true;
 
         return $this;
     }
 
     /**
      * Disallow this field to be used for filtering the resource listing.
      */
-    public function notFilterable()
+    public function notFilterable(callable $condition = null)
     {
-        $this->filterable = false;
+        $this->filterable = $condition ? negate($condition) : false;
 
         return $this;
     }
@@ -240,7 +240,7 @@ public function getDefaultCallback()
         return $this->defaultCallback;
     }
 
-    public function isFilterable(): bool
+    public function isFilterable()
     {
         return $this->filterable;
     }