diff --git a/src/Traits/QueryHelperTrait.php b/src/Traits/QueryHelperTrait.php index 81109cf..531bf11 100644 --- a/src/Traits/QueryHelperTrait.php +++ b/src/Traits/QueryHelperTrait.php @@ -19,16 +19,14 @@ protected function eagerLoadIncludes($model, $includes) $builder = $model; foreach ($includes as $include) { - if (!$model->$include) { - continue; + if (method_exists($model, $include) && $model->$include() instanceof Relation) { + $builder = $builder->with([ + $include => function ($query) use ($include) { + $parameters = $this->fractal ? $this->fractal->getIncludeParams($include) : null; + $this->applyParameters($query, $parameters); + } + ]); } - - $builder = $builder->with([ - $include => function ($query) use ($include) { - $parameters = $this->fractal ? $this->fractal->getIncludeParams($include) : null; - $this->applyParameters($query, $parameters); - } - ]); } return $builder;