WIP HasMedia

ElegantEngineeringTech · Nov 27, 2023 · 6cf3ce2 · 6cf3ce2
1 parent 8c21ed1
commit 6cf3ce2
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 10 deletions.
diff --git a/src/MediaCollection.php b/src/MediaCollection.php
@@ -11,7 +11,8 @@ class MediaCollection
 {
     public function __construct(
         public ?array $acceptedMimeTypes = null,
-        public Collection $conversions = new Collection()
+        public bool $single = false,
+        public bool $public = false,
     ) {
     }
 }
diff --git a/src/Traits/HasMedia.php b/src/Traits/HasMedia.php
@@ -5,6 +5,7 @@
 use Finller\LaravelMedia\Jobs\ConversionJob;
 use Finller\LaravelMedia\Media;
 use Finller\LaravelMedia\MediaCollection;
+use Finller\LaravelMedia\MediaConversion;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Collection;
@@ -27,6 +28,15 @@ public function getMediaCollections(): Collection
         return collect([]);
     }
 
+    /**
+     * @return Collection<string, MediaConversion>
+     */
+    function getMediaConversions(Media $media): Collection
+    {
+        $conversions = collect([]);
+        return $conversions;
+    }
+
     public function addMedia(string|UploadedFile $file, string $collection_name = null): static
     {
         $collection_name ??= config('media.default_collection_name');
@@ -40,20 +50,20 @@ public function addMedia(string|UploadedFile $file, string $collection_name = nu
         return $this;
     }
 
-    public function dispatchConversions(Media $media, string $collection_name): static
+    public function dispatchConversions(Media $media): static
     {
-        $collection = $this->getMediaCollections()->get($collection_name);
+        $conversions = $this->getMediaConversions($media);
 
-        if (! $collection) {
+        if ($conversions->isEmpty()) {
             return $this;
         }
 
-        foreach ($collection->conversions as $conversion) {
+        foreach ($conversions as $name => $conversion) {
             if ($conversion->job instanceof ConversionJob) {
                 dispatch($conversion->job);
             } else {
                 $job = $conversion->job;
-                dispatch(new $job($media, $conversion->name));
+                dispatch(new $job($media, $name));
             }
         }
 

diff --git a/tests/Feature/HasMediaTest.php b/tests/Feature/HasMediaTest.php
@@ -1,5 +1,14 @@
 <?php
 
+use FFMpeg\Coordinate\Dimension;
+use Finller\LaravelMedia\Casts\GeneratedConversion;
+use Finller\LaravelMedia\Database\Factories\MediaFactory;
+use Finller\LaravelMedia\Enums\MediaType;
+use Finller\LaravelMedia\Media;
+use Finller\LaravelMedia\Tests\Models\Test;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
+
 it('retrieve the generated conversion key', function () {
-    //
+    $model = (new Test())->save();
 });
diff --git a/tests/Models/Test.php b/tests/Models/Test.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Finller\LaravelMedia\Tests\Models;
+
+use Finller\LaravelMedia\Enums\MediaType;
+use Finller\LaravelMedia\Jobs\OptimizedImageConversionJob;
+use Finller\LaravelMedia\Media;
+use Finller\LaravelMedia\MediaCollection;
+use Finller\LaravelMedia\MediaConversion;
+use Finller\LaravelMedia\Traits\HasMedia;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
+
+/**
+ * @property ?string $uuid
+ */
+class Test extends Model
+{
+    use HasMedia;
+
+    protected $table = 'tests';
+
+    protected $guarded = [];
+
+    /**
+     * @return Collection<string, MediaCollection>
+     */
+    public function getMediaCollections(): Collection
+    {
+        return collect([
+            'files' => new MediaCollection(
+                single: false,
+                public: false,
+            )
+        ]);
+    }
+
+    function getMediaConversions(Media $media): Collection
+    {
+
+        $conversions = collect();
+
+        if ($media->type === MediaType::Image) {
+            $conversions->push(
+                new MediaConversion(
+                    name: 'optimized',
+                    job: new OptimizedImageConversionJob($media, 'optimized')
+                )
+            );
+        }
+
+        return $conversions->keyBy('name');
+    }
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -4,6 +4,7 @@
 
 use Finller\LaravelMedia\LaravelMediaServiceProvider;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Database\Schema\Blueprint;
 use Orchestra\Testbench\TestCase as Orchestra;
 
 class TestCase extends Orchestra
@@ -13,7 +14,7 @@ protected function setUp(): void
         parent::setUp();
 
         Factory::guessFactoryNamesUsing(
-            fn (string $modelName) => 'Finller\\LaravelMedia\\Database\\Factories\\'.class_basename($modelName).'Factory'
+            fn (string $modelName) => 'Finller\\LaravelMedia\\Database\\Factories\\' . class_basename($modelName) . 'Factory'
         );
     }
 
@@ -28,9 +29,15 @@ public function getEnvironmentSetUp($app)
     {
         config()->set('database.default', 'testing');
 
-        $migration = include __DIR__.'/../database/migrations/1_create_media_table.php.stub';
+        $migration = include __DIR__ . '/../database/migrations/1_create_media_table.php.stub';
         $migration->up();
-        $migration = include __DIR__.'/../database/migrations/2_add_columns_to_media_table.php.stub';
+        $migration = include __DIR__ . '/../database/migrations/2_add_columns_to_media_table.php.stub';
         $migration->up();
+
+        $app['db']->connection()->getSchemaBuilder()->create('tests', function (Blueprint $table) {
+            $table->increments('id');
+            $table->timestamps();
+            $table->softDeletes();
+        });
     }
 }