set model relation (#3219)

spatie · Mar 29, 2023 · fbdcba9 · fbdcba9
1 parent c135859
commit fbdcba9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/InteractsWithMedia.php b/src/InteractsWithMedia.php
@@ -549,7 +549,9 @@ public function loadMedia(string $collectionName): Collection
         return $collection
             ->filter(fn (Media $mediaItem) => $mediaItem->collection_name === $collectionName)
             ->sortBy('order_column')
-            ->values();
+            ->values()
+            ->each
+            ->setRelation('model', $this);
     }
 
     public function prepareToAttachMedia(Media $media, FileAdder $fileAdder): void

diff --git a/tests/Feature/FileAdder/MediaConversions/DeleteMediaTest.php b/tests/Feature/FileAdder/MediaConversions/DeleteMediaTest.php
@@ -60,8 +60,8 @@
     $this->testModelWithoutMediaConversions = $this->testModelWithoutMediaConversions->fresh();
 
     expect($this->testModelWithoutMediaConversions->getMedia('default'))->toHaveCount(3);
-    expect($excludedMedia[0])->toEqual($this->testModelWithoutMediaConversions->getMedia('images')[0]);
-    expect($excludedMedia[1])->toEqual($this->testModelWithoutMediaConversions->getMedia('images')[1]);
+    expect($excludedMedia[0]->withoutRelations())->toEqual($this->testModelWithoutMediaConversions->getMedia('images')[0]->withoutRelations());
+    expect($excludedMedia[1]->withoutRelations())->toEqual($this->testModelWithoutMediaConversions->getMedia('images')[1]->withoutRelations());
 });
 
 it('provides a chainable method for clearing a collection', function () {

diff --git a/tests/Feature/InteractsWithMedia/GetMediaTest.php b/tests/Feature/InteractsWithMedia/GetMediaTest.php
@@ -294,6 +294,20 @@
         ->toArray());
 });
 
+it('will set model relation', function() {
+    DB::enableQueryLog();
+
+    $this->testModel->loadMedia('images');
+    expect(DB::getQueryLog())->toHaveCount(1);
+    $this->testModel->media->each(function(Media $media) {
+        expect($media->model)->toBeInstanceOf($this->testModel::class);
+    });
+
+    expect(DB::getQueryLog())->toHaveCount(1);
+
+    DB::DisableQueryLog();
+});
+
 it('will cache loaded media', function () {
     DB::enableQueryLog();