Merge branch 'release/0.8.0'

Author: JC5

app/Events/ImportedTransactions.php

@@ -46,10 +46,36 @@ class ImportedTransactions
      */
     public function __construct(array $messages, array $warnings, array $errors)
     {
-        app('log')->debug('Created event ImportedTransactions');
-        $this->messages = $messages;
-        $this->warnings = $warnings;
-        $this->errors   = $errors;
+        app('log')->debug('Created event ImportedTransactions with filtering (2)');
 
+        // filter messages:
+        $this->messages = $this->filterArray($messages);
+        $this->warnings = $this->filterArray($warnings);
+        $this->errors   = $this->filterArray($errors);
+    }
+
+    /**
+     * @param array $collection
+     * @return array
+     */
+    private function filterArray(array $collection): array
+    {
+        $count         = 0;
+        $newCollection = [];
+        foreach ($collection as $index => $set) {
+            $newSet = [];
+            foreach ($set as $line) {
+                $line = (string) $line;
+                if ('' !== $line) {
+                    $newSet[] = $line;
+                    $count++;
+                }
+            }
+            if (count($newSet) > 0) {
+                $newCollection[$index] = $newSet;
+            }
+        }
+        app('log')->debug(sprintf('Array contains %d line(s)', $count));
+        return $newCollection;
     }
 }

app/Handlers/Events/ImportedTransactionsEventHandler.php

@@ -48,6 +48,10 @@ public function sendReportOverMail(ImportedTransactions $event): void
             app('log')->info('No mail receiver configured, will not mail.');
             return;
         }
+        if(false === config('mail.enable_mail_report')) {
+            app('log')->info('Configuration does not allow mail, will not mail.');
+            return;
+        }
 
         $log = [
             'messages' => $event->messages,
@@ -56,6 +60,9 @@ public function sendReportOverMail(ImportedTransactions $event): void
         ];
         if (count($event->messages) > 0 || count($event->warnings) > 0 || count($event->errors) > 0) {
             app('log')->info('Will send report message.');
+            app('log')->debug(sprintf('Messages count: %s', count($event->messages)));
+            app('log')->debug(sprintf('Warnings count: %s', count($event->warnings)));
+            app('log')->debug(sprintf('Errors count  : %s', count($event->errors)));
             app('log')->debug('If no error below this line, mail was sent!');
             Mail::to(config('mail.destination'))->send(new ImportReportMail($log));
             app('log')->debug('If no error above this line, mail was sent!');

app/Http/Controllers/Import/Nordigen/LinkController.php

@@ -26,6 +26,7 @@
 namespace App\Http\Controllers\Import\Nordigen;
 
 use App\Exceptions\ImporterErrorException;
+use App\Exceptions\ImporterHttpException;
 use App\Http\Controllers\Controller;
 use App\Http\Middleware\LinkControllerMiddleware;
 use App\Services\Nordigen\Request\GetRequisitionRequest;
@@ -90,22 +91,20 @@ public function build()
             return redirect(route('004-configure.index'));
         }
 
-        // create and save local reference:
-        $uuid = Uuid::uuid4()->toString();
-
+        $uuid        = (string) Uuid::uuid4()->toString();
         $url         = config('nordigen.url');
         $accessToken = TokenManager::getAccessToken();
         $request     = new PostNewRequisitionRequest($url, $accessToken);
         $request->setTimeOut(config('importer.connection.timeout'));
         $request->setBank($configuration->getNordigenBank());
         $request->setReference($uuid);
 
-        app('log')->debug(sprintf('Reference is %s', $uuid));
+        app('log')->debug(sprintf('Reference is "%s"', $uuid));
 
         /** @var NewRequisitionResponse $response */
         $response = $request->post();
-        app('log')->debug(sprintf('Got a new requisition with id %s', $response->id));
-        app('log')->debug(sprintf('Status: %s, returned reference: %s', $response->status, $response->reference));
+        app('log')->debug(sprintf('Got a new requisition with id "%s"', $response->id));
+        app('log')->debug(sprintf('Status: %s, returned reference: "%s"', $response->status, $response->reference));
         app('log')->debug(sprintf('Will now redirect the user to %s', $response->link));
 
         // save config!
