From 58ca7d551a86492ed48f140cefe94584a335b3c5 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 26 Aug 2016 06:43:23 +0200
Subject: [PATCH] Rename import procedure method name

---
 app/Console/Commands/Import.php           |  4 +++-
 app/Http/Controllers/ImportController.php |  2 +-
 app/Import/ImportProcedure.php            | 29 ++++++++++++++++++++++-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php
index 60e54c55d9..94066089a2 100644
--- a/app/Console/Commands/Import.php
+++ b/app/Console/Commands/Import.php
@@ -67,7 +67,9 @@ class Import extends Command
         $handler = new CommandHandler($this);
         $monolog->pushHandler($handler);
 
-        $result = ImportProcedure::run($job);
+        $result = ImportProcedure::runImport($job);
+
+
 
         /**
          * @var int          $index
diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index e1db8f8fcf..303f274c74 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -306,7 +306,7 @@ class ImportController extends Controller
     public function start(ImportJob $job)
     {
         if ($job->status == "settings_complete") {
-            ImportProcedure::run($job);
+            $journals = ImportProcedure::runImport($job);
         }
     }
 
diff --git a/app/Import/ImportProcedure.php b/app/Import/ImportProcedure.php
index a708eee813..e55d382449 100644
--- a/app/Import/ImportProcedure.php
+++ b/app/Import/ImportProcedure.php
@@ -23,13 +23,40 @@ use Illuminate\Support\Collection;
  */
 class ImportProcedure
 {
+    //
+    //    /**
+    //     * @param ImportJob  $job
+    //     * @param Collection $journals
+    //     */
+    //    public static function runRules(ImportJob $job, Collection $journals)
+    //    {
+    //        // get all rules for user.
+    //        $rules
+    //            = Rule::distinct()
+    //                  ->where('user_id', $job->user->id)
+    //                  ->leftJoin('rule_groups', 'rule_groups.id', '=', 'rules.rule_group_id')
+    //                  ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
+    //                  ->where('rule_groups.active', 1)
+    //                  ->where('rule_triggers.trigger_type', 'user_action')
+    //                  ->where('rule_triggers.trigger_value', 'store-journal')
+    //                  ->where('rules.active', 1)
+    //                  ->orderBy('rule_groups.order', 'ASC')
+    //                  ->orderBy('rules.order', 'ASC')
+    //                  ->get(['rules.*']);
+    //
+    //        // execute rules on each transaction.
+    //        /** @var TransactionJournal $journal */
+    //        foreach($journals as $journal) {
+    //            self::applyRules($rules, $journal);
+    //        }
+    //    }
 
     /**
      * @param ImportJob $job
      *
      * @return Collection
      */
-    public static function run(ImportJob $job): Collection
+    public static function runImport(ImportJob $job): Collection
     {
         // update job to say we started.
         $job->status = 'import_running';