Merge pull request #34 from RonasIT/33_return-preview-key-in-response

feat: add preview to response
RonasIT · Dec 11, 2024 · 743b643 · 743b643
2 parents b73f5d7 + 26c2c1f
commit 743b643
Show file tree

Hide file tree

Showing 9 changed files with 121 additions and 5 deletions.
diff --git a/src/Http/Resources/MediaResource.php b/src/Http/Resources/MediaResource.php
@@ -14,6 +14,7 @@ public function toArray($request): array
             'name' => $this->resource->name,
             'is_public' => $this->resource->is_public,
             'meta' => $this->resource->meta,
+            'preview' => MediaResource::make($this->whenLoaded('preview')),
         ];
     }
 }
diff --git a/src/Models/Media.php b/src/Models/Media.php
@@ -34,6 +34,11 @@ public function owner(): BelongsTo
         return $this->belongsTo(config('media.classes.user_model'));
     }
 
+    public function preview(): BelongsTo
+    {
+        return $this->belongsTo(self::class, 'preview_id');
+    }
+
     protected static function newFactory(): MediaFactory
     {
         return MediaFactory::new();

diff --git a/src/Services/MediaService.php b/src/Services/MediaService.php
@@ -2,7 +2,6 @@
 
 namespace RonasIT\Media\Services;
 
-use Illuminate\Support\Facades\File as FileFacade;
 use League\Flysystem\Local\LocalFilesystemAdapter;
 use RonasIT\Media\Repositories\MediaRepository;
 use Illuminate\Database\Eloquent\Model;
@@ -15,8 +14,6 @@
 use Spatie\Image\Image;
 use Spatie\MediaLibrary\InteractsWithMedia;
 
-use function PHPUnit\Framework\directoryExists;
-
 /**
  * @property MediaRepository $repository
  * @mixin MediaRepository
@@ -48,12 +45,17 @@ public function search(array $filters): LengthAwarePaginator
     public function create($content, string $fileName, array $data = []): Model
     {
         $fileName = $this->saveFile($fileName, $content);
+
+        $preview = $this->createPreview($fileName);
+
         $data['name'] = $fileName;
         $data['link'] = Storage::url($data['name']);
         $data['owner_id'] = Auth::id();
-        $data['preview_id'] = $this->createPreview($data['name'])->id;
+        $data['preview_id'] = $preview->id;
 
-        return $this->repository->create($data);
+        $media = $this->repository->create($data);
+
+        return $media->setRelation('preview', $preview);
     }
 
     public function bulkCreate(array $data): array

diff --git a/tests/MediaStaticTest.php b/tests/MediaStaticTest.php
@@ -97,6 +97,8 @@ public function testCreate(): void
         $response->assertCreated();
 
         self::$mediaTestState->assertChangesEqualsFixture('create_changes.json');
+
+        $this->assertEqualsFixture('create_response.json', $response->json());
     }
 
     public function testCreateWasCreateDisabled(): void
@@ -185,6 +187,8 @@ public function testBulkCreate(): void
         $response->assertOk();
 
         self::$mediaTestState->assertChangesEqualsFixture('bulk_create_changes.json');
+
+        $this->assertEqualsFixture('bulk_create_response.json', $response->json());
     }
 
     public function testDeleteWasDeleteDisabled(): void

diff --git a/tests/MediaTest.php b/tests/MediaTest.php
@@ -44,6 +44,8 @@ public function testCreate(): void
         $response->assertCreated();
 
         self::$mediaTestState->assertChangesEqualsFixture('create_changes.json');
+
+        $this->assertEqualsFixture('create_response.json', $response->json());
     }
 
     public function testCreatePublic(): void
@@ -100,6 +102,8 @@ public function testBulkCreate(): void
         $response->assertOk();
 
         self::$mediaTestState->assertChangesEqualsFixture('bulk_create_changes.json');
+
+        $this->assertEqualsFixture('bulk_create_response.json', $response->json());
     }
 
     public function testDelete(): void

diff --git a/tests/fixtures/MediaStaticTest/bulk_create_response.json b/tests/fixtures/MediaStaticTest/bulk_create_response.json
@@ -0,0 +1,36 @@
+{
+    "data": [
+        {
+            "id": 12,
+            "link": "\/storage\/file1.png",
+            "name": "file1.png",
+            "is_public": false,
+            "meta": [
+                "test1"
+            ],
+            "preview": {
+                "id": 11,
+                "link": "\/storage\/preview_file1.png",
+                "name": "preview_file1.png",
+                "is_public": false,
+                "meta": []
+            }
+        },
+        {
+            "id": 14,
+            "link": "\/storage\/file2.png",
+            "name": "file2.png",
+            "is_public": false,
+            "meta": [
+                "test2"
+            ],
+            "preview": {
+                "id": 13,
+                "link": "\/storage\/preview_file2.png",
+                "name": "preview_file2.png",
+                "is_public": false,
+                "meta": []
+            }
+        }
+    ]
+}
diff --git a/tests/fixtures/MediaStaticTest/create_response.json b/tests/fixtures/MediaStaticTest/create_response.json
@@ -0,0 +1,14 @@
+{
+    "id": 12,
+    "link": "\/storage\/file.png",
+    "name": "file.png",
+    "is_public": false,
+    "meta": [],
+    "preview": {
+        "id": 11,
+        "link": "\/storage\/preview_file.png",
+        "name": "preview_file.png",
+        "is_public": false,
+        "meta": []
+    }
+}
diff --git a/tests/fixtures/MediaTest/bulk_create_response.json b/tests/fixtures/MediaTest/bulk_create_response.json
@@ -0,0 +1,36 @@
+{
+    "data": [
+        {
+            "id": 12,
+            "link": "\/storage\/file1.png",
+            "name": "file1.png",
+            "is_public": false,
+            "meta": [
+                "test1"
+            ],
+            "preview": {
+                "id": 11,
+                "link": "\/storage\/preview_file1.png",
+                "name": "preview_file1.png",
+                "is_public": false,
+                "meta": []
+            }
+        },
+        {
+            "id": 14,
+            "link": "\/storage\/file2.png",
+            "name": "file2.png",
+            "is_public": false,
+            "meta": [
+                "test2"
+            ],
+            "preview": {
+                "id": 13,
+                "link": "\/storage\/preview_file2.png",
+                "name": "preview_file2.png",
+                "is_public": false,
+                "meta": []
+            }
+        }
+    ]
+}
diff --git a/tests/fixtures/MediaTest/create_response.json b/tests/fixtures/MediaTest/create_response.json
@@ -0,0 +1,14 @@
+{
+    "id": 12,
+    "link": "\/storage\/file.png",
+    "name": "file.png",
+    "is_public": false,
+    "meta": [],
+    "preview": {
+        "id": 11,
+        "link": "\/storage\/preview_file.png",
+        "name": "preview_file.png",
+        "is_public": false,
+        "meta": []
+    }
+}