Fixed model extending mis-use

[bookstack] / app / Services / SearchService.php

diff --git a/app/Services/SearchService.php b/app/Services/SearchService.php
index 8202b4997fd9f6c1dd4f3e97dadd1afed71a64d7..a3186e8f4a38ceeb32d741b6803ab4699e621f8e 100644 (file)
--- a/app/Services/SearchService.php
+++ b/app/Services/SearchService.php
@@ -56,9 +56,9 @@ class SearchService
      * @param string $entityType
      * @param int $page
      * @param int $count
      * @param string $entityType
      * @param int $page
      * @param int $count

-     * @return Collection
+     * @return array[int, Collection];

      */
      */

-    public function searchEntities($searchString, $entityType = 'all', $page = 0, $count = 20)
+    public function searchEntities($searchString, $entityType = 'all', $page = 1, $count = 20)

     {
         $terms = $this->parseSearchString($searchString);
         $entityTypes = array_keys($this->entities);
     {
         $terms = $this->parseSearchString($searchString);
         $entityTypes = array_keys($this->entities);


@@ -71,14 +71,55 @@ class SearchService
             $entityTypesToSearch = explode('|', $terms['filters']['type']);
         }
 
             $entityTypesToSearch = explode('|', $terms['filters']['type']);
         }
 

-        // TODO - Check drafts don't show up in results
+        $total = 0;
+

         foreach ($entityTypesToSearch as $entityType) {
             if (!in_array($entityType, $entityTypes)) continue;
             $search = $this->searchEntityTable($terms, $entityType, $page, $count);
         foreach ($entityTypesToSearch as $entityType) {
             if (!in_array($entityType, $entityTypes)) continue;
             $search = $this->searchEntityTable($terms, $entityType, $page, $count);

+            $total += $this->searchEntityTable($terms, $entityType, $page, $count, true);
+            $results = $results->merge($search);
+        }
+
+        return [
+            'total' => $total,
+            'count' => count($results),
+            'results' => $results->sortByDesc('score')
+        ];
+    }
+
+
+    /**
+     * Search a book for entities
+     * @param integer $bookId
+     * @param string $searchString
+     * @return Collection
+     */
+    public function searchBook($bookId, $searchString)
+    {
+        $terms = $this->parseSearchString($searchString);
+        $entityTypes = ['page', 'chapter'];
+        $entityTypesToSearch = isset($terms['filters']['type']) ? explode('|', $terms['filters']['type']) : $entityTypes;
+
+        $results = collect();
+        foreach ($entityTypesToSearch as $entityType) {
+            if (!in_array($entityType, $entityTypes)) continue;
+            $search = $this->buildEntitySearchQuery($terms, $entityType)->where('book_id', '=', $bookId)->take(20)->get();

             $results = $results->merge($search);
         }
             $results = $results->merge($search);
         }

+        return $results->sortByDesc('score')->take(20);
+    }

 
 

-        return $results->sortByDesc('score');
+    /**
+     * Search a book for entities
+     * @param integer $chapterId
+     * @param string $searchString
+     * @return Collection
+     */
+    public function searchChapter($chapterId, $searchString)
+    {
+        $terms = $this->parseSearchString($searchString);
+        $pages = $this->buildEntitySearchQuery($terms, 'page')->where('chapter_id', '=', $chapterId)->take(20)->get();
+        return $pages->sortByDesc('score');

     }
 
     /**
     }
 
     /**


@@ -87,9 +128,25 @@ class SearchService
      * @param string $entityType
      * @param int $page
      * @param int $count
      * @param string $entityType
      * @param int $page
      * @param int $count

-     * @return \Illuminate\Database\Eloquent\Collection|static[]
+     * @param bool $getCount Return the total count of the search
+     * @return \Illuminate\Database\Eloquent\Collection|int|static[]
+     */
+    public function searchEntityTable($terms, $entityType = 'page', $page = 1, $count = 20, $getCount = false)
+    {
+        $query = $this->buildEntitySearchQuery($terms, $entityType);
+        if ($getCount) return $query->count();
+
+        $query = $query->skip(($page-1) * $count)->take($count);
+        return $query->get();
+    }
+
+    /**
+     * Create a search query for an entity
+     * @param array $terms
+     * @param string $entityType
+     * @return \Illuminate\Database\Eloquent\Builder

      */
      */

-    public function searchEntityTable($terms, $entityType = 'page', $page = 0, $count = 20)
+    protected function buildEntitySearchQuery($terms, $entityType = 'page')

     {
         $entity = $this->getEntity($entityType);
         $entitySelect = $entity->newQuery();
     {
         $entity = $this->getEntity($entityType);
         $entitySelect = $entity->newQuery();


@@ -131,9 +188,7 @@ class SearchService
             if (method_exists($this, $functionName)) $this->$functionName($entitySelect, $entity, $filterValue);
         }
 
             if (method_exists($this, $functionName)) $this->$functionName($entitySelect, $entity, $filterValue);
         }
 

-        $entitySelect->skip($page * $count)->take($count);
-        $query = $this->permissionService->enforceEntityRestrictions($entityType, $entitySelect, 'view');
-        return $query->get();
+        return $this->permissionService->enforceEntityRestrictions($entityType, $entitySelect, 'view');

     }
 
 
     }
 
 


@@ -175,7 +230,7 @@ class SearchService
         // Split filter values out
         $splitFilters = [];
         foreach ($terms['filters'] as $filter) {
         // Split filter values out
         $splitFilters = [];
         foreach ($terms['filters'] as $filter) {

-            $explodedFilter = explode(':', $filter, 1);
+            $explodedFilter = explode(':', $filter, 2);

             $splitFilters[$explodedFilter[0]] = (count($explodedFilter) > 1) ? $explodedFilter[1] : '';
         }
         $terms['filters'] = $splitFilters;
             $splitFilters[$explodedFilter[0]] = (count($explodedFilter) > 1) ? $explodedFilter[1] : '';
         }
         $terms['filters'] = $splitFilters;


@@ -371,13 +426,15 @@ class SearchService
 
     protected function filterCreatedBy(\Illuminate\Database\Eloquent\Builder $query, Entity $model, $input)
     {
 
     protected function filterCreatedBy(\Illuminate\Database\Eloquent\Builder $query, Entity $model, $input)
     {

-        if (!is_numeric($input)) return;
+        if (!is_numeric($input) && $input !== 'me') return;
+        if ($input === 'me') $input = user()->id;

         $query->where('created_by', '=', $input);
     }
 
     protected function filterUpdatedBy(\Illuminate\Database\Eloquent\Builder $query, Entity $model, $input)
     {
         $query->where('created_by', '=', $input);
     }
 
     protected function filterUpdatedBy(\Illuminate\Database\Eloquent\Builder $query, Entity $model, $input)
     {

-        if (!is_numeric($input)) return;
+        if (!is_numeric($input) && $input !== 'me') return;
+        if ($input === 'me') $input = user()->id;

         $query->where('updated_by', '=', $input);
     }
 
         $query->where('updated_by', '=', $input);
     }