Lomkit · rmunate · Sep 9, 2023 · Sep 9, 2023 · Sep 9, 2023 · Sep 10, 2023
diff --git a/config/rest.php b/config/rest.php
@@ -83,40 +83,40 @@
                 'url'         => '/', // Relative to current
                 'description' => 'The current server',
             ],
-            //  [
-            //      'url' => '"https://my-server.com:{port}/{basePath}"',
-            //      'description' => 'Production server',
-            //      'variables' => [
-            //          'port' => [
-            //              'enum' => ['80', '443'],
-            //              'default' => '443'
-            //           ],
-            //           'basePath' => [
-            //              'default' => 'v2',
-            //              'enum' => ['v1', 'v2'],
-            //           ]
-            //       ]
-            //  ]
+            //            [
+            //                'url' => '"https://my-server.com:{port}/{basePath}"',
+            //                'description' => 'Production server',
+            //                'variables' => [
+            //                    'port' => [
+            //                        'enum' => ['80', '443'],
+            //                        'default' => '443'
+            //                    ],
+            //                    'basePath' => [
+            //                        'default' => 'v2',
+            //                        'enum' => ['v1', 'v2'],
+            //                    ]
+            //                ]
+            //            ]
         ],
         // See https://spec.openapis.org/oas/v3.1.0#security-scheme-object
         'security' => [
-            //  [
-            //      'type' => 'http',
-            //      'description' => 'description',
-            //      'scheme' => 'Bearer',
-            //      'bearerFormat' => 'JWT'
-            //  ],
-            //  [
-            //       'type' => 'oauth2',
-            //       'flows' => [
-            //          'authorizationCode' => [
-            //              'scopes' => ['write:pets'],
-            //              'tokenUrl' => 'https://example.com/api/oauth/token',
-            //              'authorizationUrl' => 'https://example.com/api/oauth/dialog',
-            //              'refreshUrl' => 'https://example.com/api/oauth/refresh',
-            //          ]
-            //       ]
-            //  ]
+            //            [
+            //                'type' => 'http',
+            //                'description' => 'description',
+            //                'scheme' => 'Bearer',
+            //                'bearerFormat' => 'JWT'
+            //            ],
+            //            [
+            //                'type' => 'oauth2',
+            //                'flows' => [
+            //                    'authorizationCode' => [
+            //                        'scopes' => ['write:pets'],
+            //                        'tokenUrl' => 'https://example.com/api/oauth/token',
+            //                        'authorizationUrl' => 'https://example.com/api/oauth/dialog',
+            //                        'refreshUrl' => 'https://example.com/api/oauth/refresh',
+            //                    ]
+            //                ]
+            //            ]
         ],
     ],
 ];
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
@@ -1,22 +1,25 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="description" content="SwaggerUI" />
     <title>SwaggerUI</title>
     <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist@5.4.2/swagger-ui.css" />
 </head>
+
 <body>
     <div id="swagger-ui"></div>
     <script src="https://unpkg.com/swagger-ui-dist@5.4.2/swagger-ui-bundle.js" crossorigin></script>
     <script>
         window.onload = () => {
-            window.ui = SwaggerUIBundle({
-                url: '/vendor/rest/openapi.json',
-                dom_id: '#swagger-ui',
-            });
-        };
+        window.ui = SwaggerUIBundle({
+            url: '/vendor/rest/openapi.json',
+            dom_id: '#swagger-ui',
+        });
+    };
     </script>
 </body>
+
 </html>
diff --git a/src/Concerns/Authorizable.php b/src/Concerns/Authorizable.php
@@ -33,10 +33,6 @@ public function authorizeTo($ability, $model)
      */
     public function authorizedTo($ability, $model)
     {
-        if ($this->isAuthorizingEnabled()) {
-            return Gate::check($ability, $model);
-        }
-
-        return true;
+        return ($this->isAuthorizingEnabled()) ? Gate::check($ability, $model) : true;
     }
 }
diff --git a/src/Concerns/PerformsRestOperations.php b/src/Concerns/PerformsRestOperations.php
@@ -3,6 +3,7 @@
 namespace Lomkit\Rest\Concerns;
 
 use Illuminate\Support\Facades\DB;
+use Lomkit\Rest\Actions\Action;
 use Lomkit\Rest\Contracts\QueryBuilder;
 use Lomkit\Rest\Http\Requests\DestroyRequest;
 use Lomkit\Rest\Http\Requests\DetailRequest;
