HasOrder, HasMediable and fixes

Author: goshasafonov

database/migrations/create_media_table.php

@@ -25,7 +25,7 @@ public function up(): void
 
             $table->keyMorphs(
                 Config::getMediableKeyType(KeyType::BigInteger),
-                Config::getMediableRelationName()
+                Config::getMediableRelationName('mediable')
             );
 
             $table->string('collection')->index();

src/Models/Media.php

@@ -3,20 +3,22 @@
 namespace Yuges\Mediable\Models;
 
 use Yuges\Package\Models\Model;
+use Yuges\Mediable\Config\Config;
 use Yuges\Mediable\Traits\HasUrl;
 use Yuges\Mediable\Traits\HasPath;
-use Yuges\Mediable\Traits\HasOrder;
+use Yuges\Orderable\Traits\HasOrder;
+use Yuges\Mediable\Traits\HasMediable;
 use Illuminate\Support\Facades\Storage;
 use Yuges\Mediable\Traits\HasResponsive;
 use Yuges\Mediable\Traits\HasPlaceholder;
+use Yuges\Orderable\Options\OrderOptions;
+use Yuges\Orderable\Interfaces\Orderable;
+use Illuminate\Database\Eloquent\Builder;
 use Symfony\Component\HttpFoundation\File\File;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
- * @property string $mediable_id
- * @property string $mediable_type
  * @property string $collection
  * @property string $disk
  * @property string $directory
@@ -29,20 +31,26 @@
  * @property ?array $conversions
  * @property ?array $properties
  */
-class Media extends Model
+class Media extends Model implements Orderable
 {
     use
         HasUrl,
         HasPath,
         HasOrder,
         HasFactory,
+        HasMediable,
         HasResponsive,
         HasPlaceholder;
 
     protected $table = 'media';
 
     protected $guarded = ['id'];
 
+    public function getTable(): string
+    {
+        return Config::getMediaTable() ?? $this->table;
+    }
+
     protected function casts(): array
     {
         return [
@@ -55,9 +63,15 @@ protected function casts(): array
         ];
     }
 
-    public function mediable(): MorphTo
+    public function orderable(): OrderOptions
     {
-        return $this->morphTo();
+        $options = new OrderOptions();
+
+        $options->query = fn (Builder $builder) => $builder
+            ->where('mediable_id', $this->mediable_id)
+            ->where('mediable_type', $this->mediable_type);
+
+        return $options;
     }
 
     public function setFile(UploadedFile|File $file)

src/Observers/MediaObserver.php

@@ -9,16 +9,12 @@ class MediaObserver
 {
     public function creating(Media $media): void
     {
-        if ($media->shouldSortWhenCreating()) {
-            if (is_null($media->order)) {
-                $media->setHighestOrderNumber();
-            }
-        }
+        # code...
     }
 
     public function updating(Media $media): void
     {
-
+        # code...
     }
 
     public function deleted(Media $media): void

src/Observers/MediableObserver.php

@@ -3,11 +3,23 @@
 namespace Yuges\Mediable\Observers;
 
 use Yuges\Mediable\Models\Media;
+use Yuges\Mediable\Interfaces\Mediable;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class MediableObserver
 {
-    public function deleted(Media $media): void
+    public function deleting(Mediable $model): void
     {
+        if (! $model->shouldDeleteMedia()) {
+            return;
+        }
 
+        if (in_array(SoftDeletes::class, class_uses_recursive($model))) {
+            if (! $model->forceDeleting) {
+                return;
+            }
+        }
+
+        $model->media()->cursor()->each(fn (Media $media) => $media->forceDelete());
     }
 }

src/Traits/HasMedia.php

@@ -3,9 +3,9 @@
 namespace Yuges\Mediable\Traits;
 
 use Yuges\Mediable\Models\Media;
-use Yuges\Mediable\Interfaces\Mediable;
+use Yuges\Mediable\Config\Config;
 use Yuges\Mediable\Managers\MediaManager;
-use Illuminate\Database\Eloquent\SoftDeletes;
+use Yuges\Mediable\Observers\MediableObserver;
 use Yuges\Mediable\Collections\MediaCollection;
 use Yuges\Mediable\Conversions\MediaConversion;
 use Yuges\Mediable\Collections\MediaCollections;
@@ -22,21 +22,9 @@ trait HasMedia
 
     protected bool $deleteMedia = true;
 
-    public static function bootHasMedia(): void
+    protected static function bootHasMedia(): void
     {
-        static::deleting(function (Mediable $model) {
-            if (! $model->shouldDeleteMedia()) {
-                return;
-            }
-
-            if (in_array(SoftDeletes::class, class_uses_recursive($model))) {
-                if (! $model->forceDeleting) {
-                    return;
-                }
-            }
-
-            $model->media()->cursor()->each(fn (Media $media) => $media->forceDelete());
-        });
+        static::observe(Config::getMediableObserverClass(MediableObserver::class));
     }
 
     public function shouldDeleteMedia(): bool

src/Traits/HasMediable.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Yuges\Mediable\Traits;
+
+use Yuges\Mediable\Config\Config;
+use Illuminate\Database\Eloquent\Model;
+use Yuges\Mediable\Interfaces\Mediable;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+
+/**
+ * @property string $mediable_id
+ * @property int|string $mediable_type
+ * 
+ * @property ?Mediable $mediable
+ */
+trait HasMediable
+{
+    public function mediable(): MorphTo
+    {
+        /** @var Model $this */
+        return $this->morphTo(Config::getMediableRelationName('mediable'));
+    }
+}