wip

BinarCode · Aug 10, 2021 · dfedad4 · dfedad4
1 parent 2f061b0
commit dfedad4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Services/Search/RepositorySearchService.php b/src/Services/Search/RepositorySearchService.php
@@ -76,15 +76,17 @@ public function prepareRelations(RestifyRequest $request, Builder | Relation $qu
     {
         $eager = $this->repository::collectRelated()
             ->forEager($request)
+            ->inRequest($request)
             ->when($request->isIndexRequest(), fn (RelatedCollection $collection) => $collection->forIndex($request, $this->repository))
             ->when($request->isShowRequest(), fn (RelatedCollection $collection) => $collection->forShow($request, $this->repository))
             ->map(fn (EagerField $field) => $field->relation)
-            ->merge(($this->repository)::withs())
             ->values()
             ->unique()
             ->all();
 
-        return $query->with($eager);
+        $query->with($eager);
+
+        return $query->with(($this->repository)::withs());
     }
 
     public function prepareSearchFields(RestifyRequest $request, $query, $extra = [])