Switching to ElasticSearch Scout Driver & Plus for pure Elastic results.

Author: jstnmthw

.gitignore

@@ -21,4 +21,5 @@ yarn-error.log
 
 ## PHPStorm stuff
 _ide_helper.php
-.phpstorm.meta.php
+.phpstorm.meta.php
+/storage/debugbar/

app/Http/Controllers/MediaController.php

@@ -5,7 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use\Illuminate\Pagination\LengthAwarePaginator;
 
 use App\Media;
 
@@ -15,20 +15,27 @@ class MediaController extends Controller
 
     public function __construct(Request $request)
     {
-        // Set limit
+        // Set default limit
         $this->limit = $this->page_limit($request);
     }
 
     /**
      * API Resource for Media Model
-     * @return LengthAwarePaginator|void
+     * @param Request $request
+     * @return LengthAwarePaginator
      */
-    public function index()
+    public function index(Request $request)
     {
-        // Default model listing
-        $data = Media::search('*')->paginate(50);
-        return $data->isNotEmpty() ? $data : abort(404);
+        // Default documents listing
+        $matches = Media::matchAllSearch()->size($this->limit)->execute();
+        $docs = $matches->documents();
+        $res = [];
+        foreach ($docs as $media) {
+            $res[] = array_merge(['id' => (int) $media->getId()], $media->getContent());
+        }
+        return new LengthAwarePaginator($res, $matches->total(), $this->limit, $request->input('page') ?? 1);
     }
+
 //    public function index(Request $request)
 //    {
 //
@@ -119,7 +126,6 @@ public function get($id) {
 
     /**
      * Return top models by week
-     *
      * @return LengthAwarePaginator
      */
     public function best()
@@ -135,7 +141,6 @@ public function best()
 
     /**
      * Increment likes column on
-     *
      * @param $id
      * @return JsonResponse
      */
@@ -149,7 +154,6 @@ public function like($id)
 
     /**
      * Increment dislikes column
-     *
      * @param $id
      * @return JsonResponse
      */
@@ -161,8 +165,10 @@ public function dislike($id)
         return response()->json(['success' => false], 404);
     }
 