@@ -66,15 +67,21 @@ public function mutate(MutateRequest $request)
 
         DB::beginTransaction();
 
-        $operations = app()->make(QueryBuilder::class, ['resource' => $resource, 'query' => null])
-            ->tap(function ($query) use ($request) {
-                self::newResource()->mutateQuery($request, $query->toBase());
-            })
-            ->mutate($request->all());
+        try {
+            $operations = app()->make(QueryBuilder::class, ['resource' => $resource, 'query' => null])
+                ->tap(function ($query) use ($request) {
+                    self::newResource()->mutateQuery($request, $query->toBase());
+                })
+                ->mutate($request->all());
 
-        DB::commit();
+            DB::commit();
 
-        return $operations;
+            return $operations;
+        } catch (\Throwable $th) {
+            DB::rollBack();
+
+            throw new \Exception($th->getMessage(), 500);
+        }
     }
 
     /**

diff --git a/src/Console/Commands/DocumentationCommand.php b/src/Console/Commands/DocumentationCommand.php
@@ -54,7 +54,7 @@ public function handle()
      */
     protected function getPath($name)
     {
-        return !is_null($this->option('path')) ? $this->option('path').'/'.$name.'.json' : public_path('vendor/rest/'.$name.'.json');
+        return $this->hasOption('path') ? $this->option('path').'/'.$name.'.json' : public_path('vendor/rest/'.$name.'.json');
     }
 
     /**

diff --git a/src/Console/stubs/action.stub b/src/Console/stubs/action.stub
@@ -34,4 +34,4 @@ class {{ class }} extends RestAction
             ]
         ];
     }
-}
+}
diff --git a/src/Console/stubs/instruction.stub b/src/Console/stubs/instruction.stub
@@ -32,4 +32,4 @@ class {{ class }} extends RestInstruction
             ]
         ];
     }
-}
+}
diff --git a/src/Http/Requests/SearchRequest.php b/src/Http/Requests/SearchRequest.php
@@ -58,7 +58,6 @@ public function searchRules(Resource $resource, $prefix = '', $isRootSearchRules
         );
     }
 
-    // @TODO: For now it's prohibited to have more than one nested depth, is this needed ?
     /**
      * Define the validation rules for filters within the search request.
      *
@@ -68,6 +67,7 @@ public function searchRules(Resource $resource, $prefix = '', $isRootSearchRules
      *
      * @return array
      */
