Merge pull request #16 from Lomkit/feature/directives

Feature/instructions

Author: GautierDele

README.md

@@ -88,10 +88,9 @@ TODO
 
 ## Roadmap for the end of bêta (Estimated delivery October 2023)
 
-- Custom directives (Filters / sorting)
 - Automatic documentation with extension possible
+- Refactor actions listing to --> Get resource informations (fields exposed / actions / etc ? regroupe all those possibilities)
 - Alias for includes / aggregates
-- 
 
 ## Roadmap
 

src/Actions/Action.php

@@ -10,14 +10,17 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use Lomkit\Rest\Concerns\Fieldable;
 use Lomkit\Rest\Concerns\Makeable;
 use Lomkit\Rest\Concerns\Metable;
+use Lomkit\Rest\Concerns\Resourcable;
 use Lomkit\Rest\Http\Requests\OperateRequest;
 use Lomkit\Rest\Http\Requests\RestRequest;
+use Lomkit\Rest\Http\Resource;
 
 class Action implements \JsonSerializable
 {
-    use Makeable, Metable, Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Makeable, Metable, Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels, Fieldable, Resourcable;
 
     /**
      * The name of the connection the job should be sent to.
@@ -96,17 +99,6 @@ public function handle(array $fields, \Illuminate\Support\Collection $models)
         //
     }
 
-    /**
-     * Called in an action failed.
-     *
-     * @param  \Lomkit\Rest\Http\Requests\RestRequest $request
-     * @return array
-     */
-    public function fields(\Lomkit\Rest\Http\Requests\RestRequest $request)
-    {
-        return [];
-    }
-
     /**
      * Register callbacks on the pending batch.
      *

src/Actions/Actionable.php

@@ -26,6 +26,7 @@ public function action(RestRequest $request, string $actionKey): Action {
         return collect($this->actions($request))
             ->sole(function (Action $action) use ($actionKey) {
                 return $action->uriKey() === $actionKey;
-            });
+            })
+            ->resource($this);
     }
 }

src/Actions/DispatchAction.php

@@ -152,7 +152,10 @@ public function forModels(Collection $models)
     protected function dispatchSynchronouslyForCollection(Collection $models)
     {
         return DB::transaction(function () use ($models) {
-            return $this->action->handle($this->fields, $models);
+            return $this->action->handle(
+                collect($this->fields)->mapWithKeys(function ($field) {return [ $field['name'] => $field['value']]; })->toArray(),
+                $models
+            );
         });
     }
 

src/Concerns/Fieldable.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Lomkit\Rest\Concerns;
+
+trait Fieldable
+{
+    /**
+     * The fields.
+     *
+     * @param  \Lomkit\Rest\Http\Requests\RestRequest $request
+     * @return array
+     */
+    public function fields(\Lomkit\Rest\Http\Requests\RestRequest $request): array
+    {
+        return [];
+    }
+
+    /**
+     * The fields.
+     *
+     * @param  \Lomkit\Rest\Http\Requests\RestRequest $request
+     * @param  string $name
+     * @return array
+     */
+    public function field(\Lomkit\Rest\Http\Requests\RestRequest $request, string $name)
+    {
+        return collect($this->fields($request))
+            ->first(function ($value, $fieldName) use ($name) { return $fieldName === $name; });
+    }
+}

src/Concerns/Resourcable.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Lomkit\Rest\Concerns;
+
+use Lomkit\Rest\Http\Resource;
+
+trait Resourcable
+{
+    /**
+     * The resource.
+     *
+     * @var Resource
+     */
+    public Resource $resource;
+
+    /**
+     * Set the resource.
+     *
+     * @param  Resource $resource
+     * @return array
+     */
+    public function resource(Resource $resource) {
+        return tap($this, function() use ($resource) {
+            $this->resource = $resource;
+        });
+    }
+}

src/Http/Requests/OperateRequest.php

@@ -19,6 +19,7 @@
 use Lomkit\Rest\Relations\MorphedByMany;
 use Lomkit\Rest\Relations\MorphMany;
 use Lomkit\Rest\Relations\MorphToMany;
