Apply Eloquent resource scope when applying relationship filter

tobyzerner · Jul 11, 2024 · e913512 · e913512
1 parent 8885c35
commit e913512
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/Laravel/Filter/WhereHas.php b/src/Laravel/Filter/WhereHas.php
@@ -58,6 +58,10 @@ public function apply(object $query, array|string $value, Context $context): voi
         $query->{static::QUERY_BUILDER_METHOD}($field->property ?: $field->name, function (
             $query,
         ) use ($value, $relatedCollection, $context) {
+            if ($relatedCollection instanceof EloquentResource) {
+                $relatedCollection->scope($query, $context);
+            }
+
             if (array_is_list($value)) {
                 $query->whereKey(array_merge(...array_map(fn($v) => explode(',', $v), $value)));
             } else {