Merge branch '3.x' of github.com:BinarCode/laravel-restify

Author: binaryk

README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="https://BinarCode.github.io/laravel-restify/assets/img/logo.png"></p>
+<p align="center"><img src="http://restify.binarcode.com/assets/img/logo.png"></p>
 
 <p align="center">
     <a href="https://github.com/BinarCode/laravel-restify/actions"><img src="https://github.com/BinarCode/laravel-restify/workflows/tests/badge.svg" alt="Build Status"></a>
@@ -21,8 +21,8 @@ composer require binaryk/laravel-restify
 ## Key havings
 
 - "CRUD" over resources with 0 (zero) extra custom code
-- Passport authentication (use `php artisan restify:check-passport` for it's setup)
-- Auth module (register, verify, login, reset + forgot password)
+- Passport checker (`php artisan restify:check-passport`)
+- Auth module with [Laravel Sanctum](https://laravel.com/docs/7.x/sanctum#introduction) (register, verify, login, reset + forgot password)
 - Beautiful response maker
 - Powerful and configurable searching/filtering over entities
 - API friendly Exception Handler
@@ -38,7 +38,7 @@ php artisan restify:setup
 Generate repository:
 
 ```bash
-php artisan restify:repository Post
+php artisan restify:repository PostRepository --all
 ```
 
 ## Usage

src/Repositories/Repository.php

@@ -532,12 +532,14 @@ public function index(RestifyRequest $request)
             return static::resolveWith($value);
         })->filter(function (self $repository) use ($request) {
             return $repository->authorizedToShow($request);
-        })->values()->map(fn (self $repository) => $repository->serializeForIndex($request));
+        })->values();
 
         return $this->response([
-            'meta' => $this->resolveIndexMainMeta($request, $items) ?? RepositoryCollection::meta($paginator->toArray()),
+            'meta' => $this->resolveIndexMainMeta(
+                    $request, $items->map(fn (self $repository) => $repository->resource),
+                ) ?? RepositoryCollection::meta($paginator->toArray()),
             'links' => RepositoryCollection::paginationLinks($paginator->toArray()),
-            'data' => $items,
+            'data' => $items->map(fn (self $repository) => $repository->serializeForIndex($request)),
         ]);
     }
 

src/Services/Search/RepositorySearchService.php

@@ -70,13 +70,13 @@ public function prepareMatchFields(RestifyRequest $request, $query, $extra = [])
 
     public function prepareOrders(RestifyRequest $request, $query, $extra = [])
     {
-        $sort = $request->get('sort', '');
+        $orderings = explode(',', $request->get('sort', ''));
 
         if (isset($extra['sort'])) {
-            $sort = $extra['sort'];
+            $orderings = $extra['sort'];
         }
 
-        $params = explode(',', $sort);
+        $params = array_filter($orderings);
 
         if (is_array($params) === true && empty($params) === false) {
             foreach ($params as $param) {
@@ -85,7 +85,7 @@ public function prepareOrders(RestifyRequest $request, $query, $extra = [])
         }
 
         if (empty($params) === true) {
-            $this->setOrder($query, '+id');
+            $this->setOrder($query, '+'.$this->repository->newModel()->getKeyName());
         }
 
         return $query;
@@ -107,6 +107,11 @@ public function prepareRelations(RestifyRequest $request, $query, $extra = [])
     public function prepareSearchFields(RestifyRequest $request, $query, $extra = [])
     {
         $search = $request->get('search', data_get($extra, 'search', ''));
+
+        if (empty($search)) {
+            return $query;
+        }
+
         $model = $query->getModel();
 
         $query->where(function ($query) use ($search, $model) {
@@ -154,6 +159,8 @@ public function setOrder($query, $param)
             $field = $param;
         }
 
+        $field = $field ?? $this->repository->newModel()->getKeyName();
+
         if (isset($field)) {
             if (in_array($field, $this->repository->getOrderByFields()) === true) {
                 if ($order === '-') {

tests/Controllers/RepositoryIndexControllerTest.php

@@ -148,4 +148,22 @@ public function test_index_mergeable_repository_containes_model_attributes_and_l
                 ]],
             ]);
     }
+
+    public function test_can_add_custom_index_main_meta_attributes()
+    {
+        factory(Post::class)->create([
+            'title' => 'Post Title',
+        ]);
+
+        $response = $this->get('/restify-api/posts')
+            ->assertStatus(200)
+            ->assertJsonStructure([
+                'meta' => [
+                    'postKey',
+                ],
+            ]);
+
+        $this->assertEquals('Custom Meta Value', $response->json('meta.postKey'));
+        $this->assertEquals('Post Title', $response->json('meta.first_title'));
+    }
 }

tests/Fixtures/Post/PostRepository.php

@@ -5,6 +5,7 @@
 use Binaryk\LaravelRestify\Fields\Field;
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\Repositories\Repository;
+use Illuminate\Support\Collection;
 
 class PostRepository extends Repository
 {
@@ -58,4 +59,12 @@ public function filters(RestifyRequest $request)
             CreatedAfterDateFilter::new(),
         ];
     }
+
+    public function resolveIndexMainMeta(RestifyRequest $request, Collection $items)
+    {
+        return [
+            'postKey' => 'Custom Meta Value',
+            'first_title' => optional($items->first())->title,
+        ];
+    }
 }