♻️ better validation errors

Author: GautierDele

src/Concerns/PerformsQueries.php

@@ -9,13 +9,13 @@
 trait PerformsQueries
 {
     /**
-     * Build a query for searching resource.
+     * Build a "search" query for fetching resource.
      *
      * @param  \Lomkit\Rest\Http\Requests\RestRequest  $request
      * @param  \Illuminate\Contracts\Database\Eloquent\Builder  $query
      * @return \Illuminate\Contracts\Database\Eloquent\Builder
      */
-    public function searchQuery(RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query) {
+    public function searchQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query) {
         return $query;
     }
 
@@ -26,7 +26,7 @@ public function searchQuery(RestRequest $request, \Illuminate\Contracts\Database
      * @param  \Illuminate\Contracts\Database\Eloquent\Builder  $query
      * @return \Illuminate\Contracts\Database\Eloquent\Builder
      */
-    public function mutateQuery(RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query) {
+    public function mutateQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query) {
         return $query;
     }
 
@@ -37,7 +37,7 @@ public function mutateQuery(RestRequest $request, \Illuminate\Contracts\Database
      * @param  \Illuminate\Contracts\Database\Eloquent\Builder  $query
      * @return \Illuminate\Contracts\Database\Eloquent\Builder
      */
-    public function destroyQuery(RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query)
+    public function destroyQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query)
     {
         return $query;
     }
@@ -49,7 +49,7 @@ public function destroyQuery(RestRequest $request, \Illuminate\Contracts\Databas
      * @param  \Illuminate\Contracts\Database\Eloquent\Builder  $query
      * @return \Illuminate\Contracts\Database\Eloquent\Builder
      */
-    public function restoreQuery(RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query)
+    public function restoreQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query)
     {
         return $query;
     }
@@ -61,7 +61,7 @@ public function restoreQuery(RestRequest $request, \Illuminate\Contracts\Databas
      * @param  \Illuminate\Contracts\Database\Eloquent\Builder  $query
      * @return \Illuminate\Contracts\Database\Eloquent\Builder
      */
-    public function forceDeleteQuery(RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query)
+    public function forceDeleteQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query)
     {
         return $query;
     }

src/Console/stubs/base-resource.stub

@@ -7,13 +7,24 @@ use Lomkit\Rest\Http\Resource as RestResource;
 abstract class Resource extends RestResource
 {
     /**
-     * Build a query for fetching resource.
+     * Build a "search" query for fetching resource.
      *
      * @param  \Lomkit\Rest\Http\Requests\RestRequest  $request
      * @param  \Illuminate\Contracts\Database\Eloquent\Builder  $query
      * @return \Illuminate\Contracts\Database\Eloquent\Builder
      */
-    public function fetchQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query) {
+    public function searchQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query) {
+        return $query;
+    }
+
+    /**
+     * Build a query for mutating resource.
+     *
+     * @param  \Lomkit\Rest\Http\Requests\RestRequest  $request
+     * @param  \Illuminate\Contracts\Database\Eloquent\Builder  $query
+     * @return \Illuminate\Contracts\Database\Eloquent\Builder
+     */
+    public function mutateQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query) {
         return $query;
     }
 

src/Http/Requests/ActionsRequest.php

@@ -18,7 +18,7 @@
 use Lomkit\Rest\Relations\MorphToMany;
 use Lomkit\Rest\Rules\CustomRulable;
 use Lomkit\Rest\Rules\Includable;
-use Lomkit\Rest\Rules\RequiredRelation;
+use Lomkit\Rest\Rules\RequiredRelationOnCreation;
 
 class ActionsRequest extends RestRequest
 {

src/Http/Requests/DetailRequest.php

@@ -22,7 +22,7 @@
 use Lomkit\Rest\Rules\ActionField;
 use Lomkit\Rest\Rules\CustomRulable;
 use Lomkit\Rest\Rules\Includable;
-use Lomkit\Rest\Rules\RequiredRelation;
+use Lomkit\Rest\Rules\RequiredRelationOnCreation;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class DetailRequest extends RestRequest

src/Http/Requests/MutateRequest.php

@@ -18,7 +18,7 @@
 use Lomkit\Rest\Relations\MorphToMany;
 use Lomkit\Rest\Rules\CustomRulable;
 use Lomkit\Rest\Rules\Includable;
-use Lomkit\Rest\Rules\RequiredRelation;
+use Lomkit\Rest\Rules\RequiredRelationOnCreation;
 
 class MutateRequest extends RestRequest
 {

src/Http/Requests/OperateRequest.php

@@ -22,7 +22,7 @@
 use Lomkit\Rest\Rules\ActionField;
 use Lomkit\Rest\Rules\CustomRulable;
 use Lomkit\Rest\Rules\Includable;
-use Lomkit\Rest\Rules\RequiredRelation;
+use Lomkit\Rest\Rules\RequiredRelationOnCreation;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class OperateRequest extends RestRequest

src/Relations/Relation.php

@@ -12,7 +12,7 @@
 use Lomkit\Rest\Http\Resource;
 use Lomkit\Rest\Relations\Traits\Constrained;
 use Lomkit\Rest\Relations\Traits\Mutates;
-use Lomkit\Rest\Rules\RequiredRelation;
+use Lomkit\Rest\Rules\RequiredRelationOnCreation;
 
 class Relation implements \JsonSerializable
 {
@@ -89,11 +89,10 @@ public function rules(Resource $resource, string $prefix) {
         if ($this->isRequiredOnCreation(
             app()->make(RestRequest::class)
         )) {
-            $rules[$prefix] = RequiredRelation::make()->resource($resource);
+            $rules[$prefix] = [RequiredRelationOnCreation::make()->resource($resource)];
         }
 
         if (in_array(HasPivotFields::class, class_uses_recursive($this), true)) {
-
             $pivotPrefix = $prefix;
             if ($this->hasMultipleEntries()) {
                 $pivotPrefix .= '.*';

src/Rules/ActionField.php

@@ -5,6 +5,7 @@
 use Closure;
 use Illuminate\Contracts\Validation\DataAwareRule;
 use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Contracts\Validation\ValidatorAwareRule;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
@@ -13,7 +14,7 @@
 use Lomkit\Rest\Http\Requests\SearchRequest;
 use Lomkit\Rest\Http\Resource;
 
-class ActionField implements Rule, DataAwareRule, ValidatorAwareRule
+class ActionField implements ValidationRule, DataAwareRule, ValidatorAwareRule
 {
 
     use Makeable;
@@ -59,20 +60,6 @@ public function action(\Lomkit\Rest\Actions\Action $action)
         return $this;
     }
 
-    public function passes($attribute, $value)
-    {
-        $validator = Validator::make(
-            $this->data,
-            $this->buildValidationRules($attribute, $value)
-        );
-
-        if ($validator->fails()) {
-            return $this->fail($validator->messages()->all());
-        }
-
-        return true;
-    }
-
     /**
      * Build the array of underlying validation rules based on the current state.
      *
@@ -143,4 +130,14 @@ public function setData($data)
 
         return $this;
     }
+
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        $validator = Validator::make(
+            $this->data,
+            $this->buildValidationRules($attribute, $value)
+        );
+
+        $validator->validate();
+    }
 }

src/Rules/AggregateFilterable.php

@@ -5,14 +5,15 @@
 use Closure;
 use Illuminate\Contracts\Validation\DataAwareRule;
 use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Contracts\Validation\ValidatorAwareRule;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
 use Lomkit\Rest\Concerns\Makeable;
 use Lomkit\Rest\Http\Requests\SearchRequest;
 use Lomkit\Rest\Http\Resource;
 
-class AggregateFilterable implements Rule, DataAwareRule, ValidatorAwareRule
+class AggregateFilterable implements ValidationRule, DataAwareRule, ValidatorAwareRule
 {
 
     use Makeable;
@@ -58,20 +59,6 @@ public function resource($resource)
         return $this;
     }
 
-    public function passes($attribute, $value)
-    {
-        $validator = Validator::make(
-            $this->data,
-            $this->buildValidationRules($attribute, $value)
-        );
-
-        if ($validator->fails()) {
-            return $this->fail($validator->messages()->all());
-        }
-
-        return true;
-    }
-
     /**
      * Build the array of underlying validation rules based on the current state.
      *
@@ -142,4 +129,14 @@ public function setData($data)
 
         return $this;
     }
+
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        $validator = Validator::make(
+            $this->data,
+            $this->buildValidationRules($attribute, $value)
+        );
+
+        $validator->validate();
+    }
 }

src/Rules/CustomRulable.php

@@ -5,6 +5,7 @@
 use Closure;
 use Illuminate\Contracts\Validation\DataAwareRule;
 use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Contracts\Validation\ValidatorAwareRule;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
@@ -13,7 +14,7 @@
 use Lomkit\Rest\Http\Requests\SearchRequest;
 use Lomkit\Rest\Http\Resource;
 
-class CustomRulable implements Rule, DataAwareRule, ValidatorAwareRule
+class CustomRulable implements ValidationRule, DataAwareRule, ValidatorAwareRule
 {
 
     use Makeable;
@@ -59,20 +60,6 @@ public function resource($resource)
         return $this;
     }
 
-    public function passes($attribute, $value)
-    {
-        $validator = Validator::make(
-            $this->data,
-            $this->buildValidationRules($attribute, $value)
-        );
-
-        if ($validator->fails()) {
-            return $this->fail($validator->messages()->all());
-        }
-
-        return true;
-    }
-
     /**
      * Build the array of underlying validation rules based on the current state.
      *
@@ -155,4 +142,14 @@ public function setData($data)
 
         return $this;
     }
+
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        $validator = Validator::make(
+            $this->data,
+            $this->buildValidationRules($attribute, $value)
+        );
+
+        $validator->validate();
+    }
 }