Field and JSON:API support

routes/api.php

@@ -1,3 +1,7 @@
 <?php
 
 Route::get('/{repository}', 'RepositoryIndexController@handle');
+Route::post('/{repository}', 'RepositoryStoreController@handle');
+Route::get('/{repository}/{repositoryId}', 'RepositoryShowController@handle');
+Route::patch('/{repository}/{repositoryId}', 'RepositoryUpdateController@handle');
+Route::delete('/{repository}/{repositoryId}', 'RepositoryDestroyController@handle');

src/Commands/CheckPassport.php

@@ -62,15 +62,15 @@ public function handle()
     {
         $userClass = $this->config->get('auth.providers.users.model');
 
-        if (false === $this->provider()) {
+        if (false === $this->hasProvider()) {
             return;
         }
 
-        if (false === $this->passportable($userClass)) {
+        if (false === $this->isPassportable($userClass)) {
             return;
         }
 
-        if (false === $this->passportClient()) {
+        if (false === $this->hasPassportClient()) {
             return;
         }
 
@@ -87,7 +87,7 @@ public function handle()
      * @param $userClass
      * @return bool
      */
-    public function passportable($userClass = null): bool
+    public function isPassportable($userClass = null): bool
     {
         try {
             $userInstance = $this->container->get($userClass);
@@ -116,7 +116,7 @@ public function passportable($userClass = null): bool
     /**
      * @return bool
      */
-    public function provider(): bool
+    public function hasProvider(): bool
     {
         $provider = $this->app->getProviders('Laravel\\Passport\\PassportServiceProvider');
 
@@ -132,7 +132,7 @@ public function provider(): bool
     /**
      * @return bool
      */
-    public function passportClient(): bool
+    public function hasPassportClient(): bool
     {
         try {
             /**

src/Commands/stubs/RestifyServiceProvider.stub

@@ -4,6 +4,7 @@ namespace App\Providers;
 
 use Illuminate\Support\Facades\Gate;
 use Binaryk\LaravelRestify\Restify;
+use Illuminate\Http\Resources\Json\Resource;
 use Binaryk\LaravelRestify\RestifyApplicationServiceProvider;
 
 class RestifyServiceProvider extends RestifyApplicationServiceProvider
@@ -16,6 +17,8 @@ class RestifyServiceProvider extends RestifyApplicationServiceProvider
     public function boot()
     {
         parent::boot();
+
+        Resource::withoutWrapping();
     }
 
     /**

src/Commands/stubs/repository.stub

@@ -2,8 +2,10 @@
 
 namespace DummyNamespace;
 
-use Illuminate\Http\Request;
+use Binaryk\LaravelRestify\Fields\Field;
+use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\Repositories\Repository;
+use Illuminate\Contracts\Pagination\Paginator;
 
 class DummyClass extends Repository
 {
@@ -13,4 +15,67 @@ class DummyClass extends Repository
      * @var string
      */
     public static $model = 'DummyFullModel';
+
+    /**
+     * @param  RestifyRequest  $request
+     * @return array
+     */
+    public function fields(RestifyRequest $request)
+    {
+        return [
+          //  Field::make('title')->storingRules('required')->messages([
+          //      'required' => 'This field is required bro.',
+          //  ]),
+        ];
+
+    }
+
+    /**
+     * @param  RestifyRequest  $request
+     * @param  Paginator  $paginated
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function index(RestifyRequest $request, Paginator $paginated)
+    {
+        return parent::index($request, $paginated);
+    }
+
+    /**
+     * @param  RestifyRequest  $request
+     * @return \Illuminate\Http\JsonResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     * @throws \Throwable
+     */
+    public function show(RestifyRequest $request)
+    {
+        return parent::show($request);
+    }
+
+    /**
+     * @param  RestifyRequest  $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function store(RestifyRequest $request)
+    {
+        return parent::store($request);
+    }
+
+    /**
+     * @param  RestifyRequest  $request
+     * @param $model
+     * @return \Illuminate\Http\JsonResponse|void
+     */
+    public function update(RestifyRequest $request, $model)
+    {
+        return parent::update($request, $model);
+    }
+
+    /**
+     * @param  RestifyRequest  $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function destroy(RestifyRequest $request)
+    {
+        return parent::destroy($request);
+    }
 }

src/Contracts/RestifySearchable.php

@@ -2,8 +2,6 @@
 
 namespace Binaryk\LaravelRestify\Contracts;
 
-use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
-
 /**
  * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
  */
@@ -15,13 +13,6 @@ interface RestifySearchable
     const MATCH_BOOL = 'bool';
     const MATCH_INTEGER = 'integer';
 
-    /**
-     * @param  RestifyRequest  $request
-     * @param  array  $fields
-     * @return array
-     */
-    public function serializeForIndex(RestifyRequest $request, array $fields = []);
-
     /**
      * @return array
      */

src/Controllers/RestController.php

@@ -9,7 +9,6 @@
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\Repositories\Repository;
 use Binaryk\LaravelRestify\Services\Search\SearchService;
-use Binaryk\LaravelRestify\Traits\PerformsQueries;
 use Illuminate\Config\Repository as Config;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Auth\Access\Gate;
@@ -22,7 +21,9 @@
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Password;
+use Throwable;
 
 /**
  * Abstract Class RestController.
@@ -35,7 +36,7 @@
  */
 abstract class RestController extends BaseController
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests, PerformsQueries;
+    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
     /**
      * @var RestResponse
@@ -132,30 +133,46 @@ protected function response($data = null, $status = 200, array $headers = [])
      * @return array
      * @throws BindingResolutionException
      * @throws InstanceOfException
+     * @throws Throwable
      */
     public function search($modelClass, $filters = [])
     {
-        $results = SearchService::instance()
-            ->setPredefinedFilters($filters)
-            ->search($this->request(), $modelClass instanceof Repository ? $modelClass->model() : new $modelClass);
+        $paginator = $this->paginator($modelClass, $filters);
 
-        $results->tap(function ($query) {
-            static::indexQuery($this->request(), $query);
-        });
-
-        /**
-         * @var \Illuminate\Pagination\Paginator
-         */
-        $paginator = $results->paginate($this->request()->get('perPage') ?? ($modelClass::$defaultPerPage ?? RestifySearchable::DEFAULT_PER_PAGE));
         if ($modelClass instanceof Repository) {
-            $items = $paginator->getCollection()->mapInto(get_class($modelClass))->map->serializeForIndex($this->request());
+            $items = $paginator->getCollection()->mapInto(get_class($modelClass))->map->toArray($this->request());
         } else {
-            $items = $paginator->getCollection()->map->serializeForIndex($this->request());
+            $items = $paginator->getCollection();
         }
 
-        return array_merge($paginator->toArray(), [
+        return [
+            'meta' => Arr::except($paginator->toArray(), ['data', 'next_page_url', 'last_page_url', 'first_page_url', 'prev_page_url', 'path']),
+            'links' => Arr::only($paginator->toArray(), ['next_page_url', 'last_page_url', 'first_page_url', 'prev_page_url', 'path']),
             'data' => $items,
-        ]);
+        ];
+    }
+
+    /**
+     * @param $modelClass
+     * @param  array  $filters
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
+     * @throws BindingResolutionException
+     * @throws InstanceOfException
+     * @throws Throwable
+     */
+    public function paginator($modelClass, $filters = [])
+    {
+        $results = SearchService::instance()
+            ->setPredefinedFilters($filters)
+            ->search($this->request(), $modelClass instanceof Repository ? $modelClass->model() : new $modelClass);
+
+        $results->tap(function ($query) use ($modelClass) {
+            if ($modelClass instanceof Repository) {
+                $modelClass::indexQuery($this->request(), $query);
+            }
+        });
+
+        return $results->paginate($this->request()->get('perPage') ?? ($modelClass::$defaultPerPage ?? RestifySearchable::DEFAULT_PER_PAGE));
     }
 
     /**