fix: fix: fixing belongs search with custom foreign key

Author: binaryk

src/Fields/EagerField.php

@@ -123,7 +123,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/Feature/RepositorySearchServiceTest.php

@@ -76,6 +76,49 @@ 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->withoutExceptionHandling();
+        $this->getJson(PostRepository::route(query: ['search' => 'John']))
+            ->assertJsonCount(2, 'data');
+    }
+
+    public function test_can_match_closure(): void
+    {
+        User::factory(4)->create();
+
+        UserRepository::$match = [
+            'is_active' => function ($request, $query) {
+                $this->assertInstanceOf(Request::class, $request);
+                $this->assertInstanceOf(Builder::class, $query);
+            },
+        ];
+
+        $this->getJson('users?is_active=true');
+    }
+
     public function test_can_match_custom_matcher(): void
     {
         User::factory(1)->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

@@ -15,6 +15,7 @@
  *
  * @property mixed $id
  * @property mixed $user_id
+ * @property mixed $edited_by
  * @property mixed $image
  * @property string $title
  * @property string $description
@@ -28,6 +29,7 @@ class Post extends Model
 
     protected $fillable = [
         'id',
+        'edited_by',
         'user_id',
         'image',
         'title',
@@ -45,6 +47,11 @@ public function user(): BelongsTo
         return $this->belongsTo(User::class);
     }
 
+    public function editor(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'edited_by');
+    }
+
     public function comments(): HasMany
     {
         return $this->hasMany(Comment::class);

tests/database/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();
         });
     }