From e4fef6dfc39313caa3bce0b4d9490d65cf299363 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 11 Sep 2016 08:08:01 +0200
Subject: [PATCH] Fixed an import bug where a new transaction validation rule
 would break storing of the transaction, while the import would not notice
 this error happening. The importer will now also correctly set a date on the
 "import tag" and will not tag an incomplete journal as already imported.

Signed-off-by: James Cole <thegrumpydictator@gmail.com>
---
 app/Import/ImportStorage.php | 36 ++++++++++++++++++++++++++++++++----
 app/Models/Transaction.php   |  2 +-
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/app/Import/ImportStorage.php b/app/Import/ImportStorage.php
index 8585b3ac9d..81ab4d9e05 100644
--- a/app/Import/ImportStorage.php
+++ b/app/Import/ImportStorage.php
@@ -11,6 +11,7 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Import;
 
+use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\ImportJob;
 use FireflyIII\Models\Rule;
@@ -112,7 +113,11 @@ class ImportStorage
 
         $meta = TransactionJournalMeta::where('name', 'originalImportHash')->where('data', json_encode($hash))->first(['journal_meta.*']);
         if (!is_null($meta)) {
-            return $meta->transactionjournal;
+            /** @var TransactionJournal $journal */
+            $journal = $meta->transactionjournal;
+            if (intval($journal->completed) === 1) {
+                return $journal;
+            }
         }
 
         return new TransactionJournal;
@@ -151,7 +156,7 @@ class ImportStorage
         $repository = app(TagRepositoryInterface::class, [$this->user]);
         $data       = [
             'tag'         => trans('firefly.import_with_key', ['key' => $this->job->key]),
-            'date'        => null,
+            'date'        => new Carbon,
             'description' => null,
             'latitude'    => null,
             'longitude'   => null,
@@ -376,8 +381,31 @@ class ImportStorage
             'amount'                 => $amount,
         ];
 
-        $one = Transaction::create($sourceData);
-        $two = Transaction::create($destinationData);
+        $one   = Transaction::create($sourceData);
+        $two   = Transaction::create($destinationData);
+        $error = false;
+        if (is_null($one->id)) {
+            Log::error('Could not create transaction 1.', $one->getErrors()->all());
+            $error = true;
+        }
+
+        if (is_null($two->id)) {
+            Log::error('Could not create transaction 1.', $two->getErrors()->all());
+            $error = true;
+        }
+
+        // respond to error
+        if ($error === true) {
+            $errorText = sprintf('Cannot import row %d, because an error occured when storing data.', $index);
+            Log::error($errorText);
+            $extendedStatus             = $this->job->extended_status;
+            $extendedStatus['errors'][] = $errorText;
+            $this->job->extended_status = $extendedStatus;
+            $this->job->save();
+
+            return new TransactionJournal;
+        }
+
         Log::debug('Created transaction 1', ['id' => $one->id, 'account' => $one->account_id, 'account_name' => $accounts['source']->name]);
         Log::debug('Created transaction 2', ['id' => $two->id, 'account' => $two->account_id, 'account_name' => $accounts['destination']->name]);
 
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index ead152546c..480c7f89f0 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -57,7 +57,7 @@ class Transaction extends Model
                         = [
             'account_id'             => 'required|exists:accounts,id',
             'transaction_journal_id' => 'required|exists:transaction_journals,id',
-            'description'            => 'between:1,255',
+            'description'            => 'between:0,1024',
             'amount'                 => 'required|numeric',
         ];