fix: fixing belongs search with custom foreign key (#512)

* fix: fixing belongs search with custom foreign key

* Fix styling

Co-authored-by: binaryk <[email protected]>

Author: binaryk

src/Fields/EagerField.php

@@ -98,7 +98,7 @@ public function getRelatedKey(
         Repository $repository
     ): string {
         return $repository->resource->qualifyColumn(
-            $this->getRelation($repository)->getRelated()->getForeignKey()
+            $repository->resource->{$this->relation}()->getForeignKeyName()
         );
     }
 

src/Getters/Getter.php

@@ -19,8 +19,10 @@
 use JsonSerializable;
 use ReturnTypeWillChange;
 use Symfony\Component\HttpFoundation\Response;
+
 use function tap;
 use function throw_unless;
+
 use Throwable;
 
 /**

tests/Controllers/RepositoryAttachControllerTest.php

@@ -13,6 +13,7 @@
 use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Gate;
+
 use function PHPUnit\Framework\assertInstanceOf;
 
 class RepositoryAttachControllerTest extends IntegrationTest

tests/Feature/RepositorySearchServiceTest.php

@@ -228,6 +228,34 @@ public function test_can_search_using_belongs_to_field(): void
             ->assertJsonCount(2, 'data');
     }
 
+    public function test_can_search_using_belongs_to_field_with_custom_foreign_key(): void
+    {
+        $foreignUser = User::factory()->create([
+            'name' => 'Curtis Dog',
+        ]);
+
+        Post::factory(4)->create([
+            'edited_by' => $foreignUser->id,
+        ]);
+
+        $john = User::factory()->create([
+            'name' => 'John Doe',
+        ]);
+
+        Post::factory(2)->create([
+            'edited_by' => $john->id,
+        ]);
+
+        PostRepository::$related = [
+            'editor' => BelongsTo::make('editor',  UserRepository::class)->searchable([
+                'users.name',
+            ]),
+        ];
+
+        $this->getJson('posts?search=John')
+            ->assertJsonCount(2, 'data');
+    }
+
     public function test_can_order_using_filter_sortable_definition(): void
     {
         User::factory()->create([

tests/Fields/FieldTest.php

@@ -10,6 +10,7 @@
 use Binaryk\LaravelRestify\Tests\IntegrationTest;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Routing\Route;
+
 use function PHPUnit\Framework\assertInstanceOf;
 use function PHPUnit\Framework\assertSame;
 

tests/Fixtures/Post/Post.php

@@ -12,6 +12,7 @@
  * Class Post.
  * @property mixed $id
  * @property mixed $user_id
+ * @property mixed $edited_by
  * @property mixed $image
  * @property mixed $title
  * @property mixed $description
@@ -25,6 +26,7 @@ class Post extends Model
 
     protected $fillable = [
         'id',
+        'edited_by',
         'user_id',
         'image',
         'title',
@@ -37,4 +39,9 @@ public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }
+
+    public function editor(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'edited_by');
+    }
 }

tests/Migrations/2019_12_22_000005_create_posts_table.php

@@ -21,6 +21,7 @@ public function up()
             $table->string('image')->nullable();
             $table->string('category')->nullable();
             $table->boolean('is_active')->default(true);
+            $table->unsignedInteger('edited_by')->index()->nullable();
             $table->timestamps();
         });
     }