Don't include soft deleted models as orphaned media (#3428)

* Don't include soft deleted models as orphaned media

* In case a model is restored the media needs to stay around

* extract orphansQuery method

src/MediaCollections/MediaRepository.php

@@ -90,15 +90,13 @@ public function getByCollectionName(string $collectionName): DbCollection
 
     public function getOrphans(): DbCollection
     {
-        return $this->query()
-            ->whereDoesntHave('model')
+        return $this->orphansQuery()
             ->get();
     }
 
     public function getOrphansByCollectionName(string $collectionName): DbCollection
     {
-        return $this->query()
-            ->whereDoesntHave('model')
+        return $this->orphansQuery()
             ->where('collection_name', $collectionName)
             ->get();
     }
@@ -108,6 +106,15 @@ protected function query(): Builder
         return $this->model->newQuery();
     }
 
+    protected function orphansQuery(): Builder
+    {
+        return $this->query()
+            ->whereDoesntHave(
+                'model',
+                fn (Builder $q) => $q->hasMacro('withTrashed') ? $q->withTrashed() : $q,
+            );
+    }
+
     protected function getDefaultFilterFunction(array $filters): Closure
     {
         return function (Media $media) use ($filters) {

tests/Conversions/Commands/CleanCommandTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\DB;
 use Spatie\MediaLibrary\MediaCollections\Exceptions\DiskDoesNotExist;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
@@ -352,3 +353,25 @@
         'id' => $media->id,
     ]);
 });
+
+it('will not clean media items on soft deleted models', function () {
+    $testModelClass = new class () extends TestModel {
+        use SoftDeletes;
+    };
+
+    /** @var TestModel $testModel */
+    $testModel = $testModelClass::find($this->testModel->id);
+
+    $media = $testModel->addMedia($this->getTestJpg())->toMediaCollection('images');
+
+    $testModel->deletePreservingMedia();
+
+    $this->artisan('media-library:clean', [
+        '--delete-orphaned' => 'true',
+    ]);
+
+    // This media should still exist.
+    $this->assertDatabaseHas('media', [
+        'id' => $media->id,
+    ]);
+});