Add default via relationship for related

Author: binaryk

src/Http/Requests/InteractWithRepositories.php

@@ -177,16 +177,6 @@ public function findRelatedQuery($relatedRepository = null, $relatedRepositoryId
             ->whereKey($relatedRepositoryId ?? request('relatedRepositoryId'));
     }
 
-    protected function findPivot(RestifyRequest $request, $model)
-    {
-        $pivot = $model->{$request->relatedRepository}()->getPivotAccessor();
-
-        return $model->{$request->viaRelationship}()
-            ->withoutGlobalScopes()
-            ->lockForUpdate()
-            ->findOrFail($request->relatedRepositoryId)->{$pivot};
-    }
-
     public function viaParentModel()
     {
         $parent = $this->repository($this->viaRepository);
@@ -196,7 +186,7 @@ public function viaParentModel()
 
     public function viaQuery()
     {
-        return $this->viaParentModel()->{$this->viaRelationship}();
+        return $this->viaParentModel()->{$this->viaRelationship ?? request('repository')}();
     }
 
     /**

src/Http/Requests/RestifyRequest.php

@@ -61,6 +61,6 @@ public function isStoreRequest()
 
     public function isViaRepository()
     {
-        return $this->viaRepository && $this->viaRepositoryId && $this->viaRelationship;
+        return $this->viaRepository && $this->viaRepositoryId;
     }
 }

tests/Controllers/RelatedIndexControllerTest.php

@@ -25,6 +25,21 @@ public function test_can_list_posts_belongs_to_a_user()
         $this->assertCount(10, $response->json('data'));
     }
 
+    public function test_can_list_posts_belongs_to_a_user_without_via_relationship_because_get_default_main_repository()
+    {
+        $this->mockUsers();
+        $this->mockPosts(1, 10);
+
+        $this->mockPosts(
+            factory(User::class)->create()->id
+        );
+
+        $response = $this->getJson('restify-api/posts?viaRepository=users&viaRepositoryId=1')
+            ->assertStatus(200);
+
+        $this->assertCount(10, $response->json('data'));
+    }
+
     public function test_can_show_post_belongs_to_a_user()
     {
         factory(User::class)->create();