-    /*
-     * Set page limit (respectively query limit)
+    /**
+     * Set default page limit
+     * @param $request
+     * @return int
      */
     public function page_limit($request) {
         return ($request->has('limit') && $request->input('limit') < 50) ? (int) $request->input('limit') : 50;

app/Media.php

@@ -2,38 +2,15 @@
 
 namespace App;
 
-use ScoutElastic\Searchable;
+use ElasticScoutDriverPlus\CustomSearch;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Laravel\Scout\Searchable;
 
 class Media extends Model
 {
-    use Searchable, HasFactory;
-
-    protected $indexConfigurator = MediaIndex::class;
-
-    protected $mapping = [
-        'properties' => [
-            'title' => [
-                'type' => 'text',
-                'fields' => [
-                    'raw' => [
-                        'type' => 'keyword',
-                    ],
-                ],
-            ],
-        ],
-    ];
-
-    /**
-     * Get the index name for the model.
-     *
-     * @return string
-     */
-    public function searchableAs()
-    {
-        return 'videos_idx';
-    }
+    use SoftDeletes, Searchable, CustomSearch, HasFactory;
 
     /**
      * Get the index data array for the model.
@@ -44,6 +21,8 @@ public function toSearchableArray()
     {
         return $this->only([
             'title',
+            'thumbnail',
+            'album',
             'categories',
             'views',
             'likes',

app/MediaIndex.php

@@ -9,14 +9,12 @@ class MediaIndex extends IndexConfigurator
 {
     use Migratable;
 
-    // Index name for Elastic search index
+    // Elastic search index
     protected $name = 'media_idx';
 
     /**
      * Elastic Search settings
-     *
      * @var array
-     * @return json
      */
     protected $settings = [
         'analysis' => [

composer.json

@@ -10,7 +10,10 @@
     "require": {
         "php": "^7.3",
         "algolia/algoliasearch-client-php": "2.2",
-        "babenkoivan/scout-elasticsearch-driver": "^4.2",
+        "babenkoivan/elastic-client": "^1.1",
+        "babenkoivan/elastic-migrations": "^1.2",
+        "babenkoivan/elastic-scout-driver": "^1.2",
+        "babenkoivan/elastic-scout-driver-plus": "^1.11",
         "fideloper/proxy": "^4.2",
         "fruitcake/laravel-cors": "^1.0",
         "guzzlehttp/guzzle": "^7.0.1",
@@ -23,6 +26,7 @@
     },
     "require-dev": {
         "aalaap/faker-youtube": "^1.2",
+        "barryvdh/laravel-debugbar": "^3.5",
         "barryvdh/laravel-ide-helper": "^2.8",
         "facade/ignition": "^2.3.6",
         "fzaninotto/faker": "^1.9.1",

composer.lock

@@ -9,6 +9,6 @@
     | Here you may configure custom constants specific to your app.
     |
     */
-    // Videos cateogories excempt from main listings
+    // Media categories exempt from main listings
     'excluded_cats' => env('EXCLUDED_CATEGORIES', 'null'),
 ];

config/const.php

@@ -0,0 +1,7 @@
+<?php declare(strict_types=1);
+
+return [
+    'hosts' => [
+        env('ELASTIC_HOST', 'localhost:9200'),
+    ]
+];

config/elastic.client.php

@@ -24,9 +24,9 @@ public function definition()
     {
         $this->faker->addProvider(new Youtube($this->faker));
         return [
-            'embed' => $this->faker->youtubeEmbedCode(),
-            'thumbnail' => $this->faker->imageUrl(205, 155, null, true),
-            'album' => $this->faker->imageUrl(205, 155, null, true) .';'. $this->faker->imageUrl(205, 155, null, true),
+            'embed' => $this->faker->youtubeShortUri(),
+            'thumbnail' => 'https://picsum.photos/205/155/?image='.$this->faker->randomDigit,
+            'album' => 'https://picsum.photos/205/155/?image='.$this->faker->randomDigit.';'.'https://picsum.photos/205/155/?image='.$this->faker->randomDigit.';'.'https://picsum.photos/205/155/?image='.$this->faker->randomDigit,
             'title' => $this->faker->sentence($nbWords = 6, $variableNbWords = true),
             'categories' => $this->faker->word .";". $this->faker->word .";". $this->faker->word,
             'author' => $this->faker->name,

database/factories/MediaFactory.php

@@ -27,6 +27,7 @@ public function up()
             $table->integer('views');
             $table->integer('likes');
             $table->integer('dislikes');
+            $table->softDeletes();
             $table->timestamps();
 
         });

database/factories/RootSeed.php

@@ -15,7 +15,7 @@ class MediaSeeder extends Seeder
     public function run()
     {
         Media::factory()
-            ->times(10)
+            ->times(300)
             ->create();
     }
 }

database/migrations/2020_04_13_073834_media.php

@@ -0,0 +1,54 @@
+<?php
+declare(strict_types=1);
+
+use ElasticAdapter\Indices\Mapping;
+use ElasticAdapter\Indices\Settings;
+use ElasticMigrations\Facades\Index;
+use ElasticMigrations\MigrationInterface;
+
+final class CreateMediaIndex implements MigrationInterface
+{
+    /**
+     * Run the migration.
+     */
+    public function up(): void
+    {
+        Index::create('media', function (Mapping $mapping, Settings $settings) {
+            // Mapping
+            $mapping->text('thumbnail');
+            $mapping->text('embed');
+            $mapping->text('album');
+            $mapping->text('title');
+            $mapping->keyword('categories');
+            $mapping->text('author');
+            $mapping->float('duration');
+            $mapping->float('views');
+            $mapping->float('likes');
+            $mapping->float('dislikes');
+            $mapping->date('created_at');
+            $mapping->date('updated_at');
+
+            // Settings
+            $settings->analysis([
+                'properties' => [
+                    'categories' => [
+                        'type' => 'text',
+                        'fields' => [
+                            'raw' => [
+                                'type' => 'keyword',
+                            ],
+                        ],
+                    ],
+                ],
+            ]);
+        });
+    }
+
+    /**
+     * Reverse the migration.
+     */
+    public function down(): void
+    {
+        Index::drop('media');
+    }
+}

database/seeds/MediaSeeder.php

@@ -308,7 +308,6 @@ a, .btn-link {
       overflow: hidden;
       img {
         border-radius: 0;
-        filter: blur(35px);
       }
       .carousel {
         position: absolute;
@@ -345,7 +344,6 @@ a, .btn-link {
       .video-title {
         word-break: break-word;
         a {
-        //filter: blur(2px);
           color: $lilac;
           &:hover {
             color: $white;
@@ -416,7 +414,6 @@ a, .btn-link {
 }
 .all-categories {
   a {
-    filter: blur(2px);
     color: $lilac;
     &:hover {
       color: $white;