+use Lomkit\Rest\Rules\ActionField;
 use Lomkit\Rest\Rules\CustomRulable;
 use Lomkit\Rest\Rules\Includable;
 use Lomkit\Rest\Rules\RequiredRelation;
@@ -42,8 +43,16 @@ public function operateRules(Resource $resource)
         return array_merge(
             app(SearchRequest::class)->searchRules($resource, 'search'),
             [
+                'fields.*.name' => [
+                    Rule::in(array_keys($operatedAction->fields($this)))
+                ],
                 'fields' => [
-                    'array:'.implode(',', array_keys($operatedAction->fields($this)))
+                    'sometimes',
+                    'array'
+                ],
+                'fields.*' => [
+                    ActionField::make()
+                        ->action($operatedAction)
                 ]
             ]
         );

src/Http/Requests/RestRequest.php

@@ -3,23 +3,11 @@
 namespace Lomkit\Rest\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Lomkit\Rest\Concerns\Resourcable;
 use Lomkit\Rest\Http\Requests\Traits\InteractsWithRules;
 use Lomkit\Rest\Http\Resource;
 
 class RestRequest extends FormRequest
 {
-    use InteractsWithRules;
-
-    /**
-     * The resource the request is linked to.
-     *
-     * @var Resource
-     */
-    public Resource $resource;
-
-    public function resource(Resource $resource) {
-        return tap($this, function() use ($resource) {
-            $this->resource = $resource;
-        });
-    }
+    use InteractsWithRules, Resourcable;
 }

src/Http/Requests/SearchRequest.php

@@ -10,6 +10,7 @@
 use Lomkit\Rest\Rules\AggregateField;
 use Lomkit\Rest\Rules\AggregateFilterable;
 use Lomkit\Rest\Rules\Includable;
+use Lomkit\Rest\Rules\Instruction;
 
 class SearchRequest extends RestRequest
 {
@@ -36,6 +37,8 @@ public function searchRules(Resource $resource, $prefix = '', $isRootSearchRules
             $this->selectsRules($resource, $prefix.'selects'),
             [$prefix.'aggregates' => ['sometimes', 'array']],
             $this->aggregatesRules($resource, $prefix.'aggregates'),
+            [$prefix.'instructions' => ['sometimes', 'array']],
+            $this->instructionsRules($resource, $prefix.'instructions'),
             [
                 'limit' => ['sometimes', 'integer', Rule::in($resource->exposedLimits($this))],
                 'page' => ['sometimes', 'integer']
@@ -96,6 +99,30 @@ protected function scopesRules(Resource $resource, string $prefix) {
         return $rules;
     }
 
+    protected function instructionsRules(Resource $resource, string $prefix) {
+        $rules = [
+            $prefix.'.*.name' => [
+                Rule::in(
+                    collect($resource->instructions($this))
+                        ->map(function ($instruction) { return $instruction->uriKey(); })
+                        ->toArray()
+                ),
+                'required',
+                'string'
+            ],
+            $prefix.'.*.fields' => [
+                'sometimes',
+                'array'
+            ],
+            $prefix.'.*' => [
+                Instruction::make()
+                    ->resource($resource)
+            ]
+        ];
+
+        return $rules;
+    }
+
     protected function sortsRules(Resource $resource, string $prefix) {
         $rules = [
             $prefix.'.*.field' => [

src/Http/Resource.php

@@ -12,6 +12,7 @@
 use Lomkit\Rest\Concerns\Resource\Relationable;
 use Lomkit\Rest\Concerns\Resource\Rulable;
 use Lomkit\Rest\Http\Requests\RestRequest;
+use Lomkit\Rest\Instructions\Instructionable;
 
 class Resource
 {
@@ -22,7 +23,8 @@ class Resource
         Rulable,
         ConfiguresRestParameters,
         Authorizable,
-        Actionable;
+        Actionable,
+        Instructionable;
 
     /**
      * The model the entry corresponds to.