Support custom route key

robin-dongbin · robin-dongbin · commit c55e5c425f41 · 2024-04-11T16:22:55.000+08:00
diff --git a/src/Http/Requests/Concerns/InteractWithRepositories.php b/src/Http/Requests/Concerns/InteractWithRepositories.php
@@ -90,7 +90,8 @@ public function viaQuery(): Relation
 
     public function modelQuery(?string $repositoryId = null, ?string $uriKey = null): Builder|Relation
     {
-        return $this->newQuery($uriKey)->whereKey(
+        return $this->newQuery($uriKey)->where(
+            $this->model()->getRouteKeyName(),
             $repositoryId ?? $this->route('repositoryId')
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ public function viaQuery(): Relation`
`90`	`90`
`91`	`91`	`public function modelQuery(?string $repositoryId = null, ?string $uriKey = null): Builder\|Relation`
`92`	`92`	`{`
`93`		`- return $this->newQuery($uriKey)->whereKey(`
	`93`	`+ return $this->newQuery($uriKey)->where(`
	`94`	`+ $this->model()->getRouteKeyName(),`
`94`	`95`	`$repositoryId ?? $this->route('repositoryId')`
`95`	`96`	`);`
`96`	`97`	`}`