Code improvements and bug fixes.

Author: jstnmthw

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "laradock"]
+	path = laradock
+	url = https://github.com/laradock/laradock.git

app/Category.php

@@ -7,20 +7,4 @@
 class Category extends Model
 {
 
-    /**
-     * Get all of the videos that are assigned this category.
-     */
-    public function videos()
-    {
-        return $this->morphedByMany('App\Video', 'categorizable');
-    }
-
-    /**
-     * Get the parent of the category.
-     */
-    public function parentable()
-    {
-        return $this->morphedByMany();
-    }
-
 }

app/Console/Commands/setVideoCategories.php

@@ -3,28 +3,31 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 
 use Config;
-use App\Video;
+use App\Media;
 use App\QueryRule;
 use App\CategoryRule;
 
 class VideoController extends Controller
 {
     /**
-     * API Resource for Video Model
+     * API Resource for Media Model
      *
-     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
+     * @param Request $request
+     * @return LengthAwarePaginator
      */
     public function index(Request $request)
     {
         // Limit
         $limit = $request->has('limit') ? (int) $request->input('limit') : 50;
 
         // Sorting
-        if ($request->has('sortby')) {
-            switch ($request->input('sortby')) {
+        if ($request->has('sort_by')) {
+            switch ($request->input('sort_by')) {
                 case 'most_views':
                     $sort = 'views';
                     break;
@@ -39,7 +42,7 @@ public function index(Request $request)
 
         // Model by ID
         if ($request->has('id')) {
-            $data = Video::where('id', $request->input('id'))->firstOrFail();
+            $data = Media::where('id', $request->input('id'))->firstOrFail();
 
             // TODO: Transform data at insert.
             preg_match(config('regex.domain'), $data->embed, $url);
@@ -54,20 +57,20 @@ public function index(Request $request)
         // Collection of models
         if ($request->has('collection')) {
             $collection = explode(',', $request->input('collection'));
-            return Video::whereIn('id', $collection)->get();
+            return Media::whereIn('id', $collection)->get();
         }
 
         // Category model listing
         if ($request->has('category')) {
-            return Video::search($request->input('category'))
+            return Media::search($request->input('category'))
                 ->rule(CategoryRule::class)
                 ->orderBy('views', 'DESC')
                 ->paginate($limit);
         }
 
         // Search model listing
         if ($request->has('q') && !empty($request->input('q'))) {
-            $data = Video::search($request->input('q'))->rule(QueryRule::class);
+            $data = Media::search($request->input('q'))->rule(QueryRule::class);
             $data->whereNotMatch('categories', config('const.excluded_cats'));
 
             if ($request->has('exclude')) {
@@ -83,24 +86,26 @@ public function index(Request $request)
 
         // Most Views
         if ($request->has('most_viewed')) {
-            return Video::search('*')
+            return Media::search('*')
                 ->orderBy('views', 'desc')
                 ->paginate($limit);
         }
 
         // Default model listing
-        return Video::search('*')
+        return Media::search('*')
             ->whereNotMatch('categories', config('const.excluded_cats'))
             ->orderby('views', 'desc')
             ->paginate($limit);
     }
 
     /**
      * Return top models by week
+     *
+     * @return LengthAwarePaginator
      */
     public function best()
     {
-        return Video::search('*')
+        return Media::search('*')
             ->where(
                 'created_at',
                 '>=',
@@ -112,23 +117,24 @@ public function best()
     /**
      * Increment likes column on respective model
      *
-     * @return json
+     * @return JsonResponse
      */
     public function like($id)
     {
-        if (Video::where('id', $id)->increment('likes')) {
+        if (Media::where('id', $id)->increment('likes')) {
             return response()->json(['success' => 1], 200);
         }
     }
 
     /**
      * Increment dislikes column on respective model
      *
-     * @return json
+     * @return JsonResponse
+     * @mixin Builder
      */
     public function dislike($id)
     {
-        if (Video::where('id', $id)->increment('dislikes')) {
+        if (Media::where('id', $id)->increment('dislikes')) {
             return response()->json(['success' => 1], 200);
         }
     }

app/Http/Controllers/VideoController.php

@@ -8,7 +8,7 @@
 
 // use Laravel\Scout\Searchable;
 
-class Video extends Model
+class Media extends Model
 {
     use Searchable;
 
@@ -27,14 +27,6 @@ class Video extends Model
         ],
     ];
 
-    /**
-     * Get the categories for the video.
-     */
-    // public function categories()
-    // {
-    //     return $this->morphToMany('App\Category', 'categorizable');
-    // }
-
     /**
      * Get the index name for the model.
      *
@@ -46,13 +38,13 @@ public function searchableAs()
     }
 
     /**
-     * Get the indexable data array for the model.
+     * Get the index data array for the model.
      *
      * @return array
      */
     public function toSearchableArray()
     {
-        $array = $this->only([
+        return $this->only([
             'title',
             'categories',
             'views',
@@ -63,7 +55,5 @@ public function toSearchableArray()
             'created_at',
             'updated_at',
         ]);
-
-        return $array;
     }
 }

app/Http/Resources/DataCollection.php

@@ -5,12 +5,12 @@
 use ScoutElastic\IndexConfigurator;
 use ScoutElastic\Migratable;
 
-class VideosIndex extends IndexConfigurator
+class MediaIndex extends IndexConfigurator
 {
     use Migratable;
 
-    // Index name
-    protected $name = 'videos_idx';
+    // Index name for Elastic search index
+    protected $name = 'media_idx';
 
     /**
      * Elastic Search settings

app/Video.php app/Media.php

@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class VideoData extends Migration
+class Media extends Migration
 {
     /**
      * Run the migrations.
@@ -14,7 +14,7 @@ class VideoData extends Migration
     public function up()
     {
 
-        Schema::create('videos', function (Blueprint $table) {
+        Schema::create('media', function (Blueprint $table) {
 
             $table->id();
             $table->text('embed');
@@ -40,6 +40,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('videos');
+        Schema::dropIfExists('media');
     }
 }