improves file path upgrade; removes store method from file

Author: aocneanu

src/Models/File.php

@@ -107,7 +107,20 @@ public function upload(UploadedFile $file): self
             $this->processImage($file);
         }
 
-        return $this->store($file, $this->attachable->folder());
+        DB::transaction(function () use ($file) {
+            $folder = $this->attachable->folder();
+
+            $this->fill([
+                'original_name' => $file->getClientOriginalName(),
+                'path' => "{$folder}/{$file->hashName()}",
+                'size' => $file->getSize(),
+                'mime_type' => $file->getMimeType(),
+            ])->save();
+
+            $file->store($folder);
+        });
+
+        return $this;
     }
 
     public function delete()
@@ -154,20 +167,4 @@ public function isImage(BaseFile $file): bool
             ['file' => "image|mimetypes:{$mimeTypes}"]
         )->passes();
     }
-
-    public function store(UploadedFile $file, string $folder): self
-    {
-        DB::transaction(function () use ($file, $folder) {
-            $this->fill([
-                'original_name' => $file->getClientOriginalName(),
-                'path' => "{$folder}/{$file->hashName()}",
-                'size' => $file->getSize(),
-                'mime_type' => $file->getMimeType(),
-            ])->save();
-
-            $file->store($folder);
-        });
-
-        return $this;
-    }
 }

src/Upgrades/FilePath.php

@@ -58,7 +58,6 @@ private function handle(RejectedImport $rejected): void
         $xlsx = Str::of($path)->explode('/')->last();
 
         Storage::move($path, "imports/{$xlsx}");
-
         Storage::deleteDirectory($folder);
     }