@@ -121,14 +120,19 @@ public function build()
      * @param Request $request
      * @return Application|RedirectResponse|Redirector
      * @throws ImporterErrorException
+     * @throws ImporterHttpException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
     public function callback(Request $request)
     {
-        $reference = $request->get('ref');
+        $reference = (string) $request->get('ref');
         app('log')->debug(sprintf('Now at %s', __METHOD__));
-        app('log')->debug(sprintf('Reference is %s', $reference));
+        app('log')->debug(sprintf('Reference is "%s"', $reference));
+
+        if('' === $reference) {
+            throw new ImporterHttpException('The reference returned by Nordigen was unexpectedly empty.');
+        }
 
         // create a new config thing
         $configuration = $this->restoreConfiguration();

app/Http/Controllers/TokenController.php

@@ -68,7 +68,7 @@ public function callback(Request $request)
         $vanityURL    = (string) $request->session()->pull('form_vanity_url');
         $code         = $request->get('code');
 
-        if (0 === strlen($state) || $state !== $request->state) {
+        if ($state !== $request->state) {
             app('log')->error(sprintf('State according to session: "%s"', $state));
             app('log')->error(sprintf('State returned in request : "%s"', $request->state));
             throw new ImporterErrorException('The "state" returned from your server doesn\'t match the state that was sent.');

app/Http/Middleware/IsReadyForStep.php

@@ -426,6 +426,11 @@ private function redirectToCorrectNordigenStep(): RedirectResponse
                     return redirect($route);
                 }
                 throw new ImporterErrorException(sprintf('redirectToCorrectNordigenStep: Cannot handle Nordigen step "%s" [1]', self::STEP));
+            case 'submit':
+                $route = route('007-convert.index');
+                app('log')->debug(sprintf('Return redirect to "%s"', $route));
+                return redirect($route);
+
         }
     }
 

app/Services/CSV/Conversion/Routine/PseudoTransactionProcessor.php

@@ -139,7 +139,7 @@ public function processPseudo(array $lines): array
         foreach ($lines as $index => $line) {
             app('log')->info(sprintf('Now processing line %d/%d.', ($index + 1), $count));
             $processed[] = $this->processPseudoLine($line);
-            $this->addMessage($index, sprintf('Converted CSV line %d into a transaction.', $index + 1));
+            // $this->addMessage($index, sprintf('Converted CSV line %d into a transaction.', $index + 1));
         }
         app('log')->info(sprintf('Done converting %d lines into transactions.', $count));
 

app/Services/Nordigen/Conversion/Routine/GenerateTransactions.php

@@ -93,14 +93,14 @@ public function collectTargetAccounts(): void
             if (in_array($type, ['reconciliation', 'initial-balance', 'expense', 'revenue'], true)) {
                 continue;
             }
-            $iban = $this->filterSpaces((string) $entry->iban);
+            $iban = $this->filterSpaces((string)$entry->iban);
 
             if ('' !== $iban) {
                 app('log')->debug(sprintf('Collected IBAN "%s" (%s) under ID #%d', $iban, $entry->type, $entry->id));
                 $return[$iban] = $entry->id;
                 $types[$iban]  = $entry->type;
             }
-            $number = sprintf('%s.', (string) $entry->number);
+            $number = sprintf('%s.', (string)$entry->number);
             if ('.' !== $number) {
                 app('log')->debug(sprintf('Collected account nr "%s" (%s) under ID #%d', $number, $entry->type, $entry->id));
                 $return[$number] = $entry->id;
@@ -213,12 +213,14 @@ private function generateTransaction(string $accountId, Transaction $entry): arr
             'error_if_duplicate_hash' => $this->configuration->isIgnoreDuplicateTransactions(),
             'transactions'            => [],
         ];
