Finished refactor of entity repos

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

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 7c7d7b2545dfaafe64c585eff684dad8f25482fc..37aaccece64bbc5514c8ac8d55487ed16187ed2b 100644 (file)
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -1,34 +1,22 @@
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 

+use BookStack\Repos\EntityRepo;

 use BookStack\Services\ViewService;
 use Illuminate\Http\Request;
 
 use BookStack\Services\ViewService;
 use Illuminate\Http\Request;
 

-use BookStack\Http\Requests;
-use BookStack\Repos\BookRepo;
-use BookStack\Repos\ChapterRepo;
-use BookStack\Repos\PageRepo;
-

 class SearchController extends Controller
 {
 class SearchController extends Controller
 {

-    protected $pageRepo;
-    protected $bookRepo;
-    protected $chapterRepo;
+    protected $entityRepo;

     protected $viewService;
 
     /**
      * SearchController constructor.
     protected $viewService;
 
     /**
      * SearchController constructor.

-     * @param PageRepo $pageRepo
-     * @param BookRepo $bookRepo
-     * @param ChapterRepo $chapterRepo
+     * @param EntityRepo $entityRepo

      * @param ViewService $viewService
      */
      * @param ViewService $viewService
      */

-    public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo, ViewService $viewService)
+    public function __construct(EntityRepo $entityRepo, ViewService $viewService)

     {
     {

-        $this->pageRepo = $pageRepo;
-        $this->bookRepo = $bookRepo;
-        $this->chapterRepo = $chapterRepo;
+        $this->entityRepo = $entityRepo;

         $this->viewService = $viewService;
         parent::__construct();
     }
         $this->viewService = $viewService;
         parent::__construct();
     }


@@ -46,10 +34,10 @@ class SearchController extends Controller
         }
         $searchTerm = $request->get('term');
         $paginationAppends = $request->only('term');
         }
         $searchTerm = $request->get('term');
         $paginationAppends = $request->only('term');

-        $pages = $this->pageRepo->getBySearch($searchTerm, [], 20, $paginationAppends);
-        $books = $this->bookRepo->getBySearch($searchTerm, 10, $paginationAppends);
-        $chapters = $this->chapterRepo->getBySearch($searchTerm, [], 10, $paginationAppends);
-        $this->setPageTitle('Search For ' . $searchTerm);
+        $pages = $this->entityRepo->getBySearch('page', $searchTerm, [], 20, $paginationAppends);
+        $books = $this->entityRepo->getBySearch('book', $searchTerm, [], 10, $paginationAppends);
+        $chapters = $this->entityRepo->getBySearch('chapter', $searchTerm, [], 10, $paginationAppends);
+        $this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm]));

         return view('search/all', [
             'pages'      => $pages,
             'books'      => $books,
         return view('search/all', [
             'pages'      => $pages,
             'books'      => $books,


@@ -69,11 +57,11 @@ class SearchController extends Controller
 
         $searchTerm = $request->get('term');
         $paginationAppends = $request->only('term');
 
         $searchTerm = $request->get('term');
         $paginationAppends = $request->only('term');

-        $pages = $this->pageRepo->getBySearch($searchTerm, [], 20, $paginationAppends);
-        $this->setPageTitle('Page Search For ' . $searchTerm);
+        $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,
         return view('search/entity-search-list', [
             'entities'   => $pages,

-            'title'      => 'Page Search Results',
+            'title'      => trans('entities.search_results_page'),

             'searchTerm' => $searchTerm
         ]);
     }
             'searchTerm' => $searchTerm
         ]);
     }


@@ -89,11 +77,11 @@ class SearchController extends Controller
 
         $searchTerm = $request->get('term');
         $paginationAppends = $request->only('term');
 
         $searchTerm = $request->get('term');
         $paginationAppends = $request->only('term');

-        $chapters = $this->chapterRepo->getBySearch($searchTerm, [], 20, $paginationAppends);
-        $this->setPageTitle('Chapter Search For ' . $searchTerm);
+        $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,
         return view('search/entity-search-list', [
             'entities'   => $chapters,

-            'title'      => 'Chapter Search Results',
+            'title'      => trans('entities.search_results_chapter'),

             'searchTerm' => $searchTerm
         ]);
     }
             'searchTerm' => $searchTerm
         ]);
     }


@@ -109,11 +97,11 @@ class SearchController extends Controller
 
         $searchTerm = $request->get('term');
         $paginationAppends = $request->only('term');
 
         $searchTerm = $request->get('term');
         $paginationAppends = $request->only('term');

-        $books = $this->bookRepo->getBySearch($searchTerm, 20, $paginationAppends);
-        $this->setPageTitle('Book Search For ' . $searchTerm);
+        $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,
         return view('search/entity-search-list', [
             'entities'   => $books,

-            'title'      => 'Book Search Results',
+            'title'      => trans('entities.search_results_book'),

             'searchTerm' => $searchTerm
         ]);
     }
             'searchTerm' => $searchTerm
         ]);
     }


@@ -132,8 +120,8 @@ class SearchController extends Controller
         }
         $searchTerm = $request->get('term');
         $searchWhereTerms = [['book_id', '=', $bookId]];
         }
         $searchTerm = $request->get('term');
         $searchWhereTerms = [['book_id', '=', $bookId]];

-        $pages = $this->pageRepo->getBySearch($searchTerm, $searchWhereTerms);
-        $chapters = $this->chapterRepo->getBySearch($searchTerm, $searchWhereTerms);
+        $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('search/book', ['pages' => $pages, 'chapters' => $chapters, 'searchTerm' => $searchTerm]);
     }
 


@@ -152,9 +140,11 @@ class SearchController extends Controller
 
         // Search for entities otherwise show most popular
         if ($searchTerm !== false) {
 
         // Search for entities otherwise show most popular
         if ($searchTerm !== false) {

-            if ($entityTypes->contains('page')) $entities = $entities->merge($this->pageRepo->getBySearch($searchTerm)->items());
-            if ($entityTypes->contains('chapter')) $entities = $entities->merge($this->chapterRepo->getBySearch($searchTerm)->items());
-            if ($entityTypes->contains('book')) $entities = $entities->merge($this->bookRepo->getBySearch($searchTerm)->items());
+            foreach (['page', 'chapter', 'book'] as $entityType) {
+                if ($entityTypes->contains($entityType)) {
+                    $entities = $entities->merge($this->entityRepo->getBySearch($entityType, $searchTerm)->items());
+                }
+            }

             $entities = $entities->sortByDesc('title_relevance');
         } else {
             $entityNames = $entityTypes->map(function ($type) {
             $entities = $entities->sortByDesc('title_relevance');
         } else {
             $entityNames = $entityTypes->map(function ($type) {


@@ -163,7 +153,7 @@ class SearchController extends Controller
             $entities = $this->viewService->getPopular(20, 0, $entityNames);
         }
 
             $entities = $this->viewService->getPopular(20, 0, $entityNames);
         }
 

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

     }
 
 }
     }
 
 }