Adding logic to create files and thumbnails inside sub folder

Modules/Media/Image/Imagy.php

@@ -110,10 +110,13 @@ class Imagy
 
         foreach ($this->manager->all() as $thumbnail) {
             $image = $this->image->make($this->filesystem->disk($this->getConfiguredFilesystem())->get($this->getDestinationPath($path->getRelativeUrl())));
-            $filename = config('asgard.media.config.files-path') . $this->newFilename($path, $thumbnail->name());
+
+            $filename = $this->getFilenameFor($path, $thumbnail);
+
             foreach ($thumbnail->filters() as $manipulation => $options) {
                 $image = $this->imageFactory->make($manipulation)->handle($image, $options);
             }
+
             $image = $image->stream(pathinfo($path, PATHINFO_EXTENSION), array_get($thumbnail->filters(), 'quality', 90));
             $this->writeImage($filename, $image);
         }
@@ -241,4 +244,17 @@ class Imagy
 
         return $path;
     }
+
+    private function getFilenameFor(MediaPath $path, Thumbnail $thumbnail)
+    {
+        $filenameWithoutPrefix = str_replace(config('asgard.media.config.files-path'), '', $path->getRelativeUrl());
+        $filename = substr(strrchr($filenameWithoutPrefix, '/'), 1);
+        $folders = str_replace($filename, '' , $filenameWithoutPrefix);
+
+        if ($filename === false) {
+            return config('asgard.media.config.files-path') . $this->newFilename($path, $thumbnail->name());
+        }
+
+        return config('asgard.media.config.files-path') . $folders .  $this->newFilename($path, $thumbnail->name());
+    }
 }

Modules/Media/Services/FileService.php

@@ -30,11 +30,12 @@ class FileService
 
     /**
      * @param  UploadedFile $file
+     * @param int $parentId
      * @return mixed
      */
-    public function store(UploadedFile $file)
+    public function store(UploadedFile $file, int $parentId = 0)
     {
-        $savedFile = $this->file->createFromFile($file);
+        $savedFile = $this->file->createFromFile($file, $parentId);
 
         $path = $this->getDestinationPath($savedFile->getOriginal('path'));
         $stream = fopen($file->getRealPath(), 'r+');

Modules/Media/Tests/FileServiceTest.php

@@ -2,6 +2,7 @@
 
 namespace Modules\Media\Tests;
 
+use Modules\Media\Repositories\FolderRepository;
 use Modules\Media\Services\FileService;
 
 final class FileServiceTest extends MediaTestCase
@@ -60,4 +61,30 @@ final class FileServiceTest extends MediaTestCase
         $this->assertFalse($this->app['files']->exists(public_path('assets/media/records_smallThumb.pdf')));
         $this->assertFalse($this->app['files']->exists(public_path('assets/media/records_mediumThumb.pdf')));
     }
+
+    /** @test */
+    public function it_can_store_a_file_in_sub_folder()
+    {
+        $folderRepository = app(FolderRepository::class);
+        $folderRepository->create(['name' => 'My Folder', 'parent_id' => 0]);
+        $file = \Illuminate\Http\UploadedFile::fake()->create('records.pdf');
+
+        $this->fileService->store($file, 1);
+
+        $this->assertTrue($this->app['files']->exists(public_path('assets/media/my-folder/records.pdf')));
+    }
+
+    /** @test */
+    public function it_can_store_an_image_with_thumbnails_in_sub_folder()
+    {
+        $folderRepository = app(FolderRepository::class);
+        $folderRepository->create(['name' => 'My Folder', 'parent_id' => 0]);
+        $file = \Illuminate\Http\UploadedFile::fake()->image('my-file.jpg');
+
+        $this->fileService->store($file, 1);
+
+        $this->assertTrue($this->app['files']->exists(public_path('assets/media/my-folder/my-file.jpg')));
+        $this->assertTrue($this->app['files']->exists(public_path('assets/media/my-folder/my-file_smallThumb.jpg')));
+        $this->assertTrue($this->app['files']->exists(public_path('assets/media/my-folder/my-file_mediumThumb.jpg')));
+    }
 }