+    // @TODO: For now it's prohibited to have more than one nested depth, is this needed ?
     public function filtersRules(Resource $resource, string $prefix, $isMaxDepth = false)
     {
         $rules = array_merge(

diff --git a/src/Query/Traits/PerformSearch.php b/src/Query/Traits/PerformSearch.php
@@ -165,7 +165,7 @@ public function applyScopes($scopes)
      */
     public function instruction($name, $fields = [])
     {
-        $this->resource->instruction(app(RestRequest::class), $name)
+        return $this->resource->instruction(app(RestRequest::class), $name)
             ->handle(
                 collect($fields)->mapWithKeys(function ($field) {return [$field['name'] => $field['value']]; })->toArray(),
                 $this->queryBuilder

diff --git a/src/Relations/BelongsToMany.php b/src/Relations/BelongsToMany.php
@@ -16,7 +16,7 @@ class BelongsToMany extends Relation implements RelationResource
     use HasMultipleResults;
 
     /**
-     * Define validation rules for the BelongsToMany relation.
+     * Define validation rules for the MorphTo relation.
      *
      * @param resource $resource The resource associated with the relation.
      * @param string   $prefix   The prefix used for validation rules.
@@ -37,7 +37,7 @@ public function rules(Resource $resource, string $prefix)
     }
 
     /**
-     * Perform actions after mutating the BelongsToMany relation.
+     * Perform actions after mutating the MorphTo relation.
      *
      * @param Model    $model             The Eloquent model.
      * @param Relation $relation          The relation being mutated.

diff --git a/src/Relations/HasMany.php b/src/Relations/HasMany.php
@@ -12,7 +12,7 @@ class HasMany extends Relation implements RelationResource
     use HasMultipleResults;
 
     /**
-     * Perform actions after mutating the HasMany relation.
+     * Perform actions after mutating the MorphTo relation.
      *
      * @param Model    $model             The Eloquent model.
      * @param Relation $relation          The relation being mutated.

diff --git a/src/Relations/HasManyThrough.php b/src/Relations/HasManyThrough.php
@@ -12,7 +12,7 @@ class HasManyThrough extends Relation implements RelationResource
     use HasMultipleResults;
 
     /**
-     * Perform actions after mutating the HasManyThrough relation.
+     * Perform actions after mutating the MorphTo relation.
      *
      * @param Model    $model             The Eloquent model.
      * @param Relation $relation          The relation being mutated.
@@ -24,7 +24,7 @@ public function afterMutating(Model $model, Relation $relation, array $mutationR
     }
 
     /**
-     * Define validation rules for the HasManyThrough relation.
+     * Define validation rules for the MorphTo relation.
      *
      * @param resource $resource The resource associated with the relation.
      * @param string   $prefix   The prefix used for validation rules.

diff --git a/src/Relations/HasOne.php b/src/Relations/HasOne.php
@@ -9,7 +9,7 @@
 class HasOne extends Relation implements RelationResource
 {
     /**
-     * Perform actions after mutating the HasOne relation.
+     * Perform actions after mutating the MorphTo relation.
      *
      * @param Model    $model             The Eloquent model.
      * @param Relation $relation          The relation being mutated.

diff --git a/src/Relations/HasOneOfMany.php b/src/Relations/HasOneOfMany.php
@@ -9,7 +9,7 @@
 class HasOneOfMany extends Relation implements RelationResource
 {
     /**
-     * Perform actions after mutating the HasOneOfMany relation.
+     * Perform actions after mutating the MorphTo relation.
      *
      * @param Model    $model             The Eloquent model.
      * @param Relation $relation          The relation being mutated.

diff --git a/src/Relations/HasOneThrough.php b/src/Relations/HasOneThrough.php
@@ -9,7 +9,7 @@
 class HasOneThrough extends Relation implements RelationResource
 {
     /**
-     * Perform actions after mutating the HasOneThrough relation.
+     * Perform actions after mutating the MorphTo relation.
      *
      * @param Model    $model             The Eloquent model.
      * @param Relation $relation          The relation being mutated.
@@ -21,7 +21,7 @@ public function afterMutating(Model $model, Relation $relation, array $mutationR
     }
 
     /**
-     * Define validation rules for the HasOneThrough relation.
+     * Define validation rules for the MorphTo relation.
      *
      * @param resource $resource The resource associated with the relation.
      * @param string   $prefix   The prefix used for validation rules.

diff --git a/src/Relations/MorphMany.php b/src/Relations/MorphMany.php
@@ -12,7 +12,7 @@ class MorphMany extends MorphRelation implements RelationResource
     use HasMultipleResults;
 
     /**
-     * Handle actions after mutating a MorphMany relation.
+     * Handle actions after mutating a MorphOne relation.
      *
      * @param Model    $model             The Eloquent model.
      * @param Relation $relation          The relation being mutated.

diff --git a/src/Relations/MorphedByMany.php b/src/Relations/MorphedByMany.php
@@ -16,7 +16,7 @@ class MorphedByMany extends MorphRelation implements RelationResource
     use HasMultipleResults;
 
     /**
-     * Define validation rules for the MorphedByMany relation.
+     * Define validation rules for the MorphTo relation.
      *
      * @param resource $resource The resource associated with the relation.
      * @param string   $prefix   The prefix used for validation rules.
@@ -37,7 +37,7 @@ public function rules(Resource $resource, string $prefix)
     }
 
     /**
-     * Handle actions after mutating a MorphedByMany relation.
+     * Handle actions after mutating a MorphOne relation.
      *
      * @param Model    $model             The Eloquent model.
      * @param Relation $relation          The relation being mutated.

diff --git a/src/Rules/RequiredRelationOnCreation.php b/src/Rules/RequiredRelationOnCreation.php
@@ -60,6 +60,18 @@ public function resource($resource)
         return $this;
     }
 
+    /**
+     * Determine if the rule is required for the given operation.
+     *
+     * @param string $operation
+     *
+     * @return bool
+     */
+    protected function isOperationRequired(string $operation)
+    {
+        return in_array($operation, ['create']);
+    }
+
     /**
      * Validate the attribute.
      *
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ public function handle() @@
          */
         protected function getPath($name)
         {
-            return !is_null($this->option('path')) ? $this->option('path').'/'.$name.'.json' : public_path('vendor/rest/'.$name.'.json');
+            return $this->hasOption('path') ? $this->option('path').'/'.$name.'.json' : public_path('vendor/rest/'.$name.'.json');
         }
         /**
@@ Expand Down @@