Merge pull request #14 from FarhanShares/eager-load

Update migrations
FarhanShares · Mar 4, 2021 · 110c6f9 · 110c6f9
2 parents e4d79be + 680f989
commit 110c6f9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/..._mediaman_collection_media_table.stub.php → ...eate_mediaman_collection_media_table.stub b/..._mediaman_collection_media_table.stub.php → ...eate_mediaman_collection_media_table.stub
@@ -13,10 +13,9 @@ class CreateMediaManCollectionMediaTable extends Migration
      */
     public function up()
     {
-        Schema::table(config('mediaman.tables.collection_media'), function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('collection_id');
-            $table->integer('media_id');
+        Schema::create(config('mediaman.tables.collection_media'), function (Blueprint $table) {
+            $table->unsignedBigInteger('collection_id');
+            $table->unsignedBigInteger('media_id');
 
             $table->foreign('collection_id')
                 ->references('id')

diff --git a/...reate_mediaman_collections_table.stub.php → ...ns/create_mediaman_collections_table.stub b/...reate_mediaman_collections_table.stub.php → ...ns/create_mediaman_collections_table.stub
@@ -1,6 +1,5 @@
 <?php
 
-use App\Models\MediaCollection;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
@@ -15,7 +14,7 @@ class CreateMediaManCollectionsTable extends Migration
     public function up()
     {
         Schema::create(config('mediaman.tables.collections'), function (Blueprint $table) {
-            $table->id();
+            $table->bigIncrements('id');
             $table->string('name');
             $table->timestamps();
         });

diff --git a/...ions/create_mediaman_media_table.stub.php → ...grations/create_mediaman_media_table.stub b/...ions/create_mediaman_media_table.stub.php → ...grations/create_mediaman_media_table.stub
@@ -16,8 +16,8 @@ public function up()
         Schema::create(config('mediaman.tables.media'), function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('disk');
-            $table->string('display_name');
             $table->string('name');
+            $table->string('file_name');
             $table->string('mime_type');
             $table->unsignedInteger('size');
             $table->json('data')->nullable();

diff --git a/.../create_mediaman_mediables_table.stub.php → ...ions/create_mediaman_mediables_table.stub b/.../create_mediaman_mediables_table.stub.php → ...ions/create_mediaman_mediables_table.stub
@@ -14,6 +14,7 @@ class CreateMediamanMediablesTable extends Migration
     public function up()
     {
         Schema::create(config('mediaman.tables.mediables'), function (Blueprint $table) {
+            $table->bigIncrements('id');
             $table->unsignedBigInteger('media_id')->index();
             $table->unsignedBigInteger('mediable_id')->index();
             $table->string('mediable_type');

diff --git a/src/MediaManServiceProvider.php b/src/MediaManServiceProvider.php
@@ -61,7 +61,7 @@ public function boot()
      *
      */
 
-    protected function getMigrationFileSource(string $name, string $ext = '.stub.php')
+    protected function getMigrationFileSource(string $name, string $ext = '.stub')
     {
         return __DIR__ . '/../database/migrations/' . $name . $ext;
     }

diff --git a/src/Traits/HasMedia.php b/src/Traits/HasMedia.php
@@ -20,7 +20,6 @@ trait HasMedia
      */
     public function media(): MorphToMany
     {
-        // todo: with('collections')
         return $this
             ->morphToMany(config('mediaman.models.media'), 'mediable', config('mediaman.tables.mediables'))
             ->withPivot('channel');
@@ -43,10 +42,13 @@ public function hasMedia(string $channel = 'default')
      * @param string $group
      * @return mixed
      */
-    public function getMedia(string $channel = 'default')
+    public function getMedia(?string $channel = 'default')
     {
-        // todo: if channel is false/null -> exclude where clause
-        return $this->media->where('pivot.channel', $channel);
+        if ($channel) {
+            return $this->media->where('pivot.channel', $channel);
+        }
+
+        return $this->media;
     }
 
     /**
@@ -55,9 +57,8 @@ public function getMedia(string $channel = 'default')
      * @param string $channel
      * @return mixed
      */
-    public function getFirstMedia(string $channel = 'default')
+    public function getFirstMedia(?string $channel = 'default')
     {
-        // todo: with('collections')
         return $this->getMedia($channel)->first();
     }
 
@@ -68,7 +69,7 @@ public function getFirstMedia(string $channel = 'default')
      * @param string $conversion
      * @return string
      */
-    public function getFirstMediaUrl(string $channel = 'default', string $conversion = '')
+    public function getFirstMediaUrl(?string $channel = 'default', string $conversion = '')
     {
         if (!$media = $this->getFirstMedia($channel)) {
             return '';