Update CanEagerLoadTrait.php

apiato · Nov 26, 2024 · 53a77b6 · 53a77b6
1 parent 94a9f66
commit 53a77b6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Traits/CanEagerLoadTrait.php b/src/Traits/CanEagerLoadTrait.php
@@ -24,9 +24,9 @@ protected function eagerLoadRequestedRelations(): void
         $this->scopeQuery(function (Builder|Model $model) {
             if (Request::has(config('apiato.requests.params.include', 'include'))) {
                 $validIncludes = [];
-                foreach (Response::getRequestedIncludes() as $includeName) {
+                foreach (Response::getRequestedIncludesAsModelRelation() as $includeName) {
                     $relationParts = explode('.', $includeName);
-                    $camelCasedIncludeName = $this->validateNestedRelations($this->model, $relationParts);
+                    $camelCasedIncludeName = $this->filterInvalidRelations($this->model, $relationParts);
                     if ($camelCasedIncludeName) {
                         $validIncludes[] = $camelCasedIncludeName;
                     }
@@ -39,7 +39,7 @@ protected function eagerLoadRequestedRelations(): void
         });
     }
 
-    private function validateNestedRelations(Builder|Model $model, array $relationParts): string|null
+    private function filterInvalidRelations(Builder|Model $model, array $relationParts): string|null
     {
         if (empty($relationParts)) {
             return null;
@@ -57,7 +57,7 @@ private function validateNestedRelations(Builder|Model $model, array $relationPa
             return $relation;
         }
 
-        $nextRelation = $this->validateNestedRelations($nextModel, $relationParts);
+        $nextRelation = $this->filterInvalidRelations($nextModel, $relationParts);
 
         if (is_null($nextRelation)) {
             return null;