From 0adacac269f67c74fbff1664f75358b6f5eb546f Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 18 Jul 2018 06:58:51 +0200
Subject: [PATCH] Remove switches, add if-statement.

---
 .../Import/Placeholder/ImportTransaction.php  | 101 ++++++------------
 1 file changed, 34 insertions(+), 67 deletions(-)

diff --git a/app/Support/Import/Placeholder/ImportTransaction.php b/app/Support/Import/Placeholder/ImportTransaction.php
index 2f110b781a..b955430646 100644
--- a/app/Support/Import/Placeholder/ImportTransaction.php
+++ b/app/Support/Import/Placeholder/ImportTransaction.php
@@ -131,6 +131,38 @@ class ImportTransaction
      */
     public function addColumnValue(ColumnValue $columnValue): void
     {
+        $role   = $columnValue->getRole();
+        $basics = [
+            'account-iban'          => 'accountIban',
+            'account-name'          => 'accountName',
+            'account-bic'           => 'accountBic',
+            'account-number'        => 'accountNumber',
+            'amount_debit'          => 'amountDebit',
+            'amount_credit'         => 'amountCredit',
+            'amount'                => 'amount',
+            'amount_foreign'        => 'foreignAmount',
+            'bill-name'             => 'billName',
+            'budget-name'           => 'budgetName',
+            'category-name'         => 'categoryName',
+            'currency-name'         => 'currencyName',
+            'currency-code'         => 'currencyCode',
+            'currency-symbol'       => 'currencySymbol',
+            'external-id'           => 'externalId',
+            'foreign-currency-code' => 'foreignCurrencyCode',
+            'date-transaction'      => 'date',
+            'opposing-iban'         => 'opposingIban',
+            'opposing-name'         => 'opposingName',
+            'opposing-bic'          => 'opposingBic',
+            'opposing-number'       => 'opposingNumber',
+        ];
+        if (isset($basics[$role])) {
+            $field        = $basics[$role];
+            $this->$field = $columnValue->getValue();
+
+            return;
+        }
+
+
         switch ($columnValue->getRole()) {
             default:
                 // @codeCoverageIgnoreStart
@@ -144,65 +176,20 @@ class ImportTransaction
                 $this->accountId = $mappedValue;
                 Log::debug(sprintf('Going to set the account-id. Original value is "%s", mapped value is "%s".', $columnValue->getValue(), $mappedValue));
                 break;
-            case 'account-iban':
-                $this->accountIban = $columnValue->getValue();
-                break;
-            case 'account-name':
-                $this->accountName = $columnValue->getValue();
-                break;
-            case 'account-bic':
-                $this->accountBic = $columnValue->getValue();
-                break;
-            case 'account-number':
-                $this->accountNumber = $columnValue->getValue();
-                break;
-            case 'amount_debit':
-                $this->amountDebit = $columnValue->getValue();
-                break;
-            case 'amount_credit':
-                $this->amountCredit = $columnValue->getValue();
-                break;
-            case 'amount':
-                $this->amount = $columnValue->getValue();
-                break;
-            case 'amount_foreign':
-                $this->foreignAmount = $columnValue->getValue();
-                break;
             case 'bill-id':
                 $this->billId = $this->getMappedValue($columnValue);
                 break;
-            case 'bill-name':
-                $this->billName = $columnValue->getValue();
-                break;
             case 'budget-id':
                 $this->budgetId = $this->getMappedValue($columnValue);
                 break;
-            case 'budget-name':
-                $this->budgetName = $columnValue->getValue();
-                break;
             case 'category-id':
                 $value = $this->getMappedValue($columnValue);
                 Log::debug(sprintf('Set category ID to %d in ImportTransaction object', $value));
                 $this->categoryId = $value;
                 break;
-            case 'category-name':
-                $this->categoryName = $columnValue->getValue();
-                break;
             case 'currency-id':
                 $this->currencyId = $this->getMappedValue($columnValue);
                 break;
-            case 'currency-name':
-                $this->currencyName = $columnValue->getValue();
-                break;
-            case 'currency-code':
-                $this->currencyCode = $columnValue->getValue();
-                break;
-            case 'currency-symbol':
-                $this->currencySymbol = $columnValue->getValue();
-                break;
-            case 'external-id':
-                $this->externalId = $columnValue->getValue();
-                break;
             case 'sepa-ct-id':
             case 'sepa-ct-op':
             case 'sepa-db':
@@ -218,17 +205,13 @@ class ImportTransaction
             case 'date-payment':
             case 'date-process':
             case 'date-due':
+            case 'rabo-debit-credit':
+            case 'ing-debit-credit':
                 $this->meta[$columnValue->getRole()] = $columnValue->getValue();
                 break;
             case 'foreign-currency-id':
                 $this->foreignCurrencyId = $this->getMappedValue($columnValue);
                 break;
-            case 'foreign-currency-code':
-                $this->foreignCurrencyCode = $columnValue->getValue();
-                break;
-            case 'date-transaction':
-                $this->date = $columnValue->getValue();
-                break;
             case 'description':
                 $this->description = trim($this->description . ' ' . $columnValue->getValue());
                 break;
@@ -240,22 +223,6 @@ class ImportTransaction
                 $this->opposingId = $mappedValue;
                 Log::debug(sprintf('Going to set the OPPOSING-id. Original value is "%s", mapped value is "%s".', $columnValue->getValue(), $mappedValue));
                 break;
-            case 'opposing-iban':
-                $this->opposingIban = $columnValue->getValue();
-                break;
-            case 'opposing-name':
-                $this->opposingName = $columnValue->getValue();
-                break;
-            case 'opposing-bic':
-                $this->opposingBic = $columnValue->getValue();
-                break;
-            case 'opposing-number':
-                $this->opposingNumber = $columnValue->getValue();
-                break;
-            case 'rabo-debit-credit':
-            case 'ing-debit-credit':
-                $this->modifiers[$columnValue->getRole()] = $columnValue->getValue();
-                break;
             case 'tags-comma':
                 $tags       = explode(',', $columnValue->getValue());
                 $this->tags = array_unique(array_merge($this->tags, $tags));