Repository paginator related

Author: binaryk

src/Repositories/Repository.php

@@ -504,7 +504,7 @@ public function resolveShowMeta($request)
      */
     public function resolveRelationships($request): array
     {
-        if (is_null($request->get('related'))) {
+        if (is_null($request->input('related'))) {
             return [];
         }
 
@@ -515,9 +515,9 @@ public function resolveRelationships($request): array
                 if (in_array($relation, static::getRelated())) {
                     // @todo check if the resource has the relation
                     /** * @var AbstractPaginator $paginator */
-                    $paginator = $this->resource->{$relation}()->paginate($request->get('relatablePerPage') ?? (static::$defaultRelatablePerPage ?? RestifySearchable::DEFAULT_RELATABLE_PER_PAGE));
+                    $paginator = $this->resource->{$relation}()->take($request->input('relatablePerPage') ?? (static::$defaultRelatablePerPage ?? RestifySearchable::DEFAULT_RELATABLE_PER_PAGE))->get();
 
-                    $withs[$relation] = $paginator->getCollection()->map(fn (Model $item) => [
+                    $withs[$relation] = $paginator->map(fn (Model $item) => [
                         'attributes' => $item->toArray(),
                     ]);
                 }

tests/Controllers/RepositoryIndexControllerTest.php

@@ -113,6 +113,21 @@ public function test_repository_with_relations()
         $this->assertArrayNotHasKey('user', $response->json('data.0.attributes'));
     }
 
+    public function test_paginated_repository_with_relations()
+    {
+        PostRepository::$related = ['user'];
+
+        $user = $this->mockUsers(1)->first();
+
+        factory(Post::class, 20)->create(['user_id' => $user->id]);
+
+        $response = $this->getJson('/restify-api/posts?related=user&page=2')
+            ->assertStatus(200);
+
+        $this->assertCount(1, $response->json('data.0.relationships.user'));
+        $this->assertArrayNotHasKey('user', $response->json('data.0.attributes'));
+    }
+
     public function test_index_unmergeable_repository_containes_only_explicitly_defined_fields()
     {
         factory(Post::class)->create();