+        $valueDate   = $entry->getValueDate();
         $transaction = [
             'type'               => 'withdrawal',
             'date'               => $entry->getDate()->format('Y-m-d'),
             'datetime'           => $entry->getDate()->toW3cString(),
             'amount'             => $entry->transactionAmount,
             'description'        => $entry->getDescription(),
+            'payment_date'       => is_null($valueDate) ? '' : $valueDate->format('Y-m-d'),
             'order'              => 0,
             'currency_code'      => $entry->currencyCode,
             'tags'               => [],
@@ -253,7 +255,7 @@ private function generateTransaction(string $accountId, Transaction $entry): arr
     private function getMappedAccountId(string $name): ?int
     {
         if (isset($this->configuration->getMapping()['accounts'][$name])) {
-            return (int) $this->configuration->getMapping()['accounts'][$name];
+            return (int)$this->configuration->getMapping()['accounts'][$name];
         }
 
         return null;
@@ -345,9 +347,11 @@ public function setConfiguration(Configuration $configuration): void
 
     /**
      * Handle transaction information when the amount is positive, and this is probably a deposit or a transfer.
+     *
      * @param string      $accountId
      * @param array       $transaction
      * @param Transaction $entry
+     *
      * @return array
      * @throws ImporterHttpException
      */
@@ -358,7 +362,7 @@ private function appendPositiveAmountInfo(string $accountId, array $transaction,
         $transaction['amount'] = $entry->transactionAmount;
 
         // destination is a Nordigen account (has to be!)
-        $transaction['destination_id'] = (int) $this->accounts[$accountId];
+        $transaction['destination_id'] = (int)$this->accounts[$accountId];
         app('log')->debug(sprintf('Destination ID is now #%d, which should be a Firefly III asset account.', $transaction['destination_id']));
 
         // append source iban and number (if present)
@@ -390,22 +394,25 @@ private function appendPositiveAmountInfo(string $accountId, array $transaction,
                 $transaction['source_name'] = $originalSourceName;
             }
         }
+
         return $transaction;
     }
 
     /**
      * Handle transaction information when the amount is negative, and this is probably a withdrawal or a transfer.
+     *
      * @param string      $accountId
      * @param array       $transaction
      * @param Transaction $entry
+     *
      * @return array
      * @throws ImporterHttpException
      */
     private function appendNegativeAmountInfo(string $accountId, array $transaction, Transaction $entry): array
     {
 
         $transaction['amount']    = bcmul($entry->transactionAmount, '-1');
-        $transaction['source_id'] = (int) $this->accounts[$accountId]; // TODO entry may not exist, then what?
+        $transaction['source_id'] = (int)$this->accounts[$accountId]; // TODO entry may not exist, then what?
 
         // append source iban and number (if present)
         $transaction = $this->appendAccountFields($transaction, $entry, 'destination');
@@ -436,13 +443,15 @@ private function appendNegativeAmountInfo(string $accountId, array $transaction,
                 $transaction['destination_name'] = $originalDestName;
             }
         }
+
         return $transaction;
     }
 
     /**
      * @param array       $transaction
      * @param Transaction $entry
      * @param string      $direction
+     *
      * @return array
      */
     private function appendAccountFields(array $transaction, Transaction $entry, string $direction): array
