Using new file mover and improving response message in case of some f…

…ailures
AsgardCms · Oct 10, 2017 · cfde81a · cfde81a
1 parent 09055ee
commit cfde81a
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/Modules/Media/Http/Controllers/Api/MoveMediaController.php b/Modules/Media/Http/Controllers/Api/MoveMediaController.php
@@ -7,6 +7,7 @@
 use Modules\Media\Http\Requests\MoveMediaRequest;
 use Modules\Media\Repositories\FileRepository;
 use Modules\Media\Repositories\FolderRepository;
+use Modules\Media\Services\FileMover;
 use Modules\Media\Services\FolderMover;
 
 class MoveMediaController extends Controller
@@ -23,12 +24,22 @@ class MoveMediaController extends Controller
      * @var FolderMover
      */
     private $folderMover;
+    /**
+     * @var FileMover
+     */
+    private $fileMover;
 
-    public function __construct(FileRepository $file, FolderRepository $folder, FolderMover $folderMover)
+    public function __construct(
+        FileRepository $file,
+        FolderRepository $folder,
+        FolderMover $folderMover,
+        FileMover $fileMover
+    )
     {
         $this->file = $file;
         $this->folder = $folder;
         $this->folderMover = $folderMover;
+        $this->fileMover = $fileMover;
     }
 
     public function __invoke(MoveMediaRequest $request)
@@ -43,7 +54,9 @@ public function __invoke(MoveMediaRequest $request)
             $file = $this->file->find($file['id']);
 
             if ($file->is_folder === false) {
-                $this->file->move($file, $destination);
+                if ($this->fileMover->move($file, $destination) === false) {
+                    $failedMoves++;
+                }
             }
             if ($file->is_folder === true) {
                 if ($this->folderMover->move($file, $destination) === false) {