Add checkbox to clear previous data when importing #490 (#546)

* Add checkbox to clear previous data when importing #490

app/Http/Controllers/Admin/SubfleetController.php

@@ -3,11 +3,12 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Contracts\Controller;
+use App\Http\Controllers\Admin\Traits\Importable;
 use App\Http\Requests\CreateSubfleetRequest;
-use App\Http\Requests\ImportRequest;
 use App\Http\Requests\UpdateSubfleetRequest;
 use App\Models\Airline;
 use App\Models\Enums\FuelType;
+use App\Models\Enums\ImportExportType;
 use App\Models\Expense;
 use App\Models\Subfleet;
 use App\Repositories\AircraftRepository;
@@ -19,13 +20,13 @@ use App\Services\FareService;
 use App\Services\FleetService;
 use App\Services\ImportService;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Storage;
 use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
 
 class SubfleetController extends Controller
 {
+    use Importable;
+
     private $aircraftRepo;
     private $fareRepo;
     private $fareSvc;
@@ -293,17 +294,7 @@ class SubfleetController extends Controller
         ];
 
         if ($request->isMethod('post')) {
-            ImportRequest::validate($request);
-
-            $path = Storage::putFileAs(
-                'import',
-                $request->file('csv_file'),
-                'import_subfleets.csv'
-            );
-
-            $path = storage_path('app/'.$path);
-            Log::info('Uploaded subfleets import file to '.$path);
-            $logs = $this->importSvc->importSubfleets($path);
+            $logs = $this->importFile($request, ImportExportType::SUBFLEETS);
         }
 
         return view('admin.subfleets.import', [