More code for import.

app/Http/Controllers/ImportController.php

@@ -3,11 +3,13 @@
 namespace FireflyIII\Http\Controllers;
 
 use Crypt;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\ImportUploadRequest;
 use FireflyIII\Import\Importer\ImporterInterface;
 use FireflyIII\Models\ImportJob;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
+use Illuminate\Http\Request;
 use SplFileObject;
 use Storage;
 use View;
@@ -30,26 +32,34 @@ class ImportController extends Controller
     }
 
     /**
+     * This is step 3.
+     * This is the first step in configuring the job. It can only be executed
+     * when the job is set to "import_status_never_started".
+     *
      * @param ImportJob $job
      *
      * @return View
+     * @throws FireflyException
      */
     public function configure(ImportJob $job)
     {
-        // create proper importer (depends on job)
-        $type = $job->file_type;
-        /** @var ImporterInterface $importer */
-        $importer = app('FireflyIII\Import\Importer\\' . ucfirst($type) . 'Importer');
-        $importer->setJob($job);
+        if (!$this->jobInCorrectStep($job, 'configure')) {
+            return $this->redirectToCorrectStep($job);
+        }
+
+        // actual code
+        $importer = $this->makeImporter($job);
         $importer->configure();
         $data = $importer->getConfigurationData();
 
-        return view('import.' . $type . '.configure', compact('data', 'job'));
+        return view('import.' . $job->file_type . '.configure', compact('data', 'job'));
 
 
     }
 
     /**
+     * This is step 1. Upload a file.
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function index()
@@ -67,6 +77,68 @@ class ImportController extends Controller
     }
 
     /**
+     * Step 4. Save the configuration.
+     *
+     * @param Request   $request
+     * @param ImportJob $job
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @throws FireflyException
+     */
+    public function process(Request $request, ImportJob $job)
+    {
+        if (!$this->jobInCorrectStep($job, 'process')) {
+            return $this->redirectToCorrectStep($job);
+        }
+
+        // actual code
+        $importer = $this->makeImporter($job);
+        $data     = $request->all();
+        $importer->saveImportConfiguration($data);
+
+        // update job:
+        $job->status = 'import_configuration_saved';
+        $job->save();
+
+        // return redirect to settings.
+        // this could loop until the user is done.
+        return redirect(route('import.settings', $job->key));
+    }
+
+    /**
+     * Step 5. Depending on the importer, this will show the user settings to
+     * fill in.
+     *
+     * @param ImportJob $job
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @throws FireflyException
+     */
+    public function settings(ImportJob $job)
+    {
+        if (!$this->jobInCorrectStep($job, 'settings')) {
+            return $this->redirectToCorrectStep($job);
+        }
+        $importer = $this->makeImporter($job);
+
+        // now
+        
+
+
+        echo 'now in settings';
+        exit;
+
+        // actual code
+
+
+        // ask the importer for the requested action.
+        // for example pick columns or map data.
+        // depends of course on the data in the job.
+    }
+
+    /**
+     * This is step 2. It creates an Import Job. Stores the import.
+     *
      * @param ImportUploadRequest          $request
      * @param ImportJobRepositoryInterface $repository
      *
@@ -88,4 +160,64 @@ class ImportController extends Controller
         return redirect(route('import.configure', [$job->key]));
 
     }
+
+    /**
+     * @param ImportJob $job
+     * @param string    $method
+     *
+     * @return bool
+     */
+    private function jobInCorrectStep(ImportJob $job, string $method): bool
+    {
+        switch ($method) {
+            case 'configure':
+            case 'process':
+                return $job->status === 'import_status_never_started';
+                break;
+            case 'settings':
+                return $job->status === 'import_configuration_saved';
+                break;
+        }
+
+        return false;
+
+    }
+
+    /**
+     * @param ImportJob $job
+     *
+     * @return ImporterInterface
+     */
+    private function makeImporter(ImportJob $job): ImporterInterface
+    {
+        // create proper importer (depends on job)
+        $type = $job->file_type;
+        /** @var ImporterInterface $importer */
+        $importer = app('FireflyIII\Import\Importer\\' . ucfirst($type) . 'Importer');
+        $importer->setJob($job);
+
+        return $importer;
+
+    }
+
+    /**
+     * @param ImportJob $job
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @throws FireflyException
+     */
+    private function redirectToCorrectStep(ImportJob $job)
+    {
+        switch ($job->status) {
+            case 'import_status_never_started':
+                return redirect(route('import.configure', [$job->key]));
+                break;
+            case 'import_configuration_saved':
+                return redirect(route('import.settings', [$job->key]));
+                break;
+        }
+
+        throw new FireflyException('Cannot redirect for job state ' . $job->status);
+
+    }
 }