Extracted permission building out of permission service

[bookstack] / app / Http / Controllers / SearchController.php

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index dca5fa0afe5b9e7893f0a7eea5f8c178900d4185..6b2be5a2d77515433a2fbb4d78deedebb8bf1bda 100644 (file)
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -1,163 +1,102 @@
-<?php namespace BookStack\Http\Controllers;
+<?php

 
 

-use BookStack\Repos\EntityRepo;
-use BookStack\Services\SearchService;
-use BookStack\Services\ViewService;
+namespace BookStack\Http\Controllers;
+
+use BookStack\Entities\Queries\Popular;
+use BookStack\Entities\Tools\SearchOptions;
+use BookStack\Entities\Tools\SearchResultsFormatter;
+use BookStack\Entities\Tools\SearchRunner;
+use BookStack\Entities\Tools\SiblingFetcher;

 use Illuminate\Http\Request;
 
 class SearchController extends Controller
 {
 use Illuminate\Http\Request;
 
 class SearchController extends Controller
 {

-    protected $entityRepo;
-    protected $viewService;
-    protected $searchService;
+    protected $searchRunner;
+    protected $entityContextManager;

 
 

-    /**
-     * SearchController constructor.
-     * @param EntityRepo $entityRepo
-     * @param ViewService $viewService
-     * @param SearchService $searchService
-     */
-    public function __construct(EntityRepo $entityRepo, ViewService $viewService, SearchService $searchService)
+    public function __construct(SearchRunner $searchRunner)

     {
     {

-        $this->entityRepo = $entityRepo;
-        $this->viewService = $viewService;
-        $this->searchService = $searchService;
-        parent::__construct();
+        $this->searchRunner = $searchRunner;

     }
 
     /**
      * Searches all entities.
     }
 
     /**
      * Searches all entities.

-     * @param Request $request
-     * @return \Illuminate\View\View
-     * @internal param string $searchTerm

      */
      */

-    public function searchAll(Request $request)
+    public function search(Request $request, SearchResultsFormatter $formatter)

     {
     {

-        if (!$request->has('term')) {
-            return redirect()->back();
-        }
-        $searchTerm = $request->get('term');
-//        $paginationAppends = $request->only('term'); TODO - Check pagination
-        $this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm]));
-
-        $entities = $this->searchService->searchEntities($searchTerm);
-
-        return view('search/all', [
-            'entities'   => $entities,
-            'searchTerm' => $searchTerm
+        $searchOpts = SearchOptions::fromRequest($request);
+        $fullSearchString = $searchOpts->toString();
+        $this->setPageTitle(trans('entities.search_for_term', ['term' => $fullSearchString]));
+
+        $page = intval($request->get('page', '0')) ?: 1;
+        $nextPageLink = url('/search?term=' . urlencode($fullSearchString) . '&page=' . ($page + 1));
+
+        $results = $this->searchRunner->searchEntities($searchOpts, 'all', $page, 20);
+        $formatter->format($results['results']->all(), $searchOpts);
+
+        return view('search.all', [
+            'entities'     => $results['results'],
+            'totalResults' => $results['total'],
+            'searchTerm'   => $fullSearchString,
+            'hasNextPage'  => $results['has_more'],
+            'nextPageLink' => $nextPageLink,
+            'options'      => $searchOpts,

         ]);
     }
 
     /**
         ]);
     }
 
     /**

-     * Search only the pages in the system.
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     * Searches all entities within a book.

      */
      */

-    public function searchPages(Request $request)
+    public function searchBook(Request $request, int $bookId)

     {
     {

-        if (!$request->has('term')) return redirect()->back();
-
-        $searchTerm = $request->get('term');
-        $paginationAppends = $request->only('term');
-        $pages = $this->entityRepo->getBySearch('page', $searchTerm, [], 20, $paginationAppends);
-        $this->setPageTitle(trans('entities.search_page_for_term', ['term' => $searchTerm]));
-        return view('search/entity-search-list', [
-            'entities'   => $pages,
-            'title'      => trans('entities.search_results_page'),
-            'searchTerm' => $searchTerm
-        ]);
-    }
+        $term = $request->get('term', '');
+        $results = $this->searchRunner->searchBook($bookId, $term);

 
 

-    /**
-     * Search only the chapters in the system.
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
-     */
-    public function searchChapters(Request $request)
-    {
-        if (!$request->has('term')) return redirect()->back();
-
-        $searchTerm = $request->get('term');
-        $paginationAppends = $request->only('term');
-        $chapters = $this->entityRepo->getBySearch('chapter', $searchTerm, [], 20, $paginationAppends);
-        $this->setPageTitle(trans('entities.search_chapter_for_term', ['term' => $searchTerm]));
-        return view('search/entity-search-list', [
-            'entities'   => $chapters,
-            'title'      => trans('entities.search_results_chapter'),
-            'searchTerm' => $searchTerm
-        ]);
+        return view('entities.list', ['entities' => $results]);

     }
 
     /**
     }
 
     /**

-     * Search only the books in the system.
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     * Searches all entities within a chapter.

      */
      */

-    public function searchBooks(Request $request)
+    public function searchChapter(Request $request, int $chapterId)

     {
     {

-        if (!$request->has('term')) return redirect()->back();
-
-        $searchTerm = $request->get('term');
-        $paginationAppends = $request->only('term');
-        $books = $this->entityRepo->getBySearch('book', $searchTerm, [], 20, $paginationAppends);
-        $this->setPageTitle(trans('entities.search_book_for_term', ['term' => $searchTerm]));
-        return view('search/entity-search-list', [
-            'entities'   => $books,
-            'title'      => trans('entities.search_results_book'),
-            'searchTerm' => $searchTerm
-        ]);
-    }
+        $term = $request->get('term', '');
+        $results = $this->searchRunner->searchChapter($chapterId, $term);

 
 

-    /**
-     * Searches all entities within a book.
-     * @param Request $request
-     * @param integer $bookId
-     * @return \Illuminate\View\View
-     * @internal param string $searchTerm
-     */
-    public function searchBook(Request $request, $bookId)
-    {
-        if (!$request->has('term')) {
-            return redirect()->back();
-        }
-        $searchTerm = $request->get('term');
-        $searchWhereTerms = [['book_id', '=', $bookId]];
-        $pages = $this->entityRepo->getBySearch('page', $searchTerm, $searchWhereTerms);
-        $chapters = $this->entityRepo->getBySearch('chapter', $searchTerm, $searchWhereTerms);
-        return view('search/book', ['pages' => $pages, 'chapters' => $chapters, 'searchTerm' => $searchTerm]);
+        return view('entities.list', ['entities' => $results]);

     }
 
     }
 

-

     /**
      * Search for a list of entities and return a partial HTML response of matching entities.
      * Returns the most popular entities if no search is provided.
     /**
      * Search for a list of entities and return a partial HTML response of matching entities.
      * Returns the most popular entities if no search is provided.

-     * @param Request $request
-     * @return mixed

      */
     public function searchEntitiesAjax(Request $request)
     {
      */
     public function searchEntitiesAjax(Request $request)
     {

-        $entities = collect();
-        $entityTypes = $request->has('types') ? collect(explode(',', $request->get('types'))) : collect(['page', 'chapter', 'book']);
-        $searchTerm = ($request->has('term') && trim($request->get('term')) !== '') ? $request->get('term') : false;
+        $entityTypes = $request->filled('types') ? explode(',', $request->get('types')) : ['page', 'chapter', 'book'];
+        $searchTerm = $request->get('term', false);
+        $permission = $request->get('permission', 'view');

 
         // Search for entities otherwise show most popular
         if ($searchTerm !== false) {
 
         // Search for entities otherwise show most popular
         if ($searchTerm !== false) {

-            foreach (['page', 'chapter', 'book'] as $entityType) {
-                if ($entityTypes->contains($entityType)) {
-                    $entities = $entities->merge($this->entityRepo->getBySearch($entityType, $searchTerm)->items());
-                }
-            }
-            $entities = $entities->sortByDesc('title_relevance');
+            $searchTerm .= ' {type:' . implode('|', $entityTypes) . '}';
+            $entities = $this->searchRunner->searchEntities(SearchOptions::fromString($searchTerm), 'all', 1, 20, $permission)['results'];

         } else {
         } else {

-            $entityNames = $entityTypes->map(function ($type) {
-                return 'BookStack\\' . ucfirst($type);
-            })->toArray();
-            $entities = $this->viewService->getPopular(20, 0, $entityNames);
+            $entities = (new Popular())->run(20, 0, $entityTypes, $permission);

         }
 
         }
 

-        return view('search/entity-ajax-list', ['entities' => $entities]);
+        return view('search.parts.entity-ajax-list', ['entities' => $entities]);

     }
 
     }
 

-}
+    /**
+     * Search siblings items in the system.
+     */
+    public function searchSiblings(Request $request)
+    {
+        $type = $request->get('entity_type', null);
+        $id = $request->get('entity_id', null);

 
 

+        $entities = (new SiblingFetcher())->fetch($type, $id);

 
 

+        return view('entities.list-basic', ['entities' => $entities, 'style' => 'compact']);
+    }
+}