Search rewrite

.github/workflows/build-branch.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   build-push-branch:
     container:
-      image: ghcr.io/lolibrary/builder
+      image: ghcr.io/lolibrary/builder@sha256:80ca803642b16c17df149f402b4ea5d440eaef0fa19d54c9431dc4b9acfc6cb5
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.PAT }}
@@ -19,6 +19,7 @@ jobs:
         with:
           repository: lolibrary/build
           token: ${{ secrets.PAT }}
+          ref: cea7b09494c6541c8bdfc7d919e1d58428061117
       - name: Checkout Sakura
         uses: actions/checkout@v2
         with:

app/Http/Controllers/Api/SearchController.php

@@ -30,16 +30,26 @@ class SearchController extends Base
         Tag::class => 'tags',
     ];
 
-    /**
+        /**
      * Search for items.
      *
      * @param \Illuminate\Http\Request $request
      * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|\App\Item[]
      */
-    public function search(SearchRequest $request)
+    public function search_index(SearchRequest $request)
     {
         $query = Item::query();
-
+        return search($request, $query);
+    }
+    /**
+     * Search for items.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|\App\Item[]
+     */
+    public function search(SearchRequest $request, Builder $query)
+    {
         $this->filters($request, $query);
         $this->years($request, $query);
 
@@ -60,11 +70,16 @@ public function search(SearchRequest $request)
 
         $query->where('status', Item::PUBLISHED);
 
-        $paginator = $query->paginate(24);
+        $params = $this->form_to_query($request);
+
+        $paginator = $query->paginate(24)->appends($params);
 
         $paginator->each(function (Item $item) {
-            $item->image = Storage::cloud()->url($item->image);
-            $item->makeVisible('image');
+            if ($item->image !== null) { 
+                $item->makeVisible('image');
+                    $item->image = Storage::cloud()->url($item->image);
+                    $item->makeVisible('image');
+                }
 
             if ($item->brand !== null) {
                 $item->brand->image = Storage::cloud()->url($item->brand->image);
@@ -80,6 +95,15 @@ public function search(SearchRequest $request)
         return $paginator;
     }
 
+    protected function form_to_query(Request $request)
+    {
+        $all_params = $request->all();
+
+        $filtered = array_filter($all_params, function($value, $key) { return !(str_contains($key, '_matcher') && $value == 'OR'); }, ARRAY_FILTER_USE_BOTH);
+
+        return  $filtered;
+    }
+
     /**
      * Filter relationships.
      *
@@ -93,7 +117,7 @@ protected function filters(Request $request, Builder $query)
             [$singular, $plural] = [Str::singular($relation), Str::plural($relation)];
 
             $models = (array) $request->input($plural) ?? $request->input($singular);
-            $matcher = $request->input($singular . "_matcher") ?? "OR";
+            $matcher = $request->input($plural . "_matcher") ?? "OR";
 
             if (count($models) > 0) {
                 if ($matcher == "AND") {
@@ -131,22 +155,17 @@ protected function filters(Request $request, Builder $query)
      */
     protected function years(Request $request, Builder $query)
     {
-        $years = (array) ($request->input('years') ?? $request->input('year'));
+        $start_year = $request->input('start_year');
+        $end_year = $request->input('end_year');
         $matcher = $request->input("year_matcher") ?? "OR";
 
-        if (count($years) > 0) {
-            if ($matcher == "AND") { 
-                foreach ($years as $year) {
-                    $query->where('year', $year);
-                }
+        if ($start_year && $end_year) {
+            if ($matcher == "OR") { 
+                $query->whereBetween('year', [$start_year, $end_year]);
 
             } elseif ($matcher == "NOT") {
+                $query->whereNotBetween('year', [$start_year, $end_year]);
 
-                $not_query = Item::query()->whereIn('year', $years)->select('id')->distinct();
-                $query->whereNotIn('id', $not_query);
-
-            } elseif ($matcher == "OR") {
-                $query->whereIn('year', $years);
             }
         }
     }

app/Http/Controllers/HomeController.php

@@ -26,8 +26,8 @@ public function homepage()
             ->orderBy('published_at', 'desc')
             ->get();
 
-        $brands = Brand::all();
-        $categories = Category::all();
+        $brands = Brand::with('translations')->get();
+        $categories = Category::with('translations')->get();
         $recent = Item::with(Item::PARTIAL_LOAD)
             ->whereNotNull('published_at')
             ->orderBy('published_at', 'desc')

app/Http/Controllers/SearchController.php

@@ -1,11 +1,68 @@
 <?php
 
 namespace App\Http\Controllers;
+use App\Models\Brand;
+use App\Models\Category;
+use App\Models\Feature;
+use App\Models\Color;
+use App\Models\Item;
+use App\Models\Tag;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\App;
+use App\Http\Requests\Api\SearchRequest;
+use App\Http\Controllers\Api\SearchController as ApiSearchController;
+
 
 class SearchController extends Controller
 {
-    public function index()
+    public function index(SearchRequest $request)
     {
-        return view('search');
+        $items = $this->post($request);
+        $filters = $this->get_or_make_filters($request);
+
+        return view('search', ['filters' => $filters,'items' => $items]);
+    }
+
+    public function post(SearchRequest $request) {
+        $query = Item::query();
+        $search = new ApiSearchController();
+        $items = $search->search($request, $query);
+
+        return view('components.search-results', ['items' => $items, 'max_year' => (date('Y') + 3)]);
+    }
+
+    public function get_or_make_filters(SearchRequest $request) {
+        // Closure so we don't have to edit this multiple places if things change
+        $make_filters = function() {
+            return view('components.filters', ['sections' => [
+                'categories' => Category::cached()->sortBy('name'), 
+                'brands' => Brand::cached()->sortBy('name'), 
+                'features' => Feature::cached()->sortBy('name'),
+                'colors' => Color::cached()->sortBy('name'),
+                'tags' => Tag::cached()->sortBy('name'),]
+            ])->render();
+        };
+
+        // Check if there are any filters set. If not, we can use cached renders.
+        // 'search' doesn't count because it doesn't affect the filter view.
+        $params = $request->all();
+        $count = count($params);
+
+        if ($count == 0 || ($count == 1 && array_key_exists('search', $params))) {
+            $locale = App::getLocale();
+            $filters = cache()->tags(['filters'])->get($locale);
+            if (!$filters) {
+                $filters = $make_filters();
+                cache()->tags(['filters'])->forever($locale, $filters);
+                return $filters;
+            } else {
+                return $filters;
+            }
+        } else {
+            return $make_filters();
+        }
     }
 }

app/Http/Requests/Api/SearchRequest.php

@@ -39,6 +39,25 @@ public function authorize()
         return true;
     }
 
+    /**
+     * Prepare the data for validation.
+     *
+     * @return void
+     */
+    protected function prepareForValidation()
+    {
+        if (!empty($this->year)) {
+            $years = array_map('intval', explode(",", $this->year));
+            sort($years);
+            $multiple = count($years) > 1;
+            $this->merge([
+                'start_year' => $years[0],
+                'end_year' => ($multiple ? end($years) : date('Y') + 3)
+            ]);
+        }
+    }
+
+
     /**
      * Get a list of rules for this request.
      *
@@ -69,9 +88,8 @@ public function rules()
             'tags' => 'sometimes|array',
             'tags.*' => 'required|string|exists:tags,slug',
 
-            'year' => 'sometimes|required|integer|min:1970|max:'.(date('Y') + 3),
-            'years' => 'sometimes|array',
-            'years.*' => 'required|integer|min:1970|max:'.(date('Y') + 3),
+            'start_year' => 'sometimes|required|integer|min:1970|max:'.(date('Y') + 3),
+            'end_year' => 'sometimes|required|integer|min:1970|max:'.(date('Y') + 3),
         ];
     }
 }

app/Http/Requests/SearchRequest.php

@@ -29,6 +29,25 @@
  */
 class SearchRequest extends FormRequest
 {
+
+    /**
+     * Prepare the data for validation.
+     *
+     * @return void
+     */
+    protected function prepareForValidation()
+    {
+        if (!empty($this->year)) {
+            $years = array_map('intval', explode(",", $this->year));
+            sort($years);
+            $multiple = count($years) > 1;
+            $this->merge([
+                'start_year' => $years[0],
+                'end_year' => ($multiple ? end($years) : date('Y') + 3)
+            ]);
+        }
+    }
+
     /**
      * Check if this request is authorized.
      *
@@ -69,9 +88,8 @@ public function rules()
             'tags' => 'sometimes|array',
             'tags.*' => 'required|string|exists:tags,slug',
 
-            'year' => 'sometimes|required|integer|min:1970|max:'.(date('Y') + 3),
-            'years' => 'sometimes|array',
-            'years.*' => 'required|integer|min:1970|max:'.(date('Y') + 3),
+            'start_year' => 'sometimes|required|integer|min:1970|max:'.(date('Y') + 3),
+            'end_year' => 'sometimes|required|integer|min:1970|max:'.(date('Y') + 3),
         ];
     }
 }

app/Models/Traits/Cacheable.php

@@ -14,7 +14,7 @@ trait Cacheable
     public static function cached()
     {
         return cache()->rememberForever(static::cacheKey(), function () {
-            return static::all();
+            return static::with('translations')->get();
         });
     }
 
@@ -28,7 +28,7 @@ public static function cacheKey()
         $locale = App::getLocale();
         $key = mb_strtolower(class_basename(static::class));
 
-        return 'models:'.$locale.':'.$key;
+        return 'models:'.$key;
     }
 
     /**
@@ -49,8 +49,15 @@ public static function bust()
      */
     protected static function bootCacheable()
     {
-        static::saving(function () {
+        static::saved(function () {
             static::bust();
+            static::bust();
+            cache()->tags('filters')->flush();
+        });
+
+        static::deleted(function () {
+            static::bust();
+            cache()->tags('filters')->flush();
         });
     }
 }

app/Providers/AppServiceProvider.php

@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use App\Composers;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
@@ -49,5 +50,6 @@ public function boot()
         Blade::if('dev', function () {
             return auth()->check() && auth()->user()->developer();
         });
+
     }
 }

dev.sh

@@ -4,11 +4,11 @@ cd /srv
 if [[ "$1" == "SETUP" ]]; then
     composer config http-basic.nova.laravel.com "$NOVA_USERNAME" "$NOVA_API_KEY" --no-interaction
     COMPOSER_MEMORY_LIMIT=-1 composer install --no-interaction
-
     cp fortawesome* ../
     npm install
     npm run development
 else
+    COMPOSER_MEMORY_LIMIT=-1 composer install --no-interaction
     npm install
     npm run development
 

docker-compose.yml

@@ -58,7 +58,13 @@ services:
       - ./tests:/srv/tests
       - ./storage:/srv/storage
       - ./config:/srv/config
+      - ./composer.json:/srv/composer.json
+      - ./composer.lock:/srv/composer.lock
+      - ./dev.sh:/srv/dev.sh
+      - ./server.php:/srv/server.php
+      - ./package.json:/srv/package.json
+      - ./yarn.lock:/srv/yarn.lock
     ports:
       - "3000:3000"
     depends_on:
-      - db
+      - db

package.json

@@ -23,15 +23,14 @@
         "resolve-url-loader": "^2.3.1",
         "sass": "^1.15.2",
         "sass-loader": "^7.1.0",
-        "vue": "2.6.11",
-        "vue-template-compiler": "2.6.11"
+        "vue-template-compiler": "^2.7.16"
     },
     "dependencies": {
         "@fortawesome/fontawesome-pro": "file:/../fortawesome-fontawesome-pro-5.15.1.tgz",
-        "bootstrap4c-chosen": "^1.1.1",
+        "bootstrap-slider": "11.0.2",
         "qs": "^6.8.0",
         "sass-svg-uri": "^1.0.0",
         "simple-lightbox": "^2.1.0",
-        "vue-select": "^3.1.0"
+        "tom-select": "^2.3.1"
     }
 }