Eloquent: apply scopes when including polymorphic relationships

Author: tobyzerner

src/Adapter/EloquentAdapter.php

@@ -211,13 +211,19 @@ public function load(array $models, array $relationships, $scope, bool $linkage)
         // to load anything as the related ID is store directly on the model.
 
         (new Collection($models))->loadMissing([
-            $this->getRelationshipPath($relationships) => function ($relation) use ($relationships, $scope) {
+            $this->getRelationshipPath($relationships) => function ($relation) use ($scope) {
                 $query = $relation->getQuery();
 
                 if (is_array($scope)) {
-                    // TODO: since https://github.com/laravel/framework/pull/35190
-                    // was merged, we can now apply loading constraints to
-                    // polymorphic relationships.
+                    // Requires Laravel 8.15+
+                    foreach ($scope as $v) {
+                        $adapter = $v['resource']->getAdapter();
+                        if ($adapter instanceof self) {
+                            $relation->constrain([
+                                get_class($adapter->newModel()) => $v['scope']
+                            ]);
+                        }
+                    }
                 } else {
                     $scope($query);
                 }

src/Endpoint/Concerns/IncludesData.php

@@ -31,7 +31,7 @@ private function getInclude(Context $context): array
         if (! empty($queryParams['include'])) {
             $include = $this->parseInclude($queryParams['include']);
 
-            $this->validateInclude($this->resource, $include);
+            $this->validateInclude([$this->resource], $include);
 
             return $include;
         }
@@ -58,26 +58,38 @@ private function parseInclude(string $include): array
         return $tree;
     }
 
-    private function validateInclude(ResourceType $resource, array $include, string $path = '')
+    private function validateInclude(array $resources, array $include, string $path = '')
     {
-        $fields = $resource->getSchema()->getFields();
-
         foreach ($include as $name => $nested) {
-            if (
-                ! isset($fields[$name])
-                || ! $fields[$name] instanceof Relationship
-                || ! $fields[$name]->isIncludable()
-            ) {
-                throw new BadRequestException("Invalid include [{$path}{$name}]", 'include');
-            }
+            foreach ($resources as $resource) {
+                $fields = $resource->getSchema()->getFields();
+
+                if (
+                    ! isset($fields[$name])
+                    || ! $fields[$name] instanceof Relationship
+                    || ! $fields[$name]->isIncludable()
+                ) {
+                    continue;
+                }
+
+                $type = $fields[$name]->getType();
 
-            if (($type = $fields[$name]->getType()) && is_string($type)) {
-                $relatedResource = $this->api->getResource($type);
+                if (is_string($type)) {
+                    $relatedResource = $this->api->getResource($type);
 
-                $this->validateInclude($relatedResource, $nested, $name.'.');
-            } elseif ($nested) {
-                throw new BadRequestException("Invalid include [{$path}{$name}.*]", 'include');
+                    $this->validateInclude([$relatedResource], $nested, $name.'.');
+                } else {
+                    $relatedResources = is_array($type) ? array_map(function ($type) {
+                        return $this->api->getResource($type);
+                    }, $type) : array_values($this->api->getResources());
+
+                    $this->validateInclude($relatedResources, $nested, $name.'.');
+                }
+
+                continue 2;
             }
+
+            throw new BadRequestException("Invalid include [{$path}{$name}]", 'include');
         }
     }
 
@@ -123,10 +135,13 @@ private function loadRelationshipsAtLevel(array $models, array $relationshipPath
                         }, $relatedResources),
 
                         array_map(function ($relatedResource) use ($context, $field) {
-                            return function ($query) use ($context, $field, $relatedResource) {
-                                run_callbacks($relatedResource->getSchema()->getListeners('scope'), [$query, $context]);
-                                run_callbacks($field->getListeners('scope'), [$query, $context]);
-                            };
+                            return [
+                                'resource' => $relatedResource,
+                                'scope' => function ($query) use ($context, $field, $relatedResource) {
+                                    run_callbacks($relatedResource->getSchema()->getListeners('scope'), [$query, $context]);
+                                    run_callbacks($field->getListeners('scope'), [$query, $context]);
+                                }
+                            ];
                         }, $relatedResources)
                     );
                 }