@@ -473,51 +482,53 @@ private function appendAccountFields(array $transaction, Transaction $entry, str
         $numberSearch = sprintf('%s.', $number);
 
         // IBAN is also an ID, so use that!
-        if ('' !== (string) $iban && array_key_exists((string) $iban, $this->targetAccounts)) {
+        if ('' !== (string)$iban && array_key_exists((string)$iban, $this->targetAccounts)) {
             app('log')->debug(sprintf('Recognized %s (IBAN) as a Firefly III asset account so this is a transfer.', $iban));
             $transaction[$idKey] = $this->targetAccounts[$iban];
             $transaction['type'] = 'transfer';
         }
 
         // IBAN is not an ID, so just submit it as a field.
-        if ('' === (string) $iban || !array_key_exists((string) $iban, $this->targetAccounts)) {
+        if ('' === (string)$iban || !array_key_exists((string)$iban, $this->targetAccounts)) {
             app('log')->debug(sprintf('"%s" is not a valid IBAN OR not recognized as Firefly III asset account so submitted as-is.', $iban));
             // source is the other side:
             $transaction[$nameKey] = $name ?? sprintf('(unknown %s account)', $direction);
-            if ('' !== (string) $iban) {
+            if ('' !== (string)$iban) {
                 app('log')->debug(sprintf('Set field "%s" to "%s".', $ibanKey, $iban));
                 $transaction[$ibanKey] = $iban;
             }
-            if ('' === (string) $iban) {
+            if ('' === (string)$iban) {
                 app('log')->debug(sprintf('IBAN is "%s", so leave field "%s" empty.', $iban, $ibanKey));
             }
         }
 
         // source is also an ID, so use it!
-        if ('' !== (string) $number && '.' !== $numberSearch && array_key_exists($numberSearch, $this->targetAccounts)) {
+        if ('' !== (string)$number && '.' !== $numberSearch && array_key_exists($numberSearch, $this->targetAccounts)) {
             app('log')->debug(sprintf('Recognized "%s" (number) as a Firefly III asset account so this is a transfer.', $number));
             $transaction[$idKey] = $this->targetAccounts[$numberSearch];
             $transaction['type'] = 'transfer';
         }
 
-        if ('' === (string) $number || '.' === $numberSearch || !array_key_exists($numberSearch, $this->targetAccounts)) {
+        if ('' === (string)$number || '.' === $numberSearch || !array_key_exists($numberSearch, $this->targetAccounts)) {
             app('log')->debug(sprintf('"%s" is not a valid account nr OR not recognized as Firefly III asset account so submitted as-is.', $number));
             // source is the other side:
             $transaction[$nameKey] = $name ?? sprintf('(unknown %s account)', $direction);
-            if ('' !== (string) $number) {
+            if ('' !== (string)$number) {
                 app('log')->debug(sprintf('Set field "%s" to "%s".', $numberKey, $number));
                 $transaction[$numberKey] = $number;
             }
-            if ('' === (string) $number) {
+            if ('' === (string)$number) {
                 app('log')->debug(sprintf('Account number is "%s", so leave field "%s" empty.', $number, $numberKey));
             }
         }
         app('log')->debug(sprintf('End of %s', __METHOD__));
+
         return $transaction;
     }
 
     /**
      * @param string $iban
+     *
      * @return string
      */
     private function filterSpaces(string $iban): string
@@ -570,6 +581,7 @@ private function filterSpaces(string $iban): string
             "\u{FEFF}", // zero width no -break space
             "\x20", // plain old normal space
         ];
+
         return str_replace($search, '', $iban);
     }
 }

app/Services/Nordigen/Conversion/Routine/TransactionProcessor.php

@@ -26,8 +26,10 @@
 
 use App\Exceptions\ImporterErrorException;
 use App\Exceptions\ImporterHttpException;
+use App\Services\Nordigen\Model\Account;
 use App\Services\Nordigen\Request\GetTransactionsRequest;
 use App\Services\Nordigen\Response\GetTransactionsResponse;
+use App\Services\Nordigen\Services\AccountInformationCollector;
 use App\Services\Nordigen\TokenManager;
 use App\Services\Shared\Configuration\Configuration;
 use Carbon\Carbon;
@@ -65,8 +67,15 @@ public function download(): array
 
         $return = [];
         foreach ($accounts as $key => $account) {
-            app('log')->debug(sprintf('Going to download transactions for account #%d "%s"', $key, $account));
             $account     = (string) $account;
+            app('log')->debug(sprintf('Going to download transactions for account #%d "%s"', $key, $account));
+
+            app('log')->debug(sprintf('Will also download information on the account for debug purposes.'));
+            $object = new Account();
+            $object->setIdentifier($account);
+            AccountInformationCollector::collectInformation($object);
+            app('log')->debug(sprintf('Done downloading information for debug purposes.'));
+
             $accessToken = TokenManager::getAccessToken();
             $url         = config('nordigen.url');
             $request     = new GetTransactionsRequest($url, $accessToken, $account);

app/Services/Nordigen/Model/Transaction.php

@@ -246,6 +246,19 @@ public function getDate(): Carbon
         return new Carbon(config('app.timezone'));
     }
 
+    /**
+     * @return Carbon|null
+     */
+    public function getValueDate(): ?Carbon
+    {
+        if (null !== $this->valueDate) {
+            app('log')->debug('Returning value date for getValueDate');
+            return $this->valueDate;
+        }
+        app('log')->warning('Transaction has no valueDate, return NULL.');
+        return null;
+    }
+
     /**
      * Return transaction description, which depends on the values in the object:
      * @return string