handled nullable associations

imahmood · Nov 20, 2023 · d855fd1 · d855fd1
1 parent 6ede003
commit d855fd1
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 22 deletions.
diff --git a/database/migrations/2023_11_20_110518_update_media.php b/database/migrations/2023_11_20_110518_update_media.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('media', function (Blueprint $table) {
+            $table->string('model_type')->nullable()->change();
+            $table->unsignedBigInteger('model_id')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('media', function (Blueprint $table) {
+            $table->string('model_type')->nullable(false)->change();
+            $table->unsignedBigInteger('model_id')->nullable(false)->change();
+        });
+    }
+};
diff --git a/src/FileStorage.php b/src/FileStorage.php
@@ -17,7 +17,6 @@
 use Imahmood\FileStorage\Jobs\GeneratePreview;
 use Imahmood\FileStorage\Jobs\OptimizeImage;
 use Imahmood\FileStorage\Models\Media;
-use InvalidArgumentException;
 
 class FileStorage
 {
@@ -31,12 +30,12 @@ public function __construct(
      */
     public function create(
         MediaTypeInterface $type,
-        MediaAwareInterface $relatedTo,
+        ?MediaAwareInterface $relatedTo,
         UploadedFile $uploadedFile,
     ): Media {
         $media = new Media([
-            'model_type' => $relatedTo::class,
-            'model_id' => $relatedTo->getPrimaryKey(),
+            'model_type' => $relatedTo ? $relatedTo::class : null,
+            'model_id' => $relatedTo?->getPrimaryKey(),
             'type' => $type->identifier(),
         ]);
 
@@ -49,13 +48,13 @@ public function create(
      */
     public function update(
         MediaTypeInterface $type,
-        MediaAwareInterface $relatedTo,
+        ?MediaAwareInterface $relatedTo,
         Media $media,
         ?UploadedFile $uploadedFile,
     ): Media {
         $media->fill([
-            'model_type' => $relatedTo::class,
-            'model_id' => $relatedTo->getPrimaryKey(),
+            'model_type' => $relatedTo ? $relatedTo::class : null,
+            'model_id' => $relatedTo?->getPrimaryKey(),
             'type' => $type->identifier(),
         ]);
 
@@ -82,18 +81,14 @@ public function update(
      */
     public function updateOrCreate(
         MediaTypeInterface $type,
-        MediaAwareInterface $relatedTo,
+        ?MediaAwareInterface $relatedTo,
         ?Media $media,
-        ?UploadedFile $uploadedFile,
+        UploadedFile $uploadedFile,
     ): Media {
         if ($media) {
             return $this->update($type, $relatedTo, $media, $uploadedFile);
         }
 
-        if (! $uploadedFile) {
-            throw new InvalidArgumentException();
-        }
-
         return $this->create($type, $relatedTo, $uploadedFile);
     }
 
@@ -104,7 +99,7 @@ public function updatePreviewName(Media $media, string $fileName): Media
     {
         $media->preview = $fileName;
 
-        if (! $media->save()) {
+        if (!$media->save()) {
             throw new PersistenceFailedException();
         }
 
@@ -122,16 +117,16 @@ protected function persistMedia(Media $media, ?UploadedFile $uploadedFile): Medi
                 $media->preview = null;
             }
 
-            if (! $media->save()) {
+            if (!$media->save()) {
                 throw new PersistenceFailedException();
             }
 
             if ($uploadedFile) {
-                $isUploaded = (bool) $uploadedFile->storeAs($media->dir_relative_path, $media->file_name, [
+                $isUploaded = (bool)$uploadedFile->storeAs($media->dir_relative_path, $media->file_name, [
                     'disk' => $this->config->diskName,
                 ]);
 
-                if (! $isUploaded) {
+                if (!$isUploaded) {
                     throw new PersistenceFailedException();
                 }
 
@@ -155,7 +150,7 @@ protected function persistMedia(Media $media, ?UploadedFile $uploadedFile): Medi
     public function delete(Media $media): bool
     {
         return DB::transaction(function () use ($media) {
-            if (! $media->delete()) {
+            if (!$media->delete()) {
                 return false;
             }
 
@@ -171,7 +166,7 @@ public function delete(Media $media): bool
     protected function deleteDirectory(string $dir): void
     {
         $isDeleted = Storage::disk($this->config->diskName)->deleteDirectory($dir);
-        if (! $isDeleted) {
+        if (!$isDeleted) {
             throw new UnableToDeleteDirectoryException(sprintf(
                 '[FileStorage] Disk: %s, Directory: %s',
                 $this->config->diskName,
@@ -186,7 +181,7 @@ protected function deleteDirectory(string $dir): void
     protected function deleteFile(array|string $paths): void
     {
         $isDeleted = Storage::disk($this->config->diskName)->delete($paths);
-        if (! $isDeleted) {
+        if (!$isDeleted) {
             $paths = is_array($paths) ? implode(', ', $paths) : $paths;
 
             throw new UnableToDeleteFileException(sprintf(

diff --git a/src/Models/Media.php b/src/Models/Media.php
@@ -14,8 +14,8 @@
 
 /**
  * @property int $id
- * @property string $model_type
- * @property int $model_id
+ * @property string|null $model_type
+ * @property int|null $model_id
  * @property string $file_name
  * @property string|null $preview
  * @property int $type