@@ -46,7 +46,7 @@ public function indexEntity(Entity $entity)
      *
      * @param Entity[] $entities
      */
-    protected function indexEntities(array $entities)
+    public function indexEntities(array $entities)
     {
         $terms = [];
         foreach ($entities as $entity) {
 
@@ -133,48 +133,62 @@ protected function getPageOfDataFromQuery(EloquentBuilder $query, int $page = 1,
     protected function buildQuery(SearchOptions $searchOpts, string $entityType = 'page', string $action = 'view'): EloquentBuilder
     {
         $entity = $this->entityProvider->get($entityType);
-        $entitySelect = $entity->newQuery();
+        $entityQuery = $entity->newQuery();
 
         // Handle normal search terms
-        if (count($searchOpts->searches) > 0) {
-            $rawScoreSum = DB::raw('SUM(score) as score');
-            $subQuery = DB::table('search_terms')->select('entity_id', 'entity_type', $rawScoreSum);
-            $subQuery->where('entity_type', '=', $entity->getMorphClass());
-            $subQuery->where(function (Builder $query) use ($searchOpts) {
-                foreach ($searchOpts->searches as $inputTerm) {
-                    $query->orWhere('term', 'like', $inputTerm . '%');
-                }
-            })->groupBy('entity_type', 'entity_id');
-            $entitySelect->join(DB::raw('(' . $subQuery->toSql() . ') as s'), function (JoinClause $join) {
-                $join->on('id', '=', 'entity_id');
-            })->addSelect($entity->getTable() . '.*')
-                ->selectRaw('s.score')
-                ->orderBy('score', 'desc');
-            $entitySelect->mergeBindings($subQuery);
-        }
+        $this->applyTermSearch($entityQuery, $searchOpts->searches, $entity);
 
         // Handle exact term matching
         foreach ($searchOpts->exacts as $inputTerm) {
-            $entitySelect->where(function (EloquentBuilder $query) use ($inputTerm, $entity) {
+            $entityQuery->where(function (EloquentBuilder $query) use ($inputTerm, $entity) {
                 $query->where('name', 'like', '%' . $inputTerm . '%')
                     ->orWhere($entity->textField, 'like', '%' . $inputTerm . '%');
             });
         }
 
         // Handle tag searches
         foreach ($searchOpts->tags as $inputTerm) {
-            $this->applyTagSearch($entitySelect, $inputTerm);
+            $this->applyTagSearch($entityQuery, $inputTerm);
         }
 
         // Handle filters
         foreach ($searchOpts->filters as $filterTerm => $filterValue) {
             $functionName = Str::camel('filter_' . $filterTerm);
             if (method_exists($this, $functionName)) {
-                $this->$functionName($entitySelect, $entity, $filterValue);
+                $this->$functionName($entityQuery, $entity, $filterValue);
             }
         }
 
-        return $this->permissionService->enforceEntityRestrictions($entity, $entitySelect, $action);
+        return $this->permissionService->enforceEntityRestrictions($entity, $entityQuery, $action);
+    }
+
+    /**
+     * For the given search query, apply the queries for handling the regular search terms.
+     */
+    protected function applyTermSearch(EloquentBuilder $entityQuery, array $terms, Entity $entity): void
+    {
+        if (count($terms) === 0) {
+            return;
+        }
+
+        $subQuery = DB::table('search_terms')->select([
+            'entity_id',
+            'entity_type',
+            DB::raw('SUM(score) as score'),
+        ]);
+
+        $subQuery->where('entity_type', '=', $entity->getMorphClass());
+        $subQuery->where(function (Builder $query) use ($terms) {
+            foreach ($terms as $inputTerm) {
+                $query->orWhere('term', 'like', $inputTerm . '%');
+            }
+        })->groupBy('entity_type', 'entity_id');
+        $entityQuery->join(DB::raw('(' . $subQuery->toSql() . ') as s'), function (JoinClause $join) {
+            $join->on('id', '=', 'entity_id');
+        })->addSelect($entity->getTable() . '.*')
+            ->selectRaw('s.score')
+            ->orderBy('score', 'desc');
+        $entityQuery->mergeBindings($subQuery);
     }
 
     /**
 
@@ -33,8 +33,9 @@ public function run()
 
         $largeBook->pages()->saveMany($pages);
         $largeBook->chapters()->saveMany($chapters);
+        $all = array_merge([$largeBook], array_values($pages->all()), array_values($chapters->all()));
 
-        app()->make(PermissionService::class)->buildJointPermissions();
-        app()->make(SearchIndex::class)->indexAllEntities();
+        app()->make(PermissionService::class)->buildJointPermissionsForEntity($largeBook);
+        app()->make(SearchIndex::class)->indexEntities($all);
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function indexEntity(Entity $entity)`
`46`	`46`	`*`
`47`	`47`	`* @param Entity[] $entities`
`48`	`48`	`*/`
`49`		`- protected function indexEntities(array $entities)`
	`49`	`+ public function indexEntities(array $entities)`
`50`	`50`	`{`
`51`	`51`	`$terms = [];`
`52`	`52`	`foreach ($entities as $entity) {`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,9 @@ public function run()`
`33`	`33`
`34`	`34`	`$largeBook->pages()->saveMany($pages);`
`35`	`35`	`$largeBook->chapters()->saveMany($chapters);`
	`36`	`+ $all = array_merge([$largeBook], array_values($pages->all()), array_values($chapters->all()));`
`36`	`37`
`37`		`- app()->make(PermissionService::class)->buildJointPermissions();`
`38`		`- app()->make(SearchIndex::class)->indexAllEntities();`
	`38`	`+ app()->make(PermissionService::class)->buildJointPermissionsForEntity($largeBook);`
	`39`	`+ app()->make(SearchIndex::class)->indexEntities($all);`
`39`	`40`	`}`
`40`	`41`	`}`