Fixes to file uploading; include disk name, remove clunky redirect code

app/Http/Controllers/Admin/FilesController.php

@@ -2,13 +2,15 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Http\Requests\CreateFilesRequest;
 use App\Interfaces\Controller;
 use App\Models\File;
+use App\Services\FileService;
 use Flash;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Storage;
 use Log;
+use Validator;
 
 /**
  * Class FilesController
@@ -16,29 +18,42 @@ use Log;
  */
 class FilesController extends Controller
 {
+    private $fileSvc;
+
+    public function __construct(FileService $fileSvc)
+    {
+        $this->fileSvc = $fileSvc;
+    }
+
     /**
      * Store a newly file
-     * @param CreateFilesRequest $request
+     * @param Request $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function store(CreateFilesRequest $request)
+    public function store(Request $request)
     {
         $attrs = $request->post();
 
+        // Not using a form validation here because when it redirects,
+        // it leaves the parent forms all blank, even though it goes
+        // back to the right place. So just manually validate
+        $validator = Validator::make($request->all(), [
+            'filename' => 'required',
+            'file'     => 'required|file'
+        ]);
+
+        if ($validator->fails()) {
+            return redirect()->back()->withInput(Input::all())->withErrors($validator);
+        }
+
         Log::info('Uploading files', $attrs);
 
-        /**
-         * @var $file  \Illuminate\Http\UploadedFile
-         */
         $file = $request->file('file');
-        $file_path = $file->storeAs(
-            'files',
-            $file->getClientOriginalName(),
-            config('filesystems.public_files')
-        );
+        $file_path = $this->fileSvc->saveFile($file, 'files');
 
         $asset = new File();
-        $asset->name = $attrs['name'];
+        $asset->name = $attrs['filename'];
+        $asset->disk = config('filesystems.public_files');
         $asset->path = $file_path;
         $asset->public = true;
         $asset->ref_model = $attrs['ref_model'];
@@ -46,43 +61,27 @@ class FilesController extends Controller
 
         $asset->save();
 
-        /*foreach($files as $file) {
-            $file_path = $file->store('files', $file->getClientOriginalName(), 'public');
-        }*/
-
-        # Where do we go now? OooOOoOoOo sweet child
-        $redirect = $attrs['redirect'];
-        if(!$redirect) {
-            $redirect = route('admin.dashboard.index');
-        }
-
         Flash::success('Files uploaded successfully.');
-        return redirect($redirect);
+        return redirect()->back();
     }
 
     /**
      * Remove the file from storage.
-     * @param Request $request
+     * @param $id
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     * @throws \Exception
      */
-    public function delete($id, Request $request)
+    public function destroy($id)
     {
-        $redirect = $request->post('redirect');
-        if (!$redirect) {
-            $redirect = route('admin.dashboard.index');
-        }
-
         $file = File::find($id);
         if (!$file) {
             Flash::error('File doesn\'t exist');
-            return redirect($redirect);
+            return redirect()->back();
         }
 
         Storage::disk(config('filesystems.public_files'))->delete($file->path);
         $file->delete();
 
         Flash::success('File deleted successfully.');
-        return redirect($redirect);
+        return redirect()->back();
     }
 }